| Message ID | 1441991194-11948-9-git-send-email-peter.griffin@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, 11 Sep 2015, Peter Griffin wrote: > This patch adds the missing SD pinctrl config > for mmc/sd controller 0. This is required to enable the > B2144A daughter board that exposes this controller as a sd > slot. > > Signed-off-by: Nebil BEN MEFTEH <nebil.ben-mefteh@st.com> > Signed-off-by: Nebil BEN MEFTEH <nebil.ben-mefteh@st.com> Duplicate. > Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> > Acked-by: Patrice Chotard <patrice.chotard@st.com> > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Same as before -- and for all the other patches. Contrary to what I said before, the Ack is probably more correct here, as I would _guess_ that Nebil wrote the patch, so his SoB should stay, the Patrice added it to the internal tree. Convert this to an Ack now, as he's not in the upstream delivery path. > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > --- > arch/arm/boot/dts/stih407-pinctrl.dtsi | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi > index 798d901..3cd7e2a 100644 > --- a/arch/arm/boot/dts/stih407-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi > @@ -883,6 +883,21 @@ > emmc_d7 = <&pio41 7 ALT1 BIDIR_PU>; > }; > }; > + pinctrl_sd0: sd0-0 { > + st,pins { > + sd_clk = <&pio40 6 ALT1 BIDIR>; > + sd_cmd = <&pio40 7 ALT1 BIDIR_PU>; > + sd_dat0 = <&pio41 0 ALT1 BIDIR_PU>; > + sd_dat1 = <&pio41 1 ALT1 BIDIR_PU>; > + sd_dat2 = <&pio41 2 ALT1 BIDIR_PU>; > + sd_dat3 = <&pio41 3 ALT1 BIDIR_PU>; > + sd_led = <&pio42 0 ALT2 OUT>; > + sd_pwren = <&pio42 2 ALT2 OUT>; > + sd_vsel = <&pio42 3 ALT2 OUT>; > + sd_cd = <&pio42 4 ALT2 IN>; > + sd_wp = <&pio42 5 ALT2 IN>; > + }; > + }; > }; > > fsm {
diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi index 798d901..3cd7e2a 100644 --- a/arch/arm/boot/dts/stih407-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi @@ -883,6 +883,21 @@ emmc_d7 = <&pio41 7 ALT1 BIDIR_PU>; }; }; + pinctrl_sd0: sd0-0 { + st,pins { + sd_clk = <&pio40 6 ALT1 BIDIR>; + sd_cmd = <&pio40 7 ALT1 BIDIR_PU>; + sd_dat0 = <&pio41 0 ALT1 BIDIR_PU>; + sd_dat1 = <&pio41 1 ALT1 BIDIR_PU>; + sd_dat2 = <&pio41 2 ALT1 BIDIR_PU>; + sd_dat3 = <&pio41 3 ALT1 BIDIR_PU>; + sd_led = <&pio42 0 ALT2 OUT>; + sd_pwren = <&pio42 2 ALT2 OUT>; + sd_vsel = <&pio42 3 ALT2 OUT>; + sd_cd = <&pio42 4 ALT2 IN>; + sd_wp = <&pio42 5 ALT2 IN>; + }; + }; }; fsm {