From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 25 Oct 2012 20:34:23 +0000 (-0600)
Subject: Merge branch 'for-3.8/dt' into for-next
X-Git-Tag: next-20121026~9^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=862a432b88a904c634ef080eb964d1c7062196ad;p=karo-tx-linux.git

Merge branch 'for-3.8/dt' into for-next
---

862a432b88a904c634ef080eb964d1c7062196ad
diff --cc arch/arm/boot/dts/tegra20-ventana.dts
index bec8bb297ad8,ee5aaf2ca905..1dde0d360564
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@@ -237,17 -236,40 +236,50 @@@
  					"ld23_22";
  				nvidia,pull = <1>;
  			};
 +			drive_sdio1 {
 +				nvidia,pins = "drive_sdio1";
 +				nvidia,high-speed-mode = <0>;
 +				nvidia,schmitt = <1>;
 +				nvidia,low-power-mode = <3>;
 +				nvidia,pull-down-strength = <31>;
 +				nvidia,pull-up-strength = <31>;
 +				nvidia,slew-rate-rising = <3>;
 +				nvidia,slew-rate-falling = <3>;
 +			};
  		};
+ 
+ 		state_i2cmux_ddc: pinmux_i2cmux_ddc {
+ 			ddc {
+ 				nvidia,pins = "ddc";
+ 				nvidia,function = "i2c2";
+ 			};
+ 			pta {
+ 				nvidia,pins = "pta";
+ 				nvidia,function = "rsvd4";
+ 			};
+ 		};
+ 
+ 		state_i2cmux_pta: pinmux_i2cmux_pta {
+ 			ddc {
+ 				nvidia,pins = "ddc";
+ 				nvidia,function = "rsvd4";
+ 			};
+ 			pta {
+ 				nvidia,pins = "pta";
+ 				nvidia,function = "i2c2";
+ 			};
+ 		};
+ 
+ 		state_i2cmux_idle: pinmux_i2cmux_idle {
+ 			ddc {
+ 				nvidia,pins = "ddc";
+ 				nvidia,function = "rsvd4";
+ 			};
+ 			pta {
+ 				nvidia,pins = "pta";
+ 				nvidia,function = "rsvd4";
+ 			};
+ 		};
  	};
  
  	i2s@70002800 {