Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f73548c4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-3.10-fixes-for-mmc' of... 

Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/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: default avatarArnd Bergmann <arnd@arndb.de>
parents 0f6b9ee4 908ab936

arch/arm/boot/dts/tegra20-colibri-512.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ 
	};



	sdhci@c8000600 {

		cd-gpios = <&gpio 23 0>; /* gpio PC7 */

		cd-gpios = <&gpio 23 1>; /* gpio PC7 */

	};



	sound {

arch/arm/boot/dts/tegra20-harmony.dts

+2 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ 


	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>;
@@ -445,7 +445,7 @@ 


	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>;

arch/arm/boot/dts/tegra20-paz00.dts

+1 −1
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/tegra20-seaboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/tegra20-tamonten.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -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";