| Message ID | 20160406005616.GA7135@verge.net.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Simon, On Wed, Apr 6, 2016 at 2:56 AM, Simon Horman <horms@verge.net.au> wrote: > On Fri, Apr 01, 2016 at 05:44:39PM +0200, Wolfram Sang wrote: >> From: Wolfram Sang <wsa+renesas@sang-engineering.com> >> >> Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,2}. > > For some reason which I am entirely unsure of git didn't apply this cleanly > so I did so manually. Please double check that the following is correct. > > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > Subject: [PATCH] ARM: shmobile: r8a7790: lager: Enable UHS-I SDR-50 > > Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,2}. > > Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/boot/dts/r8a7790-lager.dts | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts > index aa6ca92a9485..75fc8d1cb7e3 100644 > --- a/arch/arm/boot/dts/r8a7790-lager.dts > +++ b/arch/arm/boot/dts/r8a7790-lager.dts > @@ -346,11 +346,25 @@ > sdhi0_pins: sd0 { > renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; > renesas,function = "sdhi0"; How come you still have "renesas,*" pinctrl properties? Applied to wrong branch? > + power-source = <3300>; > + }; > + > + sdhi0_pins_uhs: sd0_uhs { > + groups = "sdhi0_data4", "sdhi0_ctrl"; > + function = "sdhi0"; Pinctrl properties with and without prefixes must not be combined in a single preprocessed DTS (and in the overlays). Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 06, 2016 at 08:38:02AM +0200, Geert Uytterhoeven wrote: > Hi Simon, > > On Wed, Apr 6, 2016 at 2:56 AM, Simon Horman <horms@verge.net.au> wrote: > > On Fri, Apr 01, 2016 at 05:44:39PM +0200, Wolfram Sang wrote: > >> From: Wolfram Sang <wsa+renesas@sang-engineering.com> > >> > >> Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,2}. > > > > For some reason which I am entirely unsure of git didn't apply this cleanly > > so I did so manually. Please double check that the following is correct. > > > > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Subject: [PATCH] ARM: shmobile: r8a7790: lager: Enable UHS-I SDR-50 > > > > Add the "1v8" pinctrl state and sd-uhs-sdr50 property to SDHI{0,2}. > > > > Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > arch/arm/boot/dts/r8a7790-lager.dts | 22 ++++++++++++++++++++-- > > 1 file changed, 20 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts > > index aa6ca92a9485..75fc8d1cb7e3 100644 > > --- a/arch/arm/boot/dts/r8a7790-lager.dts > > +++ b/arch/arm/boot/dts/r8a7790-lager.dts > > @@ -346,11 +346,25 @@ > > sdhi0_pins: sd0 { > > renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; > > renesas,function = "sdhi0"; > > How come you still have "renesas,*" pinctrl properties? > Applied to wrong branch? Yes, its branch thing. This is applied to the dt-for-v4.7 branch. The cleanup is in the cleanup-for-v4.7 branch. I didn't realise that until after my previous post. > > + power-source = <3300>; > > + }; > > + > > + sdhi0_pins_uhs: sd0_uhs { > > + groups = "sdhi0_data4", "sdhi0_ctrl"; > > + function = "sdhi0"; > > Pinctrl properties with and without prefixes must not be combined in a single > preprocessed DTS (and in the overlays). Thanks! I will re-arrange by branches accordingly. -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index aa6ca92a9485..75fc8d1cb7e3 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -346,11 +346,25 @@ sdhi0_pins: sd0 { renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; renesas,function = "sdhi0"; + power-source = <3300>; + }; + + sdhi0_pins_uhs: sd0_uhs { + groups = "sdhi0_data4", "sdhi0_ctrl"; + function = "sdhi0"; + power-source = <1800>; }; sdhi2_pins: sd2 { renesas,groups = "sdhi2_data4", "sdhi2_ctrl"; renesas,function = "sdhi2"; + power-source = <3300>; + }; + + sdhi2_pins_uhs: sd2_uhs { + groups = "sdhi2_data4", "sdhi2_ctrl"; + function = "sdhi2"; + power-source = <1800>; }; mmc1_pins: mmc1 { @@ -539,21 +553,25 @@ &sdhi0 { pinctrl-0 = <&sdhi0_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdhi0_pins_uhs>; + pinctrl-names = "default", "state_uhs"; vmmc-supply = <&vcc_sdhi0>; vqmmc-supply = <&vccq_sdhi0>; cd-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>; + sd-uhs-sdr50; status = "okay"; }; &sdhi2 { pinctrl-0 = <&sdhi2_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdhi2_pins_uhs>; + pinctrl-names = "default", "state_uhs"; vmmc-supply = <&vcc_sdhi2>; vqmmc-supply = <&vccq_sdhi2>; cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>; + sd-uhs-sdr50; status = "okay"; };