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

diff --cc arch/arm/boot/dts/tegra20-ventana.dts
index bec8bb297ad827bc8d756b1788d90129b13eb935,ee5aaf2ca9059adf29a18efa64484abb28b27375..1dde0d360564629e8a63b33e87e25b814cc3bc90
--- 1/arch/arm/boot/dts/tegra20-ventana.dts
--- 2/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 {