From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 24 Mar 2012 19:15:55 +0000 (+0000)
Subject: Merge branch 'kirkwood/dt' into next/dt2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7d1206bc2859c6e9f46e35ae697c138e7d7858a7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'kirkwood/dt' into next/dt2

This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.

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

7d1206bc2859c6e9f46e35ae697c138e7d7858a7
diff --cc arch/arm/boot/dts/tegra-paz00.dts
index 3c1ff5a43fb7,61f385809970..6c02abb469d4
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@@ -42,32 -35,13 +42,37 @@@
  
  	i2c@7000d000 {
  		clock-frequency = <400000>;
+ 
+ 		adt7461@4c {
+ 			compatible = "adi,adt7461";
+ 			reg = <0x4c>;
+ 		};
  	};
  
 +	i2s@70002a00 {
 +		status = "disable";
 +	};
 +
 +	sound {
 +		compatible = "nvidia,tegra-audio-alc5632-paz00",
 +			"nvidia,tegra-audio-alc5632";
 +
 +		nvidia,model = "Compal PAZ00";
 +
 +		nvidia,audio-routing =
 +			"Int Spk", "SPKOUT",
 +			"Int Spk", "SPKOUTN",
 +			"Headset Mic", "MICBIAS1",
 +			"MIC1", "Headset Mic",
 +			"Headset Stereophone", "HPR",
 +			"Headset Stereophone", "HPL",
 +			"DMICDAT", "Digital Mic";
 +
 +		nvidia,audio-codec = <&alc5632>;
 +		nvidia,i2s-controller = <&tegra_i2s1>;
 +		nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
 +	};
 +
  	serial@70006000 {
  		clock-frequency = <216000000>;
  	};