Skip to content

Commit

Permalink
Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/…
Browse files Browse the repository at this point in the history 
…scm/linux/kernel/git/swarren/linux-tegra into next/dt

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: tegra: DT-related fixes needed by the MMC tree

In order to convert the Tegra MMC driver to using mmc_of_parse(), some
bugs in the Tegra device-tree content need to be fixed first; it's
currently wrong but unused, and mmc_of_parse() causes that data to be
used for the first time.

* tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Apr 9, 2013
2 parents 0f6b9ee + 908ab93 commit f73548c
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-colibri-512.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
};

sdhci@c8000600 {
cd-gpios = <&gpio 23 0>; /* gpio PC7 */
cd-gpios = <&gpio 23 1>; /* gpio PC7 */
};

sound {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/tegra20-harmony.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,15 +437,15 @@

sdhci@c8000200 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 155 0>; /* gpio PT3 */
bus-width = <4>;
};

sdhci@c8000600 {
status = "okay";
cd-gpios = <&gpio 58 0>; /* gpio PH2 */
cd-gpios = <&gpio 58 1>; /* gpio PH2 */
wp-gpios = <&gpio 59 0>; /* gpio PH3 */
power-gpios = <&gpio 70 0>; /* gpio PI6 */
bus-width = <8>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-paz00.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@

sdhci@c8000000 {
status = "okay";
cd-gpios = <&gpio 173 0>; /* gpio PV5 */
cd-gpios = <&gpio 173 1>; /* gpio PV5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 169 0>; /* gpio PV1 */
bus-width = <4>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-seaboard.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@

sdhci@c8000400 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 70 0>; /* gpio PI6 */
bus-width = <4>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-tamonten.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
};

sdhci@c8000600 {
cd-gpios = <&gpio 58 0>; /* gpio PH2 */
cd-gpios = <&gpio 58 1>; /* gpio PH2 */
wp-gpios = <&gpio 59 0>; /* gpio PH3 */
bus-width = <4>;
status = "okay";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-trimslice.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@

sdhci@c8000600 {
status = "okay";
cd-gpios = <&gpio 121 0>; /* gpio PP1 */
cd-gpios = <&gpio 121 1>; /* gpio PP1 */
wp-gpios = <&gpio 122 0>; /* gpio PP2 */
bus-width = <4>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra20-ventana.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@

sdhci@c8000400 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 70 0>; /* gpio PI6 */
bus-width = <4>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20-whistler.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@

sdhci@c8000400 {
status = "okay";
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 173 0>; /* gpio PV5 */
bus-width = <8>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra30-beaver.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@

sdhci@78000000 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 155 0>; /* gpio PT3 */
power-gpios = <&gpio 31 0>; /* gpio PD7 */
bus-width = <4>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/tegra30-cardhu.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@

sdhci@78000000 {
status = "okay";
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
cd-gpios = <&gpio 69 1>; /* gpio PI5 */
wp-gpios = <&gpio 155 0>; /* gpio PT3 */
power-gpios = <&gpio 31 0>; /* gpio PD7 */
bus-width = <4>;
Expand Down

0 comments on commit f73548c

Please sign in to comment.