From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 14 May 2012 19:48:45 +0000 (+0200)
Subject: Merge branch 'drivers/mmc' into next/drivers
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c49314fa6c7d2c130d850b30980cffab53a40592;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'drivers/mmc' into next/drivers

* drivers/mmc:
  mmc: dt: Consolidate DT bindings

Also pulls in the omap/dt-missed-3.4 branch as a dependency.

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

c49314fa6c7d2c130d850b30980cffab53a40592
diff --cc arch/arm/boot/dts/tegra-cardhu.dts
index ab8d901b5ab6,67c6511f6372..4a166357172b
--- a/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@@ -133,45 -67,6 +134,46 @@@
  
  	sdhci@78000400 {
  		support-8bit;
+ 		bus-width = <8>;
  	};
 +
 +	ahub@70080000 {
 +		i2s@70080300 {
 +			status = "disable";
 +		};
 +
 +		i2s@70080500 {
 +			status = "disable";
 +		};
 +
 +		i2s@70080600 {
 +			status = "disable";
 +		};
 +
 +		i2s@70080700 {
 +			status = "disable";
 +		};
 +	};
 +
 +	sound {
 +		compatible = "nvidia,tegra-audio-wm8903-cardhu",
 +			     "nvidia,tegra-audio-wm8903";
 +		nvidia,model = "NVIDIA Tegra Cardhu";
 +
 +		nvidia,audio-routing =
 +			"Headphone Jack", "HPOUTR",
 +			"Headphone Jack", "HPOUTL",
 +			"Int Spk", "ROP",
 +			"Int Spk", "RON",
 +			"Int Spk", "LOP",
 +			"Int Spk", "LON",
 +			"Mic Jack", "MICBIAS",
 +			"IN1L", "Mic Jack";
 +
 +		nvidia,i2s-controller = <&tegra_i2s1>;
 +		nvidia,audio-codec = <&wm8903>;
 +
 +		nvidia,spkr-en-gpios = <&wm8903 2 0>;
 +		nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
 +	};
  };
diff --cc arch/arm/boot/dts/tegra-harmony.dts
index 6857cec8382d,e9cae68861de..7cd513ac5ea6
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@@ -335,9 -112,6 +336,10 @@@
  		wp-gpios = <&gpio 59 0>; /* gpio PH3 */
  		power-gpios = <&gpio 70 0>; /* gpio PI6 */
  		support-8bit;
+ 		bus-width = <8>;
  	};
 +
 +	usb@c5004000 {
 +		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 +	};
  };
diff --cc arch/arm/boot/dts/tegra-ventana.dts
index bd074cfb338f,29e54c7a3657..b922a26747e7
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@@ -334,9 -105,6 +335,10 @@@
  
  	sdhci@c8000600 {
  		support-8bit;
+ 		bus-width = <8>;
  	};
 +
 +	usb@c5004000 {
 +		nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
 +	};
  };