Commit 3be1812e authored Apr 09, 2013 by Arnd Bergmann

Merge branch 'tegra/cleanup' into next/soc



This is a dependency for the tegra/soc branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 759417ac 6affb482

arch/arm/boot/dts/tegra114.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@
		};

		pmc {
		compatible = "nvidia,tegra114-pmc", "nvidia,tegra30-pmc";
		compatible = "nvidia,tegra114-pmc";
		reg = <0x7000e400 0x400>;
		};

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