| Message ID | 20160919124921.8172-6-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Simon Horman |
| Headers | show |
On 09/19/2016 03:49 PM, Wolfram Sang wrote: > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 43 ++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts > index 8964b1ea3cea69..7780d02f716a34 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts > +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts [...] > @@ -246,6 +264,18 @@ > power-source = <1800>; > }; > > + sdhi2_pins: sd2 { > + groups = "sdhi2_data8", "sdhi2_ctrl"; > + function = "sdhi2"; > + power-source = <3300>; > + }; > + > + sdhi2_pins_uhs: sd2 { > + groups = "sdhi2_data8", "sdhi2_ctrl"; > + function = "sdhi2"; > + power-source = <1800>; > + }; > + I'm afraid you're just overriding the props in the first "sd2" node with this... [...] MBR, Sergei
> >+ sdhi2_pins: sd2 { > >+ groups = "sdhi2_data8", "sdhi2_ctrl"; > >+ function = "sdhi2"; > >+ power-source = <3300>; > >+ }; > >+ > >+ sdhi2_pins_uhs: sd2 { > >+ groups = "sdhi2_data8", "sdhi2_ctrl"; > >+ function = "sdhi2"; > >+ power-source = <1800>; > >+ }; > >+ > > I'm afraid you're just overriding the props in the first "sd2" node with > this... Oops, thanks, will fix!
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index 8964b1ea3cea69..7780d02f716a34 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -62,6 +62,24 @@ clock-frequency = <24576000>; }; + reg_1p8v: regulator0 { + compatible = "regulator-fixed"; + regulator-name = "fixed-1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_3p3v: regulator1 { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + vcc_sdhi0: regulator-vcc-sdhi0 { compatible = "regulator-fixed"; @@ -246,6 +264,18 @@ power-source = <1800>; }; + sdhi2_pins: sd2 { + groups = "sdhi2_data8", "sdhi2_ctrl"; + function = "sdhi2"; + power-source = <3300>; + }; + + sdhi2_pins_uhs: sd2 { + groups = "sdhi2_data8", "sdhi2_ctrl"; + function = "sdhi2"; + power-source = <1800>; + }; + sdhi3_pins: sd3 { groups = "sdhi3_data4", "sdhi3_ctrl"; function = "sdhi3"; @@ -398,6 +428,19 @@ status = "okay"; }; +&sdhi2 { + /* used for on-board 8bit eMMC */ + pinctrl-0 = <&sdhi2_pins>; + pinctrl-1 = <&sdhi2_pins_uhs>; + pinctrl-names = "default", "state_uhs"; + + vmmc-supply = <®_3p3v>; + vqmmc-supply = <®_1p8v>; + bus-width = <8>; + non-removable; + status = "okay"; +}; + &sdhi3 { pinctrl-0 = <&sdhi3_pins>; pinctrl-1 = <&sdhi3_pins_uhs>;
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+)