| Message ID | 1314731837-6985-1-git-send-email-swarren@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Stephen, On Tue, Aug 30 2011, Stephen Warren wrote: > Signed-off-by: Stephen Warren <swarren@nvidia.com> > Acked-by: Olof Johansson <olof@lixom.net> > --- > This is a repost of http://www.spinics.net/lists/linux-tegra/msg02117.html > I'm including it here since it's not in linux-next yet, and patch 3 depends > on it. I assume I should wait for patches 1+3 to appear in -next via another tree before I merge patch 2 -- let me know if that's incorrect. Thanks, - Chris.
Chris Ball wrote at Tuesday, August 30, 2011 1:20 PM: > Hi Stephen, > > On Tue, Aug 30 2011, Stephen Warren wrote: > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > > Acked-by: Olof Johansson <olof@lixom.net> > > --- > > This is a repost of http://www.spinics.net/lists/linux-tegra/msg02117.html > > I'm including it here since it's not in linux-next yet, and patch 3 depends > > on it. > > I assume I should wait for patches 1+3 to appear in -next via another tree > before I merge patch 2 -- let me know if that's incorrect. I don't think there's actually any need for that; initializing Tegra's SDHCI from device-tree has never worked in mainline to date; it relies on patch 1 being there. And if patch 2 was there without patch 3, the worst that will happen is some port runs in 4-bit mode instead of 8-bit, which evidently works fine since I didn't even notice 8-bit support was missing... Thanks for checking though.
Hi, On Tue, Aug 30 2011, Stephen Warren wrote: > I don't think there's actually any need for that; initializing Tegra's > SDHCI from device-tree has never worked in mainline to date; it relies > on patch 1 being there. And if patch 2 was there without patch 3, > the worst that will happen is some port runs in 4-bit mode instead of > 8-bit, which evidently works fine since I didn't even notice 8-bit > support was missing... Ah, okay. I've merged patch 2 to mmc-next for 3.2, then, and will keep an eye on what happens with the arch patches. Thanks, - Chris.
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index 4c05334..e581866 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts @@ -57,14 +57,14 @@ }; sdhci@c8000200 { - gpios = <&gpio 69 0>, /* cd, gpio PI5 */ - <&gpio 57 0>, /* wp, gpio PH1 */ - <&gpio 155 0>; /* power, gpio PT3 */ + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ + power-gpios = <&gpio 155 0>; /* gpio PT3 */ }; sdhci@c8000600 { - gpios = <&gpio 58 0>, /* cd, gpio PH2 */ - <&gpio 59 0>, /* wp, gpio PH3 */ - <&gpio 70 0>; /* power, gpio PI6 */ + cd-gpios = <&gpio 58 0>; /* gpio PH2 */ + wp-gpios = <&gpio 59 0>; /* gpio PH3 */ + power-gpios = <&gpio 70 0>; /* gpio PI6 */ }; }; diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts index 1940cae..64cedca 100644 --- a/arch/arm/boot/dts/tegra-seaboard.dts +++ b/arch/arm/boot/dts/tegra-seaboard.dts @@ -21,8 +21,8 @@ }; sdhci@c8000400 { - gpios = <&gpio 69 0>, /* cd, gpio PI5 */ - <&gpio 57 0>, /* wp, gpio PH1 */ - <&gpio 70 0>; /* power, gpio PI6 */ + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ + power-gpios = <&gpio 70 0>; /* gpio PI6 */ }; };