Merge branch 'for-3.5/dt' into for-3.5/dt2-new

4 files changed, 67 insertions, 14 deletions

diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts
index ab8d901b5ab6..facb950c4bec 100644
--- a/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@ -93,6 +93,14 @@
 
         i2c@7000c500 {
                 clock-frequency = <100000>;
+
+                /* ALS and Proximity sensor */
+                isl29028@44 {
+                        compatible = "isil,isl29028";
+                        reg = <0x44>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <88 0x04>; /*gpio PL0 */
+                };
         };
 
         i2c@7000c700 {
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index ed0a2f5bf918..c4d171ec9ee4 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -100,7 +100,7 @@
                         };
                         hdint {
                                 nvidia,pins = "hdint", "lpw0", "lpw2", "lsc1",
-                                        "lsck", "lsda", "pta";
+                                        "lsck", "lsda";
                                 nvidia,function = "hdmi";
                         };
                         i2cp {
@@ -134,6 +134,10 @@
                                 nvidia,pins = "pmc";
                                 nvidia,function = "pwr_on";
                         };
+                        pta {
+                                nvidia,pins = "pta";
+                                nvidia,function = "i2c2";
+                        };
                         rm {
                                 nvidia,pins = "rm";
                                 nvidia,function = "i2c1";
@@ -270,10 +274,32 @@
                         micdet-delay = <100>;
                         gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >;
                 };
+
+                /* ALS and proximity sensor */
+                isl29018@44 {
+                        compatible = "isil,isl29018";
+                        reg = <0x44>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = < 202 0x04 >; /* GPIO PZ2 */
+                };
+
+                gyrometer@68 {
+                        compatible = "invn,mpu3050";
+                        reg = <0x68>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <204 0x04>; /* gpio PZ4 */
+                };
         };
 
         i2c@7000c400 {
-                clock-frequency = <400000>;
+                clock-frequency = <100000>;
+
+                smart-battery@b {
+                        compatible = "ti,bq20z75", "smart-battery-1.1";
+                        reg = <0xb>;
+                        ti,i2c-retry-count = <2>;
+                        ti,poll-retry-count = <10>;
+                };
         };
 
         i2c@7000c500 {
@@ -283,10 +309,17 @@
         i2c@7000d000 {
                 clock-frequency = <400000>;
 
-                adt7461@4c {
-                        compatible = "adt7461";
+                temperature-sensor@4c {
+                        compatible = "nct1008";
                         reg = <0x4c>;
                 };
+
+                magnetometer@c {
+                        compatible = "ak8975";
+                        reg = <0xc>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <109 0x04>; /* gpio PN5 */
+                };
         };
 
         i2s@70002a00 {
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index e4fcf9a8178a..ead93657dd06 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -250,13 +250,19 @@
 
         i2c@7000c500 {
                 clock-frequency = <400000>;
-        };
 
-        i2c@7000d000 {
-                status = "disable";
+                codec: codec@1a {
+                        compatible = "ti,tlv320aic23";
+                        reg = <0x1a>;
+                };
+
+                rtc@56 {
+                        compatible = "emmicro,em3027";
+                        reg = <0x56>;
+                };
         };
 
-        i2s@70002800 {
+        i2c@7000d000 {
                 status = "disable";
         };
 
@@ -264,8 +270,10 @@
                 status = "disable";
         };
 
-        das@70000c00 {
-                status = "disable";
+        sound {
+                compatible = "nvidia,tegra-audio-trimslice";
+                nvidia,i2s-controller = <&tegra_i2s1>;
+                nvidia,audio-codec = <&codec>;
         };
 
         serial@70006000 {
@@ -288,10 +296,6 @@
                 status = "disable";
         };
 
-        sdhci@c8000000 {
-                status = "disable";
-        };
-
         sdhci@c8000200 {
                 status = "disable";
         };
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index bd074cfb338f..c20d5e93f9c9 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -256,6 +256,14 @@
                         micdet-delay = <100>;
                         gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >;
                 };
+
+                /* ALS and proximity sensor */
+                isl29018@44 {
+                        compatible = "isil,isl29018";
+                        reg = <0x44>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <202 0x04>; /*gpio PZ2 */
+                };
         };
 
         i2c@7000c400 {