41 files changed, 3526 insertions, 688 deletions

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 399d17b231d2..49945cc1bc7d 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -23,4 +23,52 @@
         chosen {
                 bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200";
         };
+
+        i2c@12C60000 {
+                samsung,i2c-sda-delay = <100>;
+                samsung,i2c-max-bus-freq = <20000>;
+                gpios = <&gpb3 0 2 3 0>,
+                        <&gpb3 1 2 3 0>;
+
+                eeprom@50 {
+                        compatible = "samsung,s524ad0xd1";
+                        reg = <0x50>;
+                };
+        };
+
+        i2c@12C70000 {
+                samsung,i2c-sda-delay = <100>;
+                samsung,i2c-max-bus-freq = <20000>;
+                gpios = <&gpb3 2 2 3 0>,
+                        <&gpb3 3 2 3 0>;
+
+                eeprom@51 {
+                        compatible = "samsung,s524ad0xd1";
+                        reg = <0x51>;
+                };
+        };
+
+        i2c@12C80000 {
+                status = "disabled";
+        };
+
+        i2c@12C90000 {
+                status = "disabled";
+        };
+
+        i2c@12CA0000 {
+                status = "disabled";
+        };
+
+        i2c@12CB0000 {
+                status = "disabled";
+        };
+
+        i2c@12CC0000 {
+                status = "disabled";
+        };
+
+        i2c@12CD0000 {
+                status = "disabled";
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index dfc433599436..5ca0cdb76413 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -23,11 +23,11 @@
         compatible = "samsung,exynos5250";
         interrupt-parent = <&gic>;
 
-        gic:interrupt-controller@10490000 {
+        gic:interrupt-controller@10481000 {
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
                 interrupt-controller;
-                reg = <0x10490000 0x1000>, <0x10480000 0x100>;
+                reg = <0x10481000 0x1000>, <0x10482000 0x2000>;
         };
 
         watchdog {
@@ -42,30 +42,6 @@
                 interrupts = <0 43 0>, <0 44 0>;
         };
 
-        sdhci@12200000 {
-                compatible = "samsung,exynos4210-sdhci";
-                reg = <0x12200000 0x100>;
-                interrupts = <0 75 0>;
-        };
-
-        sdhci@12210000 {
-                compatible = "samsung,exynos4210-sdhci";
-                reg = <0x12210000 0x100>;
-                interrupts = <0 76 0>;
-        };
-
-        sdhci@12220000 {
-                compatible = "samsung,exynos4210-sdhci";
-                reg = <0x12220000 0x100>;
-                interrupts = <0 77 0>;
-        };
-
-        sdhci@12230000 {
-                compatible = "samsung,exynos4210-sdhci";
-                reg = <0x12230000 0x100>;
-                interrupts = <0 78 0>;
-        };
-
         serial@12C00000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x12C00000 0x100>;
@@ -94,48 +70,64 @@
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x12C60000 0x100>;
                 interrupts = <0 56 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         i2c@12C70000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x12C70000 0x100>;
                 interrupts = <0 57 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         i2c@12C80000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x12C80000 0x100>;
                 interrupts = <0 58 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         i2c@12C90000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x12C90000 0x100>;
                 interrupts = <0 59 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         i2c@12CA0000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x12CA0000 0x100>;
                 interrupts = <0 60 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         i2c@12CB0000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x12CB0000 0x100>;
                 interrupts = <0 61 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         i2c@12CC0000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x12CC0000 0x100>;
                 interrupts = <0 62 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         i2c@12CD0000 {
                 compatible = "samsung,s3c2440-i2c";
                 reg = <0x12CD0000 0x100>;
                 interrupts = <0 63 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         amba {
@@ -157,13 +149,13 @@
                         interrupts = <0 35 0>;
                 };
 
-                mdma0: pdma@10800000 {
+                mdma0: mdma@10800000 {
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x10800000 0x1000>;
                         interrupts = <0 33 0>;
                 };
 
-                mdma1: pdma@11C10000 {
+                mdma1: mdma@11C10000 {
                         compatible = "arm,pl330", "arm,primecell";
                         reg = <0x11C10000 0x1000>;
                         interrupts = <0 124 0>;
@@ -242,6 +234,12 @@
                         #gpio-cells = <4>;
                 };
 
+                gpc4: gpio-controller@114002E0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x114002E0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
                 gpd0: gpio-controller@11400160 {
                         compatible = "samsung,exynos4-gpio";
                         reg = <0x11400160 0x20>;
@@ -388,19 +386,19 @@
 
                 gpv2: gpio-controller@10D10040 {
                         compatible = "samsung,exynos4-gpio";
-                        reg = <0x10D10040 0x20>;
+                        reg = <0x10D10060 0x20>;
                         #gpio-cells = <4>;
                 };
 
                 gpv3: gpio-controller@10D10060 {
                         compatible = "samsung,exynos4-gpio";
-                        reg = <0x10D10060 0x20>;
+                        reg = <0x10D10080 0x20>;
                         #gpio-cells = <4>;
                 };
 
                 gpv4: gpio-controller@10D10080 {
                         compatible = "samsung,exynos4-gpio";
-                        reg = <0x10D10080 0x20>;
+                        reg = <0x10D100C0 0x20>;
                         #gpio-cells = <4>;
                 };
 
diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
new file mode 100644
index 000000000000..70bffa929b65
--- /dev/null
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "imx23.dtsi"
+
+/ {
+        model = "Freescale i.MX23 Evaluation Kit";
+        compatible = "fsl,imx23-evk", "fsl,imx23";
+
+        memory {
+                reg = <0x40000000 0x08000000>;
+        };
+
+        apb@80000000 {
+                apbh@80000000 {
+                        ssp0: ssp@80010000 {
+                                compatible = "fsl,imx23-mmc";
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&mmc0_8bit_pins_a &mmc0_pins_fixup>;
+                                bus-width = <8>;
+                                wp-gpios = <&gpio1 30 0>;
+                                status = "okay";
+                        };
+                };
+
+                apbx@80040000 {
+                        duart: serial@80070000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&duart_pins_a>;
+                                status = "okay";
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
new file mode 100644
index 000000000000..8c5f9994f3fc
--- /dev/null
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+        interrupt-parent = <&icoll>;
+
+        aliases {
+                gpio0 = &gpio0;
+                gpio1 = &gpio1;
+                gpio2 = &gpio2;
+        };
+
+        cpus {
+                cpu@0 {
+                        compatible = "arm,arm926ejs";
+                };
+        };
+
+        apb@80000000 {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                reg = <0x80000000 0x80000>;
+                ranges;
+
+                apbh@80000000 {
+                        compatible = "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x80000000 0x40000>;
+                        ranges;
+
+                        icoll: interrupt-controller@80000000 {
+                                compatible = "fsl,imx23-icoll", "fsl,mxs-icoll";
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                                reg = <0x80000000 0x2000>;
+                        };
+
+                        dma-apbh@80004000 {
+                                compatible = "fsl,imx23-dma-apbh";
+                                reg = <0x80004000 2000>;
+                        };
+
+                        ecc@80008000 {
+                                reg = <0x80008000 2000>;
+                                status = "disabled";
+                        };
+
+                        bch@8000a000 {
+                                reg = <0x8000a000 2000>;
+                                status = "disabled";
+                        };
+
+                        gpmi@8000c000 {
+                                reg = <0x8000c000 2000>;
+                                status = "disabled";
+                        };
+
+                        ssp0: ssp@80010000 {
+                                reg = <0x80010000 2000>;
+                                interrupts = <15 14>;
+                                fsl,ssp-dma-channel = <1>;
+                                status = "disabled";
+                        };
+
+                        etm@80014000 {
+                                reg = <0x80014000 2000>;
+                                status = "disabled";
+                        };
+
+                        pinctrl@80018000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx23-pinctrl", "simple-bus";
+                                reg = <0x80018000 2000>;
+
+                                gpio0: gpio@0 {
+                                        compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";
+                                        interrupts = <16>;
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        interrupt-controller;
+                                        #interrupt-cells = <2>;
+                                };
+
+                                gpio1: gpio@1 {
+                                        compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";
+                                        interrupts = <17>;
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        interrupt-controller;
+                                        #interrupt-cells = <2>;
+                                };
+
+                                gpio2: gpio@2 {
+                                        compatible = "fsl,imx23-gpio", "fsl,mxs-gpio";
+                                        interrupts = <18>;
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        interrupt-controller;
+                                        #interrupt-cells = <2>;
+                                };
+
+                                duart_pins_a: duart@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <0x11a2 0x11b2>;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                mmc0_8bit_pins_a: mmc0-8bit@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <0x2020 0x2030 0x2040
+                                                0x2050 0x0082 0x0092 0x00a2
+                                                0x00b2 0x2000 0x2010 0x2060>;
+                                        fsl,drive-strength = <1>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                mmc0_pins_fixup: mmc0-pins-fixup {
+                                        fsl,pinmux-ids = <0x2010 0x2060>;
+                                        fsl,pull-up = <0>;
+                                };
+                        };
+
+                        digctl@8001c000 {
+                                reg = <0x8001c000 2000>;
+                                status = "disabled";
+                        };
+
+                        emi@80020000 {
+                                reg = <0x80020000 2000>;
+                                status = "disabled";
+                        };
+
+                        dma-apbx@80024000 {
+                                compatible = "fsl,imx23-dma-apbx";
+                                reg = <0x80024000 2000>;
+                        };
+
+                        dcp@80028000 {
+                                reg = <0x80028000 2000>;
+                                status = "disabled";
+                        };
+
+                        pxp@8002a000 {
+                                reg = <0x8002a000 2000>;
+                                status = "disabled";
+                        };
+
+                        ocotp@8002c000 {
+                                reg = <0x8002c000 2000>;
+                                status = "disabled";
+                        };
+
+                        axi-ahb@8002e000 {
+                                reg = <0x8002e000 2000>;
+                                status = "disabled";
+                        };
+
+                        lcdif@80030000 {
+                                reg = <0x80030000 2000>;
+                                status = "disabled";
+                        };
+
+                        ssp1: ssp@80034000 {
+                                reg = <0x80034000 2000>;
+                                interrupts = <2 20>;
+                                fsl,ssp-dma-channel = <2>;
+                                status = "disabled";
+                        };
+
+                        tvenc@80038000 {
+                                reg = <0x80038000 2000>;
+                                status = "disabled";
+                        };
+                };
+
+                apbx@80040000 {
+                        compatible = "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x80040000 0x40000>;
+                        ranges;
+
+                        clkctl@80040000 {
+                                reg = <0x80040000 2000>;
+                                status = "disabled";
+                        };
+
+                        saif0: saif@80042000 {
+                                reg = <0x80042000 2000>;
+                                status = "disabled";
+                        };
+
+                        power@80044000 {
+                                reg = <0x80044000 2000>;
+                                status = "disabled";
+                        };
+
+                        saif1: saif@80046000 {
+                                reg = <0x80046000 2000>;
+                                status = "disabled";
+                        };
+
+                        audio-out@80048000 {
+                                reg = <0x80048000 2000>;
+                                status = "disabled";
+                        };
+
+                        audio-in@8004c000 {
+                                reg = <0x8004c000 2000>;
+                                status = "disabled";
+                        };
+
+                        lradc@80050000 {
+                                reg = <0x80050000 2000>;
+                                status = "disabled";
+                        };
+
+                        spdif@80054000 {
+                                reg = <0x80054000 2000>;
+                                status = "disabled";
+                        };
+
+                        i2c@80058000 {
+                                reg = <0x80058000 2000>;
+                                status = "disabled";
+                        };
+
+                        rtc@8005c000 {
+                                reg = <0x8005c000 2000>;
+                                status = "disabled";
+                        };
+
+                        pwm@80064000 {
+                                reg = <0x80064000 2000>;
+                                status = "disabled";
+                        };
+
+                        timrot@80068000 {
+                                reg = <0x80068000 2000>;
+                                status = "disabled";
+                        };
+
+                        auart0: serial@8006c000 {
+                                reg = <0x8006c000 0x2000>;
+                                status = "disabled";
+                        };
+
+                        auart1: serial@8006e000 {
+                                reg = <0x8006e000 0x2000>;
+                                status = "disabled";
+                        };
+
+                        duart: serial@80070000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x80070000 0x2000>;
+                                interrupts = <0>;
+                                status = "disabled";
+                        };
+
+                        usbphy@8007c000 {
+                                reg = <0x8007c000 0x2000>;
+                                status = "disabled";
+                        };
+                };
+        };
+
+        ahb@80080000 {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                reg = <0x80080000 0x80000>;
+                ranges;
+
+                usbctrl@80080000 {
+                        reg = <0x80080000 0x10000>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore.dts b/arch/arm/boot/dts/imx27-phytec-phycore.dts
index a51a08fc2af9..2b0ff60247a4 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore.dts
@@ -27,22 +27,22 @@
                                 status = "okay";
                         };
 
-                        uart@1000a000 {
+                        serial@1000a000 {
                                 fsl,uart-has-rtscts;
                                 status = "okay";
                         };
 
-                        uart@1000b000 {
+                        serial@1000b000 {
                                 fsl,uart-has-rtscts;
                                 status = "okay";
                         };
 
-                        uart@1000c000 {
+                        serial@1000c000 {
                                 fsl,uart-has-rtscts;
                                 status = "okay";
                         };
 
-                        fec@1002b000 {
+                        ethernet@1002b000 {
                                 status = "okay";
                         };
 
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index bc5e7d5ddd54..2b1a166d41f9 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -59,28 +59,28 @@
                                 status = "disabled";
                         };
 
-                        uart1: uart@1000a000 {
+                        uart1: serial@1000a000 {
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000a000 0x1000>;
                                 interrupts = <20>;
                                 status = "disabled";
                         };
 
-                        uart2: uart@1000b000 {
+                        uart2: serial@1000b000 {
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000b000 0x1000>;
                                 interrupts = <19>;
                                 status = "disabled";
                         };
 
-                        uart3: uart@1000c000 {
+                        uart3: serial@1000c000 {
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000c000 0x1000>;
                                 interrupts = <18>;
                                 status = "disabled";
                         };
 
-                        uart4: uart@1000d000 {
+                        uart4: serial@1000d000 {
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000d000 0x1000>;
                                 interrupts = <17>;
@@ -183,14 +183,14 @@
                                 status = "disabled";
                         };
 
-                        uart5: uart@1001b000 {
+                        uart5: serial@1001b000 {
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1001b000 0x1000>;
                                 interrupts = <49>;
                                 status = "disabled";
                         };
 
-                        uart6: uart@1001c000 {
+                        uart6: serial@1001c000 {
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1001c000 0x1000>;
                                 interrupts = <48>;
@@ -206,7 +206,7 @@
                                 status = "disabled";
                         };
 
-                        fec: fec@1002b000 {
+                        fec: ethernet@1002b000 {
                                 compatible = "fsl,imx27-fec";
                                 reg = <0x1002b000 0x4000>;
                                 interrupts = <50>;
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
new file mode 100644
index 000000000000..ee520a529cb4
--- /dev/null
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "imx28.dtsi"
+
+/ {
+        model = "Freescale i.MX28 Evaluation Kit";
+        compatible = "fsl,imx28-evk", "fsl,imx28";
+
+        memory {
+                reg = <0x40000000 0x08000000>;
+        };
+
+        apb@80000000 {
+                apbh@80000000 {
+                        ssp0: ssp@80010000 {
+                                compatible = "fsl,imx28-mmc";
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&mmc0_8bit_pins_a
+                                        &mmc0_cd_cfg &mmc0_sck_cfg>;
+                                bus-width = <8>;
+                                wp-gpios = <&gpio2 12 0>;
+                                status = "okay";
+                        };
+
+                        ssp1: ssp@80012000 {
+                                compatible = "fsl,imx28-mmc";
+                                bus-width = <8>;
+                                wp-gpios = <&gpio0 28 0>;
+                                status = "okay";
+                        };
+                };
+
+                apbx@80040000 {
+                        saif0: saif@80042000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&saif0_pins_a>;
+                                status = "okay";
+                        };
+
+                        saif1: saif@80046000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&saif1_pins_a>;
+                                fsl,saif-master = <&saif0>;
+                                status = "okay";
+                        };
+
+                        i2c0: i2c@80058000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&i2c0_pins_a>;
+                                status = "okay";
+
+                                sgtl5000: codec@0a {
+                                        compatible = "fsl,sgtl5000";
+                                        reg = <0x0a>;
+                                        VDDA-supply = <&reg_3p3v>;
+                                        VDDIO-supply = <&reg_3p3v>;
+
+                                };
+                        };
+
+                        duart: serial@80074000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&duart_pins_a>;
+                                status = "okay";
+                        };
+                };
+        };
+
+        ahb@80080000 {
+                mac0: ethernet@800f0000 {
+                        phy-mode = "rmii";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mac0_pins_a>;
+                        status = "okay";
+                };
+
+                mac1: ethernet@800f4000 {
+                        phy-mode = "rmii";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mac1_pins_a>;
+                        status = "okay";
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+
+                reg_3p3v: 3p3v {
+                        compatible = "regulator-fixed";
+                        regulator-name = "3P3V";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+        };
+
+        sound {
+                compatible = "fsl,imx28-evk-sgtl5000",
+                             "fsl,mxs-audio-sgtl5000";
+                model = "imx28-evk-sgtl5000";
+                saif-controllers = <&saif0 &saif1>;
+                audio-codec = <&sgtl5000>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
new file mode 100644
index 000000000000..4634cb861a59
--- /dev/null
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -0,0 +1,497 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+        interrupt-parent = <&icoll>;
+
+        aliases {
+                gpio0 = &gpio0;
+                gpio1 = &gpio1;
+                gpio2 = &gpio2;
+                gpio3 = &gpio3;
+                gpio4 = &gpio4;
+                saif0 = &saif0;
+                saif1 = &saif1;
+        };
+
+        cpus {
+                cpu@0 {
+                        compatible = "arm,arm926ejs";
+                };
+        };
+
+        apb@80000000 {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                reg = <0x80000000 0x80000>;
+                ranges;
+
+                apbh@80000000 {
+                        compatible = "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x80000000 0x3c900>;
+                        ranges;
+
+                        icoll: interrupt-controller@80000000 {
+                                compatible = "fsl,imx28-icoll", "fsl,mxs-icoll";
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                                reg = <0x80000000 0x2000>;
+                        };
+
+                        hsadc@80002000 {
+                                reg = <0x80002000 2000>;
+                                interrupts = <13 87>;
+                                status = "disabled";
+                        };
+
+                        dma-apbh@80004000 {
+                                compatible = "fsl,imx28-dma-apbh";
+                                reg = <0x80004000 2000>;
+                        };
+
+                        perfmon@80006000 {
+                                reg = <0x80006000 800>;
+                                interrupts = <27>;
+                                status = "disabled";
+                        };
+
+                        bch@8000a000 {
+                                reg = <0x8000a000 2000>;
+                                interrupts = <41>;
+                                status = "disabled";
+                        };
+
+                        gpmi@8000c000 {
+                                reg = <0x8000c000 2000>;
+                                interrupts = <42 88>;
+                                status = "disabled";
+                        };
+
+                        ssp0: ssp@80010000 {
+                                reg = <0x80010000 2000>;
+                                interrupts = <96 82>;
+                                fsl,ssp-dma-channel = <0>;
+                                status = "disabled";
+                        };
+
+                        ssp1: ssp@80012000 {
+                                reg = <0x80012000 2000>;
+                                interrupts = <97 83>;
+                                fsl,ssp-dma-channel = <1>;
+                                status = "disabled";
+                        };
+
+                        ssp2: ssp@80014000 {
+                                reg = <0x80014000 2000>;
+                                interrupts = <98 84>;
+                                fsl,ssp-dma-channel = <2>;
+                                status = "disabled";
+                        };
+
+                        ssp3: ssp@80016000 {
+                                reg = <0x80016000 2000>;
+                                interrupts = <99 85>;
+                                fsl,ssp-dma-channel = <3>;
+                                status = "disabled";
+                        };
+
+                        pinctrl@80018000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx28-pinctrl", "simple-bus";
+                                reg = <0x80018000 2000>;
+
+                                gpio0: gpio@0 {
+                                        compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";
+                                        interrupts = <127>;
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        interrupt-controller;
+                                        #interrupt-cells = <2>;
+                                };
+
+                                gpio1: gpio@1 {
+                                        compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";
+                                        interrupts = <126>;
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        interrupt-controller;
+                                        #interrupt-cells = <2>;
+                                };
+
+                                gpio2: gpio@2 {
+                                        compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";
+                                        interrupts = <125>;
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        interrupt-controller;
+                                        #interrupt-cells = <2>;
+                                };
+
+                                gpio3: gpio@3 {
+                                        compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";
+                                        interrupts = <124>;
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        interrupt-controller;
+                                        #interrupt-cells = <2>;
+                                };
+
+                                gpio4: gpio@4 {
+                                        compatible = "fsl,imx28-gpio", "fsl,mxs-gpio";
+                                        interrupts = <123>;
+                                        gpio-controller;
+                                        #gpio-cells = <2>;
+                                        interrupt-controller;
+                                        #interrupt-cells = <2>;
+                                };
+
+                                duart_pins_a: duart@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <0x3102 0x3112>;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                mac0_pins_a: mac0@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <0x4000 0x4010 0x4020
+                                                0x4030 0x4040 0x4060 0x4070
+                                                0x4080 0x4100>;
+                                        fsl,drive-strength = <1>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                mac1_pins_a: mac1@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <0x40f1 0x4091 0x40a1
+                                                0x40e1 0x40b1 0x40c1>;
+                                        fsl,drive-strength = <1>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                mmc0_8bit_pins_a: mmc0-8bit@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <0x2000 0x2010 0x2020
+                                                0x2030 0x2040 0x2050 0x2060
+                                                0x2070 0x2080 0x2090 0x20a0>;
+                                        fsl,drive-strength = <1>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                mmc0_cd_cfg: mmc0-cd-cfg {
+                                        fsl,pinmux-ids = <0x2090>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                mmc0_sck_cfg: mmc0-sck-cfg {
+                                        fsl,pinmux-ids = <0x20a0>;
+                                        fsl,drive-strength = <2>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                i2c0_pins_a: i2c0@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <0x3180 0x3190>;
+                                        fsl,drive-strength = <1>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                saif0_pins_a: saif0@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids =
+                                                <0x3140 0x3150 0x3160 0x3170>;
+                                        fsl,drive-strength = <2>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                saif1_pins_a: saif1@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <0x31a0>;
+                                        fsl,drive-strength = <2>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+                        };
+
+                        digctl@8001c000 {
+                                reg = <0x8001c000 2000>;
+                                interrupts = <89>;
+                                status = "disabled";
+                        };
+
+                        etm@80022000 {
+                                reg = <0x80022000 2000>;
+                                status = "disabled";
+                        };
+
+                        dma-apbx@80024000 {
+                                compatible = "fsl,imx28-dma-apbx";
+                                reg = <0x80024000 2000>;
+                        };
+
+                        dcp@80028000 {
+                                reg = <0x80028000 2000>;
+                                interrupts = <52 53 54>;
+                                status = "disabled";
+                        };
+
+                        pxp@8002a000 {
+                                reg = <0x8002a000 2000>;
+                                interrupts = <39>;
+                                status = "disabled";
+                        };
+
+                        ocotp@8002c000 {
+                                reg = <0x8002c000 2000>;
+                                status = "disabled";
+                        };
+
+                        axi-ahb@8002e000 {
+                                reg = <0x8002e000 2000>;
+                                status = "disabled";
+                        };
+
+                        lcdif@80030000 {
+                                reg = <0x80030000 2000>;
+                                interrupts = <38 86>;
+                                status = "disabled";
+                        };
+
+                        can0: can@80032000 {
+                                reg = <0x80032000 2000>;
+                                interrupts = <8>;
+                                status = "disabled";
+                        };
+
+                        can1: can@80034000 {
+                                reg = <0x80034000 2000>;
+                                interrupts = <9>;
+                                status = "disabled";
+                        };
+
+                        simdbg@8003c000 {
+                                reg = <0x8003c000 200>;
+                                status = "disabled";
+                        };
+
+                        simgpmisel@8003c200 {
+                                reg = <0x8003c200 100>;
+                                status = "disabled";
+                        };
+
+                        simsspsel@8003c300 {
+                                reg = <0x8003c300 100>;
+                                status = "disabled";
+                        };
+
+                        simmemsel@8003c400 {
+                                reg = <0x8003c400 100>;
+                                status = "disabled";
+                        };
+
+                        gpiomon@8003c500 {
+                                reg = <0x8003c500 100>;
+                                status = "disabled";
+                        };
+
+                        simenet@8003c700 {
+                                reg = <0x8003c700 100>;
+                                status = "disabled";
+                        };
+
+                        armjtag@8003c800 {
+                                reg = <0x8003c800 100>;
+                                status = "disabled";
+                        };
+                };
+
+                apbx@80040000 {
+                        compatible = "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x80040000 0x40000>;
+                        ranges;
+
+                        clkctl@80040000 {
+                                reg = <0x80040000 2000>;
+                                status = "disabled";
+                        };
+
+                        saif0: saif@80042000 {
+                                compatible = "fsl,imx28-saif";
+                                reg = <0x80042000 2000>;
+                                interrupts = <59 80>;
+                                fsl,saif-dma-channel = <4>;
+                                status = "disabled";
+                        };
+
+                        power@80044000 {
+                                reg = <0x80044000 2000>;
+                                status = "disabled";
+                        };
+
+                        saif1: saif@80046000 {
+                                compatible = "fsl,imx28-saif";
+                                reg = <0x80046000 2000>;
+                                interrupts = <58 81>;
+                                fsl,saif-dma-channel = <5>;
+                                status = "disabled";
+                        };
+
+                        lradc@80050000 {
+                                reg = <0x80050000 2000>;
+                                status = "disabled";
+                        };
+
+                        spdif@80054000 {
+                                reg = <0x80054000 2000>;
+                                interrupts = <45 66>;
+                                status = "disabled";
+                        };
+
+                        rtc@80056000 {
+                                reg = <0x80056000 2000>;
+                                interrupts = <28 29>;
+                                status = "disabled";
+                        };
+
+                        i2c0: i2c@80058000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx28-i2c";
+                                reg = <0x80058000 2000>;
+                                interrupts = <111 68>;
+                                status = "disabled";
+                        };
+
+                        i2c1: i2c@8005a000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx28-i2c";
+                                reg = <0x8005a000 2000>;
+                                interrupts = <110 69>;
+                                status = "disabled";
+                        };
+
+                        pwm@80064000 {
+                                reg = <0x80064000 2000>;
+                                status = "disabled";
+                        };
+
+                        timrot@80068000 {
+                                reg = <0x80068000 2000>;
+                                status = "disabled";
+                        };
+
+                        auart0: serial@8006a000 {
+                                reg = <0x8006a000 0x2000>;
+                                interrupts = <112 70 71>;
+                                status = "disabled";
+                        };
+
+                        auart1: serial@8006c000 {
+                                reg = <0x8006c000 0x2000>;
+                                interrupts = <113 72 73>;
+                                status = "disabled";
+                        };
+
+                        auart2: serial@8006e000 {
+                                reg = <0x8006e000 0x2000>;
+                                interrupts = <114 74 75>;
+                                status = "disabled";
+                        };
+
+                        auart3: serial@80070000 {
+                                reg = <0x80070000 0x2000>;
+                                interrupts = <115 76 77>;
+                                status = "disabled";
+                        };
+
+                        auart4: serial@80072000 {
+                                reg = <0x80072000 0x2000>;
+                                interrupts = <116 78 79>;
+                                status = "disabled";
+                        };
+
+                        duart: serial@80074000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x80074000 0x1000>;
+                                interrupts = <47>;
+                                status = "disabled";
+                        };
+
+                        usbphy0: usbphy@8007c000 {
+                                reg = <0x8007c000 0x2000>;
+                                status = "disabled";
+                        };
+
+                        usbphy1: usbphy@8007e000 {
+                                reg = <0x8007e000 0x2000>;
+                                status = "disabled";
+                        };
+                };
+        };
+
+        ahb@80080000 {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                reg = <0x80080000 0x80000>;
+                ranges;
+
+                usbctrl0: usbctrl@80080000 {
+                        reg = <0x80080000 0x10000>;
+                        status = "disabled";
+                };
+
+                usbctrl1: usbctrl@80090000 {
+                        reg = <0x80090000 0x10000>;
+                        status = "disabled";
+                };
+
+                dflpt@800c0000 {
+                        reg = <0x800c0000 0x10000>;
+                        status = "disabled";
+                };
+
+                mac0: ethernet@800f0000 {
+                        compatible = "fsl,imx28-fec";
+                        reg = <0x800f0000 0x4000>;
+                        interrupts = <101>;
+                        status = "disabled";
+                };
+
+                mac1: ethernet@800f4000 {
+                        compatible = "fsl,imx28-fec";
+                        reg = <0x800f4000 0x4000>;
+                        interrupts = <102>;
+                        status = "disabled";
+                };
+
+                switch@800f8000 {
+                        reg = <0x800f8000 0x8000>;
+                        status = "disabled";
+                };
+
+        };
+};
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 9949e6060dee..de065b5976e6 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -17,10 +17,6 @@
         model = "Freescale i.MX51 Babbage Board";
         compatible = "fsl,imx51-babbage", "fsl,imx51";
 
-        chosen {
-                bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
-        };
-
         memory {
                 reg = <0x90000000 0x20000000>;
         };
@@ -40,7 +36,7 @@
                                         status = "okay";
                                 };
 
-                                uart3: uart@7000c000 {
+                                uart3: serial@7000c000 {
                                         fsl,uart-has-rtscts;
                                         status = "okay";
                                 };
@@ -166,6 +162,11 @@
                                                 };
                                         };
                                 };
+
+                                ssi2: ssi@70014000 {
+                                        fsl,mode = "i2s-slave";
+                                        status = "okay";
+                                };
                         };
 
                         wdog@73f98000 { /* WDOG1 */
@@ -177,12 +178,12 @@
                                 reg = <0x73fa8000 0x4000>;
                         };
 
-                        uart1: uart@73fbc000 {
+                        uart1: serial@73fbc000 {
                                 fsl,uart-has-rtscts;
                                 status = "okay";
                         };
 
-                        uart2: uart@73fc0000 {
+                        uart2: serial@73fc0000 {
                                 status = "okay";
                         };
                 };
@@ -195,13 +196,20 @@
                         i2c@83fc4000 { /* I2C2 */
                                 status = "okay";
 
-                                codec: sgtl5000@0a {
+                                sgtl5000: codec@0a {
                                         compatible = "fsl,sgtl5000";
                                         reg = <0x0a>;
+                                        clock-frequency = <26000000>;
+                                        VDDA-supply = <&vdig_reg>;
+                                        VDDIO-supply = <&vvideo_reg>;
                                 };
                         };
 
-                        fec@83fec000 {
+                        audmux@83fd0000 {
+                                status = "okay";
+                        };
+
+                        ethernet@83fec000 {
                                 phy-mode = "mii";
                                 status = "okay";
                         };
@@ -218,4 +226,18 @@
                         gpio-key,wakeup;
                 };
         };
+
+        sound {
+                compatible = "fsl,imx51-babbage-sgtl5000",
+                             "fsl,imx-audio-sgtl5000";
+                model = "imx51-babbage-sgtl5000";
+                ssi-controller = <&ssi2>;
+                audio-codec = <&sgtl5000>;
+                audio-routing =
+                        "MIC_IN", "Mic Jack",
+                        "Mic Jack", "Mic Bias",
+                        "Headphone Jack", "HP_OUT";
+                mux-int-port = <2>;
+                mux-ext-port = <3>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 6663986fe1c8..bfa65abe8ef2 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -86,7 +86,7 @@
                                         status = "disabled";
                                 };
 
-                                uart3: uart@7000c000 {
+                                uart3: serial@7000c000 {
                                         compatible = "fsl,imx51-uart", "fsl,imx21-uart";
                                         reg = <0x7000c000 0x4000>;
                                         interrupts = <33>;
@@ -102,6 +102,15 @@
                                         status = "disabled";
                                 };
 
+                                ssi2: ssi@70014000 {
+                                        compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
+                                        reg = <0x70014000 0x4000>;
+                                        interrupts = <30>;
+                                        fsl,fifo-depth = <15>;
+                                        fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
+                                        status = "disabled";
+                                };
+
                                 esdhc@70020000 { /* ESDHC3 */
                                         compatible = "fsl,imx51-esdhc";
                                         reg = <0x70020000 0x4000>;
@@ -171,14 +180,14 @@
                                 status = "disabled";
                         };
 
-                        uart1: uart@73fbc000 {
+                        uart1: serial@73fbc000 {
                                 compatible = "fsl,imx51-uart", "fsl,imx21-uart";
                                 reg = <0x73fbc000 0x4000>;
                                 interrupts = <31>;
                                 status = "disabled";
                         };
 
-                        uart2: uart@73fc0000 {
+                        uart2: serial@73fc0000 {
                                 compatible = "fsl,imx51-uart", "fsl,imx21-uart";
                                 reg = <0x73fc0000 0x4000>;
                                 interrupts = <32>;
@@ -235,7 +244,31 @@
                                 status = "disabled";
                         };
 
-                        fec@83fec000 {
+                        ssi1: ssi@83fcc000 {
+                                compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
+                                reg = <0x83fcc000 0x4000>;
+                                interrupts = <29>;
+                                fsl,fifo-depth = <15>;
+                                fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
+                                status = "disabled";
+                        };
+
+                        audmux@83fd0000 {
+                                compatible = "fsl,imx51-audmux", "fsl,imx31-audmux";
+                                reg = <0x83fd0000 0x4000>;
+                                status = "disabled";
+                        };
+
+                        ssi3: ssi@83fe8000 {
+                                compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
+                                reg = <0x83fe8000 0x4000>;
+                                interrupts = <96>;
+                                fsl,fifo-depth = <15>;
+                                fsl,ssi-dma-events = <47 46 37 35>; /* TX0 RX0 TX1 RX1 */
+                                status = "disabled";
+                        };
+
+                        ethernet@83fec000 {
                                 compatible = "fsl,imx51-fec", "fsl,imx27-fec";
                                 reg = <0x83fec000 0x4000>;
                                 interrupts = <87>;
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 2dccce46ed81..5b8eafcdbeec 100644
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -17,10 +17,6 @@
         model = "Freescale i.MX53 Automotive Reference Design Board";
         compatible = "fsl,imx53-ard", "fsl,imx53";
 
-        chosen {
-                bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
-        };
-
         memory {
                 reg = <0x70000000 0x40000000>;
         };
@@ -44,7 +40,7 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart1: uart@53fbc000 {
+                        uart1: serial@53fbc000 {
                                 status = "okay";
                         };
                 };
diff --git a/arch/arm/boot/dts/imx53-evk.dts b/arch/arm/boot/dts/imx53-evk.dts
index 5bac4aa4800b..9c798034675e 100644
--- a/arch/arm/boot/dts/imx53-evk.dts
+++ b/arch/arm/boot/dts/imx53-evk.dts
@@ -17,10 +17,6 @@
         model = "Freescale i.MX53 Evaluation Kit";
         compatible = "fsl,imx53-evk", "fsl,imx53";
 
-        chosen {
-                bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
-        };
-
         memory {
                 reg = <0x70000000 0x80000000>;
         };
@@ -75,7 +71,7 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart1: uart@53fbc000 {
+                        uart1: serial@53fbc000 {
                                 status = "okay";
                         };
                 };
@@ -99,7 +95,7 @@
                                 };
                         };
 
-                        fec@63fec000 {
+                        ethernet@63fec000 {
                                 phy-mode = "rmii";
                                 phy-reset-gpios = <&gpio7 6 0>;
                                 status = "okay";
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index 5c57c8672c36..2d803a9a6949 100644
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -17,10 +17,6 @@
         model = "Freescale i.MX53 Quick Start Board";
         compatible = "fsl,imx53-qsb", "fsl,imx53";
 
-        chosen {
-                bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
-        };
-
         memory {
                 reg = <0x70000000 0x40000000>;
         };
@@ -33,6 +29,11 @@
                                         status = "okay";
                                 };
 
+                                ssi2: ssi@50014000 {
+                                        fsl,mode = "i2s-slave";
+                                        status = "okay";
+                                };
+
                                 esdhc@50020000 { /* ESDHC3 */
                                         cd-gpios = <&gpio3 11 0>;
                                         wp-gpios = <&gpio3 12 0>;
@@ -49,7 +50,7 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart1: uart@53fbc000 {
+                        uart1: serial@53fbc000 {
                                 status = "okay";
                         };
                 };
@@ -62,9 +63,11 @@
                         i2c@63fc4000 { /* I2C2 */
                                 status = "okay";
 
-                                codec: sgtl5000@0a {
+                                sgtl5000: codec@0a {
                                         compatible = "fsl,sgtl5000";
                                         reg = <0x0a>;
+                                        VDDA-supply = <&reg_3p2v>;
+                                        VDDIO-supply = <&reg_3p2v>;
                                 };
                         };
 
@@ -77,12 +80,88 @@
                                 };
 
                                 pmic: dialog@48 {
-                                        compatible = "dialog,da9053", "dialog,da9052";
+                                        compatible = "dlg,da9053-aa", "dlg,da9052";
                                         reg = <0x48>;
+
+                                        regulators {
+                                                buck0 {
+                                                        regulator-min-microvolt = <500000>;
+                                                        regulator-max-microvolt = <2075000>;
+                                                };
+
+                                                buck1 {
+                                                        regulator-min-microvolt = <500000>;
+                                                        regulator-max-microvolt = <2075000>;
+                                                };
+
+                                                buck2 {
+                                                        regulator-min-microvolt = <925000>;
+                                                        regulator-max-microvolt = <2500000>;
+                                                };
+
+                                                buck3 {
+                                                        regulator-min-microvolt = <925000>;
+                                                        regulator-max-microvolt = <2500000>;
+                                                };
+
+                                                ldo4 {
+                                                        regulator-min-microvolt = <600000>;
+                                                        regulator-max-microvolt = <1800000>;
+                                                };
+
+                                                ldo5 {
+                                                        regulator-min-microvolt = <600000>;
+                                                        regulator-max-microvolt = <1800000>;
+                                                };
+
+                                                ldo6 {
+                                                        regulator-min-microvolt = <1725000>;
+                                                        regulator-max-microvolt = <3300000>;
+                                                };
+
+                                                ldo7 {
+                                                        regulator-min-microvolt = <1725000>;
+                                                        regulator-max-microvolt = <3300000>;
+                                                };
+
+                                                ldo8 {
+                                                        regulator-min-microvolt = <1200000>;
+                                                        regulator-max-microvolt = <3600000>;
+                                                };
+
+                                                ldo9 {
+                                                        regulator-min-microvolt = <1200000>;
+                                                        regulator-max-microvolt = <3600000>;
+                                                };
+
+                                                ldo10 {
+                                                        regulator-min-microvolt = <1200000>;
+                                                        regulator-max-microvolt = <3600000>;
+                                                };
+
+                                                ldo11 {
+                                                        regulator-min-microvolt = <1200000>;
+                                                        regulator-max-microvolt = <3600000>;
+                                                };
+
+                                                ldo12 {
+                                                        regulator-min-microvolt = <1250000>;
+                                                        regulator-max-microvolt = <3650000>;
+                                                };
+
+                                                ldo13 {
+                                                        regulator-min-microvolt = <1200000>;
+                                                        regulator-max-microvolt = <3600000>;
+                                                };
+                                        };
                                 };
                         };
 
-                        fec@63fec000 {
+                        audmux@63fd0000 {
+                                status = "okay";
+                        };
+
+                        ethernet@63fec000 {
                                 phy-mode = "rmii";
                                 phy-reset-gpios = <&gpio7 6 0>;
                                 status = "okay";
@@ -122,4 +201,30 @@
                         linux,default-trigger = "heartbeat";
                 };
         };
+
+        regulators {
+                compatible = "simple-bus";
+
+                reg_3p2v: 3p2v {
+                        compatible = "regulator-fixed";
+                        regulator-name = "3P2V";
+                        regulator-min-microvolt = <3200000>;
+                        regulator-max-microvolt = <3200000>;
+                        regulator-always-on;
+                };
+        };
+
+        sound {
+                compatible = "fsl,imx53-qsb-sgtl5000",
+                             "fsl,imx-audio-sgtl5000";
+                model = "imx53-qsb-sgtl5000";
+                ssi-controller = <&ssi2>;
+                audio-codec = <&sgtl5000>;
+                audio-routing =
+                        "MIC_IN", "Mic Jack",
+                        "Mic Jack", "Mic Bias",
+                        "Headphone Jack", "HP_OUT";
+                mux-int-port = <2>;
+                mux-ext-port = <5>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index c7ee86c2dfb5..08091029168e 100644
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -17,10 +17,6 @@
         model = "Freescale i.MX53 Smart Mobile Reference Design Board";
         compatible = "fsl,imx53-smd", "fsl,imx53";
 
-        chosen {
-                bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait";
-        };
-
         memory {
                 reg = <0x70000000 0x40000000>;
         };
@@ -35,11 +31,11 @@
                                 };
 
                                 esdhc@50008000 { /* ESDHC2 */
-                                        fsl,card-wired;
+                                        non-removable;
                                         status = "okay";
                                 };
 
-                                uart3: uart@5000c000 {
+                                uart3: serial@5000c000 {
                                         fsl,uart-has-rtscts;
                                         status = "okay";
                                 };
@@ -76,7 +72,7 @@
                                 };
 
                                 esdhc@50020000 { /* ESDHC3 */
-                                        fsl,card-wired;
+                                        non-removable;
                                         status = "okay";
                                 };
                         };
@@ -90,11 +86,11 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart1: uart@53fbc000 {
+                        uart1: serial@53fbc000 {
                                 status = "okay";
                         };
 
-                        uart2: uart@53fc0000 {
+                        uart2: serial@53fc0000 {
                                 status = "okay";
                         };
                 };
@@ -142,7 +138,7 @@
                                 };
                         };
 
-                        fec@63fec000 {
+                        ethernet@63fec000 {
                                 phy-mode = "rmii";
                                 phy-reset-gpios = <&gpio7 6 0>;
                                 status = "okay";
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 5dd91b942c91..e3e869470cd3 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -88,7 +88,7 @@
                                         status = "disabled";
                                 };
 
-                                uart3: uart@5000c000 {
+                                uart3: serial@5000c000 {
                                         compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                         reg = <0x5000c000 0x4000>;
                                         interrupts = <33>;
@@ -104,6 +104,15 @@
                                         status = "disabled";
                                 };
 
+                                ssi2: ssi@50014000 {
+                                        compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+                                        reg = <0x50014000 0x4000>;
+                                        interrupts = <30>;
+                                        fsl,fifo-depth = <15>;
+                                        fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
+                                        status = "disabled";
+                                };
+
                                 esdhc@50020000 { /* ESDHC3 */
                                         compatible = "fsl,imx53-esdhc";
                                         reg = <0x50020000 0x4000>;
@@ -173,14 +182,14 @@
                                 status = "disabled";
                         };
 
-                        uart1: uart@53fbc000 {
+                        uart1: serial@53fbc000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x53fbc000 0x4000>;
                                 interrupts = <31>;
                                 status = "disabled";
                         };
 
-                        uart2: uart@53fc0000 {
+                        uart2: serial@53fc0000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x53fc0000 0x4000>;
                                 interrupts = <32>;
@@ -226,7 +235,7 @@
                                 status = "disabled";
                         };
 
-                        uart4: uart@53ff0000 {
+                        uart4: serial@53ff0000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x53ff0000 0x4000>;
                                 interrupts = <13>;
@@ -241,7 +250,7 @@
                         reg = <0x60000000 0x10000000>;
                         ranges;
 
-                        uart5: uart@63f90000 {
+                        uart5: serial@63f90000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x63f90000 0x4000>;
                                 interrupts = <86>;
@@ -290,7 +299,31 @@
                                 status = "disabled";
                         };
 
-                        fec@63fec000 {
+                        ssi1: ssi@63fcc000 {
+                                compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+                                reg = <0x63fcc000 0x4000>;
+                                interrupts = <29>;
+                                fsl,fifo-depth = <15>;
+                                fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
+                                status = "disabled";
+                        };
+
+                        audmux@63fd0000 {
+                                compatible = "fsl,imx53-audmux", "fsl,imx31-audmux";
+                                reg = <0x63fd0000 0x4000>;
+                                status = "disabled";
+                        };
+
+                        ssi3: ssi@63fe8000 {
+                                compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+                                reg = <0x63fe8000 0x4000>;
+                                interrupts = <96>;
+                                fsl,fifo-depth = <15>;
+                                fsl,ssi-dma-events = <47 46 45 44>; /* TX0 RX0 TX1 RX1 */
+                                status = "disabled";
+                        };
+
+                        ethernet@63fec000 {
                                 compatible = "fsl,imx53-fec", "fsl,imx25-fec";
                                 reg = <0x63fec000 0x4000>;
                                 interrupts = <87>;
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index ce1c8238c897..db4c6096c562 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -17,19 +17,14 @@
         model = "Freescale i.MX6 Quad Armadillo2 Board";
         compatible = "fsl,imx6q-arm2", "fsl,imx6q";
 
-        chosen {
-                bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";
-        };
-
         memory {
                 reg = <0x10000000 0x80000000>;
         };
 
         soc {
                 aips-bus@02100000 { /* AIPS2 */
-                        enet@02188000 {
+                        ethernet@02188000 {
                                 phy-mode = "rgmii";
-                                local-mac-address = [00 04 9F 01 1B 61];
                                 status = "okay";
                         };
 
@@ -37,16 +32,20 @@
                                 cd-gpios = <&gpio6 11 0>;
                                 wp-gpios = <&gpio6 14 0>;
                                 vmmc-supply = <&reg_3p3v>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_usdhc3_1>;
                                 status = "okay";
                         };
 
                         usdhc@0219c000 { /* uSDHC4 */
-                                fsl,card-wired;
+                                non-removable;
                                 vmmc-supply = <&reg_3p3v>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_usdhc4_1>;
                                 status = "okay";
                         };
 
-                        uart4: uart@021f0000 {
+                        uart4: serial@021f0000 {
                                 status = "okay";
                         };
                 };
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 4663a4e5a285..e0ec92973e7e 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -22,8 +22,30 @@
         };
 
         soc {
+                aips-bus@02000000 { /* AIPS1 */
+                        spba-bus@02000000 {
+                                ecspi@02008000 { /* eCSPI1 */
+                                        fsl,spi-num-chipselects = <1>;
+                                        cs-gpios = <&gpio3 19 0>;
+                                        status = "okay";
+
+                                        flash: m25p80@0 {
+                                                compatible = "sst,sst25vf016b";
+                                                spi-max-frequency = <20000000>;
+                                                reg = <0>;
+                                        };
+                                };
+
+                                ssi1: ssi@02028000 {
+                                        fsl,mode = "i2s-slave";
+                                        status = "okay";
+                                };
+                        };
+
+                };
+
                 aips-bus@02100000 { /* AIPS2 */
-                        enet@02188000 {
+                        ethernet@02188000 {
                                 phy-mode = "rgmii";
                                 phy-reset-gpios = <&gpio3 23 0>;
                                 status = "okay";
@@ -43,13 +65,23 @@
                                 status = "okay";
                         };
 
-                        uart2: uart@021e8000 {
+                        audmux@021d8000 {
+                                status = "okay";
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_audmux_1>;
+                        };
+
+                        uart2: serial@021e8000 {
                                 status = "okay";
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_serial2_1>;
                         };
 
                         i2c@021a0000 { /* I2C1 */
                                 status = "okay";
                                 clock-frequency = <100000>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_i2c1_1>;
 
                                 codec: sgtl5000@0a {
                                         compatible = "fsl,sgtl5000";
@@ -80,4 +112,18 @@
                         regulator-always-on;
                 };
         };
+
+        sound {
+                compatible = "fsl,imx6q-sabrelite-sgtl5000",
+                             "fsl,imx-audio-sgtl5000";
+                model = "imx6q-sabrelite-sgtl5000";
+                ssi-controller = <&ssi1>;
+                audio-codec = <&codec>;
+                audio-routing =
+                        "MIC_IN", "Mic Jack",
+                        "Mic Jack", "Mic Bias",
+                        "Headphone Jack", "HP_OUT";
+                mux-int-port = <1>;
+                mux-ext-port = <4>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts
new file mode 100644
index 000000000000..07509a181178
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-sabresd.dts
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "imx6q.dtsi"
+
+/ {
+        model = "Freescale i.MX6Q SABRE Smart Device Board";
+        compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
+
+        memory {
+                reg = <0x10000000 0x40000000>;
+        };
+
+        soc {
+
+                aips-bus@02000000 { /* AIPS1 */
+                        spba-bus@02000000 {
+                                uart1: serial@02020000 {
+                                        status = "okay";
+                                };
+                        };
+                };
+
+                aips-bus@02100000 { /* AIPS2 */
+                        ethernet@02188000 {
+                                phy-mode = "rgmii";
+                                status = "okay";
+                        };
+
+                        usdhc@02194000 { /* uSDHC2 */
+                                cd-gpios = <&gpio2 2 0>;
+                                wp-gpios = <&gpio2 3 0>;
+                                status = "okay";
+                        };
+
+                        usdhc@02198000 { /* uSDHC3 */
+                                cd-gpios = <&gpio2 0 0>;
+                                wp-gpios = <&gpio2 1 0>;
+                                status = "okay";
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 4905f51a106f..8c90cbac945f 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -165,7 +165,7 @@
                                         status = "disabled";
                                 };
 
-                                uart1: uart@02020000 {
+                                uart1: serial@02020000 {
                                         compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                         reg = <0x02020000 0x4000>;
                                         interrupts = <0 26 0x04>;
@@ -177,19 +177,31 @@
                                         interrupts = <0 51 0x04>;
                                 };
 
-                                ssi@02028000 { /* SSI1 */
+                                ssi1: ssi@02028000 {
+                                        compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
                                         reg = <0x02028000 0x4000>;
                                         interrupts = <0 46 0x04>;
+                                        fsl,fifo-depth = <15>;
+                                        fsl,ssi-dma-events = <38 37>;
+                                        status = "disabled";
                                 };
 
-                                ssi@0202c000 { /* SSI2 */
+                                ssi2: ssi@0202c000 {
+                                        compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
                                         reg = <0x0202c000 0x4000>;
                                         interrupts = <0 47 0x04>;
+                                        fsl,fifo-depth = <15>;
+                                        fsl,ssi-dma-events = <42 41>;
+                                        status = "disabled";
                                 };
 
-                                ssi@02030000 { /* SSI3 */
+                                ssi3: ssi@02030000 {
+                                        compatible = "fsl,imx6q-ssi","fsl,imx21-ssi";
                                         reg = <0x02030000 0x4000>;
                                         interrupts = <0 48 0x04>;
+                                        fsl,fifo-depth = <15>;
+                                        fsl,ssi-dma-events = <46 45>;
+                                        status = "disabled";
                                 };
 
                                 asrc@02034000 {
@@ -346,6 +358,90 @@
                                 compatible = "fsl,imx6q-anatop";
                                 reg = <0x020c8000 0x1000>;
                                 interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;
+
+                                regulator-1p1@110 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vdd1p1";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1375000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x110>;
+                                        anatop-vol-bit-shift = <8>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <4>;
+                                        anatop-min-voltage = <800000>;
+                                        anatop-max-voltage = <1375000>;
+                                };
+
+                                regulator-3p0@120 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vdd3p0";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <3150000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x120>;
+                                        anatop-vol-bit-shift = <8>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <0>;
+                                        anatop-min-voltage = <2625000>;
+                                        anatop-max-voltage = <3400000>;
+                                };
+
+                                regulator-2p5@130 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vdd2p5";
+                                        regulator-min-microvolt = <2000000>;
+                                        regulator-max-microvolt = <2750000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x130>;
+                                        anatop-vol-bit-shift = <8>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <0>;
+                                        anatop-min-voltage = <2000000>;
+                                        anatop-max-voltage = <2750000>;
+                                };
+
+                                regulator-vddcore@140 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "cpu";
+                                        regulator-min-microvolt = <725000>;
+                                        regulator-max-microvolt = <1450000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x140>;
+                                        anatop-vol-bit-shift = <0>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <1>;
+                                        anatop-min-voltage = <725000>;
+                                        anatop-max-voltage = <1450000>;
+                                };
+
+                                regulator-vddpu@140 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vddpu";
+                                        regulator-min-microvolt = <725000>;
+                                        regulator-max-microvolt = <1450000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x140>;
+                                        anatop-vol-bit-shift = <9>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <1>;
+                                        anatop-min-voltage = <725000>;
+                                        anatop-max-voltage = <1450000>;
+                                };
+
+                                regulator-vddsoc@140 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vddsoc";
+                                        regulator-min-microvolt = <725000>;
+                                        regulator-max-microvolt = <1450000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x140>;
+                                        anatop-vol-bit-shift = <18>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <1>;
+                                        anatop-min-voltage = <725000>;
+                                        anatop-max-voltage = <1450000>;
+                                };
                         };
 
                         usbphy@020c9000 { /* USBPHY1 */
@@ -386,7 +482,62 @@
                         };
 
                         iomuxc@020e0000 {
+                                compatible = "fsl,imx6q-iomuxc";
                                 reg = <0x020e0000 0x4000>;
+
+                                /* shared pinctrl settings */
+                                audmux {
+                                        pinctrl_audmux_1: audmux-1 {
+                                                fsl,pins = <18   0x80000000     /* MX6Q_PAD_SD2_DAT0__AUDMUX_AUD4_RXD */
+                                                            1586 0x80000000     /* MX6Q_PAD_SD2_DAT3__AUDMUX_AUD4_TXC */
+                                                            11   0x80000000     /* MX6Q_PAD_SD2_DAT2__AUDMUX_AUD4_TXD */
+                                                            3    0x80000000>;   /* MX6Q_PAD_SD2_DAT1__AUDMUX_AUD4_TXFS */
+                                        };
+                                };
+
+                                i2c1 {
+                                        pinctrl_i2c1_1: i2c1grp-1 {
+                                                fsl,pins = <137 0x4001b8b1      /* MX6Q_PAD_EIM_D21__I2C1_SCL */
+                                                            196 0x4001b8b1>;    /* MX6Q_PAD_EIM_D28__I2C1_SDA */
+                                        };
+                                };
+
+                                serial2 {
+                                        pinctrl_serial2_1: serial2grp-1 {
+                                                fsl,pins = <183 0x1b0b1         /* MX6Q_PAD_EIM_D26__UART2_TXD */
+                                                            191 0x1b0b1>;       /* MX6Q_PAD_EIM_D27__UART2_RXD */
+                                        };
+                                };
+
+                                usdhc3 {
+                                        pinctrl_usdhc3_1: usdhc3grp-1 {
+                                                fsl,pins = <1273 0x17059        /* MX6Q_PAD_SD3_CMD__USDHC3_CMD */
+                                                            1281 0x10059        /* MX6Q_PAD_SD3_CLK__USDHC3_CLK */
+                                                            1289 0x17059        /* MX6Q_PAD_SD3_DAT0__USDHC3_DAT0 */
+                                                            1297 0x17059        /* MX6Q_PAD_SD3_DAT1__USDHC3_DAT1 */
+                                                            1305 0x17059        /* MX6Q_PAD_SD3_DAT2__USDHC3_DAT2 */
+                                                            1312 0x17059        /* MX6Q_PAD_SD3_DAT3__USDHC3_DAT3 */
+                                                            1265 0x17059        /* MX6Q_PAD_SD3_DAT4__USDHC3_DAT4 */
+                                                            1257 0x17059        /* MX6Q_PAD_SD3_DAT5__USDHC3_DAT5 */
+                                                            1249 0x17059        /* MX6Q_PAD_SD3_DAT6__USDHC3_DAT6 */
+                                                            1241 0x17059>;      /* MX6Q_PAD_SD3_DAT7__USDHC3_DAT7 */
+                                        };
+                                };
+
+                                usdhc4 {
+                                        pinctrl_usdhc4_1: usdhc4grp-1 {
+                                                fsl,pins = <1386 0x17059        /* MX6Q_PAD_SD4_CMD__USDHC4_CMD */
+                                                            1392 0x10059        /* MX6Q_PAD_SD4_CLK__USDHC4_CLK */
+                                                            1462 0x17059        /* MX6Q_PAD_SD4_DAT0__USDHC4_DAT0 */
+                                                            1470 0x17059        /* MX6Q_PAD_SD4_DAT1__USDHC4_DAT1 */
+                                                            1478 0x17059        /* MX6Q_PAD_SD4_DAT2__USDHC4_DAT2 */
+                                                            1486 0x17059        /* MX6Q_PAD_SD4_DAT3__USDHC4_DAT3 */
+                                                            1493 0x17059        /* MX6Q_PAD_SD4_DAT4__USDHC4_DAT4 */
+                                                            1501 0x17059        /* MX6Q_PAD_SD4_DAT5__USDHC4_DAT5 */
+                                                            1509 0x17059        /* MX6Q_PAD_SD4_DAT6__USDHC4_DAT6 */
+                                                            1517 0x17059>;      /* MX6Q_PAD_SD4_DAT7__USDHC4_DAT7 */
+                                        };
+                                };
                         };
 
                         dcic@020e4000 { /* DCIC1 */
@@ -422,7 +573,7 @@
                                 reg = <0x0217c000 0x4000>;
                         };
 
-                        enet@02188000 {
+                        ethernet@02188000 {
                                 compatible = "fsl,imx6q-fec";
                                 reg = <0x02188000 0x4000>;
                                 interrupts = <0 118 0x04 0 119 0x04>;
@@ -527,7 +678,9 @@
                         };
 
                         audmux@021d8000 {
+                                compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux";
                                 reg = <0x021d8000 0x4000>;
+                                status = "disabled";
                         };
 
                         mipi@021dc000 { /* MIPI-CSI */
@@ -543,28 +696,28 @@
                                 interrupts = <0 18 0x04>;
                         };
 
-                        uart2: uart@021e8000 {
+                        uart2: serial@021e8000 {
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021e8000 0x4000>;
                                 interrupts = <0 27 0x04>;
                                 status = "disabled";
                         };
 
-                        uart3: uart@021ec000 {
+                        uart3: serial@021ec000 {
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021ec000 0x4000>;
                                 interrupts = <0 28 0x04>;
                                 status = "disabled";
                         };
 
-                        uart4: uart@021f0000 {
+                        uart4: serial@021f0000 {
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021f0000 0x4000>;
                                 interrupts = <0 29 0x04>;
                                 status = "disabled";
                         };
 
-                        uart5: uart@021f4000 {
+                        uart5: serial@021f4000 {
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021f4000 0x4000>;
                                 interrupts = <0 30 0x04>;
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 8c756be4d7ad..5b4506c0a8c4 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -57,7 +57,7 @@
 &mmc1 {
         vmmc-supply = <&vmmc1>;
         vmmc_aux-supply = <&vsim>;
-        ti,bus-width = <8>;
+        bus-width = <8>;
 };
 
 &mmc2 {
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
index e671361bc791..1efe0c587985 100644
--- a/arch/arm/boot/dts/omap4-panda.dts
+++ b/arch/arm/boot/dts/omap4-panda.dts
@@ -70,7 +70,7 @@
 
 &mmc1 {
         vmmc-supply = <&vmmc>;
-        ti,bus-width = <8>;
+        bus-width = <8>;
 };
 
 &mmc2 {
@@ -87,5 +87,5 @@
 
 &mmc5 {
         ti,non-removable;
-        ti,bus-width = <4>;
+        bus-width = <4>;
 };
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index e5eeb6f9c6e6..d08c4d137280 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -137,12 +137,12 @@
 
 &mmc1 {
         vmmc-supply = <&vmmc>;
-        ti,bus-width = <8>;
+        bus-width = <8>;
 };
 
 &mmc2 {
         vmmc-supply = <&vaux1>;
-        ti,bus-width = <8>;
+        bus-width = <8>;
         ti,non-removable;
 };
 
@@ -155,6 +155,6 @@
 };
 
 &mmc5 {
-        ti,bus-width = <4>;
+        bus-width = <4>;
         ti,non-removable;
 };
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
new file mode 100644
index 000000000000..8314e4171884
--- /dev/null
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -0,0 +1,292 @@
+/*
+ * DTS file for SPEAr1310 Evaluation Baord
+ *
+ * Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "spear1310.dtsi"
+
+/ {
+        model = "ST SPEAr1310 Evaluation Board";
+        compatible = "st,spear1310-evb", "st,spear1310";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        memory {
+                reg = <0 0x40000000>;
+        };
+
+        ahb {
+                pinmux@e0700000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&state_default>;
+
+                        state_default: pinmux {
+                                i2c0-pmx {
+                                        st,pins = "i2c0_grp";
+                                        st,function = "i2c0";
+                                };
+                                i2s1 {
+                                        st,pins = "i2s1_grp";
+                                        st,function = "i2s1";
+                                };
+                                gpio {
+                                        st,pins = "arm_gpio_grp";
+                                        st,function = "arm_gpio";
+                                };
+                                eth {
+                                        st,pins = "gmii_grp";
+                                        st,function = "gmii";
+                                };
+                                ssp0 {
+                                        st,pins = "ssp0_grp";
+                                        st,function = "ssp0";
+                                };
+                                kbd {
+                                        st,pins = "keyboard_6x6_grp";
+                                        st,function = "keyboard";
+                                };
+                                sdhci {
+                                        st,pins = "sdhci_grp";
+                                        st,function = "sdhci";
+                                };
+                                smi-pmx {
+                                        st,pins = "smi_2_chips_grp";
+                                        st,function = "smi";
+                                };
+                                uart0 {
+                                        st,pins = "uart0_grp";
+                                        st,function = "uart0";
+                                };
+                                rs485 {
+                                        st,pins = "rs485_0_1_tdm_0_1_grp";
+                                        st,function = "rs485_0_1_tdm_0_1";
+                                };
+                                i2c1_2 {
+                                        st,pins = "i2c_1_2_grp";
+                                        st,function = "i2c_1_2";
+                                };
+                                pci {
+                                        st,pins = "pcie0_grp","pcie1_grp",
+                                                "pcie2_grp";
+                                        st,function = "pci";
+                                };
+                                smii {
+                                        st,pins = "smii_0_1_2_grp";
+                                        st,function = "smii_0_1_2";
+                                };
+                                nand {
+                                        st,pins = "nand_8bit_grp",
+                                                "nand_16bit_grp";
+                                        st,function = "nand";
+                                };
+                        };
+                };
+
+                ahci@b1000000 {
+                        status = "okay";
+                };
+
+                cf@b2800000 {
+                        status = "okay";
+                };
+
+                dma@ea800000 {
+                        status = "okay";
+                };
+
+                dma@eb000000 {
+                        status = "okay";
+                };
+
+                fsmc: flash@b0000000 {
+                        status = "okay";
+                };
+
+                gmac0: eth@e2000000 {
+                        status = "okay";
+                };
+
+                sdhci@b3000000 {
+                        status = "okay";
+                };
+
+                smi: flash@ea000000 {
+                        status = "okay";
+                        clock-rate=<50000000>;
+
+                        flash@e6000000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xe6000000 0x800000>;
+                                st,smi-fast-mode;
+
+                                partition@0 {
+                                        label = "xloader";
+                                        reg = <0x0 0x10000>;
+                                };
+                                partition@10000 {
+                                        label = "u-boot";
+                                        reg = <0x10000 0x40000>;
+                                };
+                                partition@50000 {
+                                        label = "linux";
+                                        reg = <0x50000 0x2c0000>;
+                                };
+                                partition@310000 {
+                                        label = "rootfs";
+                                        reg = <0x310000 0x4f0000>;
+                                };
+                        };
+                };
+
+                spi0: spi@e0100000 {
+                        status = "okay";
+                };
+
+                ehci@e4800000 {
+                        status = "okay";
+                };
+
+                ehci@e5800000 {
+                        status = "okay";
+                };
+
+                ohci@e4000000 {
+                        status = "okay";
+                };
+
+                ohci@e5000000 {
+                        status = "okay";
+                };
+
+                apb {
+                        adc@e0080000 {
+                                status = "okay";
+                        };
+
+                        gpio0: gpio@e0600000 {
+                               status = "okay";
+                        };
+
+                        gpio1: gpio@e0680000 {
+                               status = "okay";
+                        };
+
+                        i2c0: i2c@e0280000 {
+                               status = "okay";
+                        };
+
+                        i2c1: i2c@5cd00000 {
+                               status = "okay";
+                        };
+
+                        kbd@e0300000 {
+                                linux,keymap = < 0x00000001
+                                                 0x00010002
+                                                 0x00020003
+                                                 0x00030004
+                                                 0x00040005
+                                                 0x00050006
+                                                 0x00060007
+                                                 0x00070008
+                                                 0x00080009
+                                                 0x0100000a
+                                                 0x0101000c
+                                                 0x0102000d
+                                                 0x0103000e
+                                                 0x0104000f
+                                                 0x01050010
+                                                 0x01060011
+                                                 0x01070012
+                                                 0x01080013
+                                                 0x02000014
+                                                 0x02010015
+                                                 0x02020016
+                                                 0x02030017
+                                                 0x02040018
+                                                 0x02050019
+                                                 0x0206001a
+                                                 0x0207001b
+                                                 0x0208001c
+                                                 0x0300001d
+                                                 0x0301001e
+                                                 0x0302001f
+                                                 0x03030020
+                                                 0x03040021
+                                                 0x03050022
+                                                 0x03060023
+                                                 0x03070024
+                                                 0x03080025
+                                                 0x04000026
+                                                 0x04010027
+                                                 0x04020028
+                                                 0x04030029
+                                                 0x0404002a
+                                                 0x0405002b
+                                                 0x0406002c
+                                                 0x0407002d
+                                                 0x0408002e
+                                                 0x0500002f
+                                                 0x05010030
+                                                 0x05020031
+                                                 0x05030032
+                                                 0x05040033
+                                                 0x05050034
+                                                 0x05060035
+                                                 0x05070036
+                                                 0x05080037
+                                                 0x06000038
+                                                 0x06010039
+                                                 0x0602003a
+                                                 0x0603003b
+                                                 0x0604003c
+                                                 0x0605003d
+                                                 0x0606003e
+                                                 0x0607003f
+                                                 0x06080040
+                                                 0x07000041
+                                                 0x07010042
+                                                 0x07020043
+                                                 0x07030044
+                                                 0x07040045
+                                                 0x07050046
+                                                 0x07060047
+                                                 0x07070048
+                                                 0x07080049
+                                                 0x0800004a
+                                                 0x0801004b
+                                                 0x0802004c
+                                                 0x0803004d
+                                                 0x0804004e
+                                                 0x0805004f
+                                                 0x08060050
+                                                 0x08070051
+                                                 0x08080052 >;
+                               autorepeat;
+                               st,mode = <0>;
+                               status = "okay";
+                        };
+
+                        rtc@e0580000 {
+                               status = "okay";
+                        };
+
+                        serial@e0000000 {
+                               status = "okay";
+                        };
+
+                        wdt@ec800620 {
+                               status = "okay";
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi
new file mode 100644
index 000000000000..9e61da404d57
--- /dev/null
+++ b/arch/arm/boot/dts/spear1310.dtsi
@@ -0,0 +1,184 @@
+/*
+ * DTS file for all SPEAr1310 SoCs
+ *
+ * Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/include/ "spear13xx.dtsi"
+
+/ {
+        compatible = "st,spear1310";
+
+        ahb {
+                ahci@b1000000 {
+                        compatible = "snps,spear-ahci";
+                        reg = <0xb1000000 0x10000>;
+                        interrupts = <0 68 0x4>;
+                        status = "disabled";
+                };
+
+                ahci@b1800000 {
+                        compatible = "snps,spear-ahci";
+                        reg = <0xb1800000 0x10000>;
+                        interrupts = <0 69 0x4>;
+                        status = "disabled";
+                };
+
+                ahci@b4000000 {
+                        compatible = "snps,spear-ahci";
+                        reg = <0xb4000000 0x10000>;
+                        interrupts = <0 70 0x4>;
+                        status = "disabled";
+                };
+
+                gmac1: eth@5c400000 {
+                        compatible = "st,spear600-gmac";
+                        reg = <0x5c400000 0x8000>;
+                        interrupts = <0 95 0x4>;
+                        interrupt-names = "macirq";
+                        status = "disabled";
+                };
+
+                gmac2: eth@5c500000 {
+                        compatible = "st,spear600-gmac";
+                        reg = <0x5c500000 0x8000>;
+                        interrupts = <0 96 0x4>;
+                        interrupt-names = "macirq";
+                        status = "disabled";
+                };
+
+                gmac3: eth@5c600000 {
+                        compatible = "st,spear600-gmac";
+                        reg = <0x5c600000 0x8000>;
+                        interrupts = <0 97 0x4>;
+                        interrupt-names = "macirq";
+                        status = "disabled";
+                };
+
+                gmac4: eth@5c700000 {
+                        compatible = "st,spear600-gmac";
+                        reg = <0x5c700000 0x8000>;
+                        interrupts = <0 98 0x4>;
+                        interrupt-names = "macirq";
+                        status = "disabled";
+                };
+
+                spi1: spi@5d400000 {
+                        compatible = "arm,pl022", "arm,primecell";
+                        reg = <0x5d400000 0x1000>;
+                        interrupts = <0 99 0x4>;
+                        status = "disabled";
+                };
+
+                apb {
+                        i2c1: i2c@5cd00000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0x5cd00000 0x1000>;
+                                interrupts = <0 87 0x4>;
+                                status = "disabled";
+                        };
+
+                        i2c2: i2c@5ce00000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0x5ce00000 0x1000>;
+                                interrupts = <0 88 0x4>;
+                                status = "disabled";
+                        };
+
+                        i2c3: i2c@5cf00000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0x5cf00000 0x1000>;
+                                interrupts = <0 89 0x4>;
+                                status = "disabled";
+                        };
+
+                        i2c4: i2c@5d000000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0x5d000000 0x1000>;
+                                interrupts = <0 90 0x4>;
+                                status = "disabled";
+                        };
+
+                        i2c5: i2c@5d100000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0x5d100000 0x1000>;
+                                interrupts = <0 91 0x4>;
+                                status = "disabled";
+                        };
+
+                        i2c6: i2c@5d200000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0x5d200000 0x1000>;
+                                interrupts = <0 92 0x4>;
+                                status = "disabled";
+                        };
+
+                        i2c7: i2c@5d300000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0x5d300000 0x1000>;
+                                interrupts = <0 93 0x4>;
+                                status = "disabled";
+                        };
+
+                        serial@5c800000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x5c800000 0x1000>;
+                                interrupts = <0 82 0x4>;
+                                status = "disabled";
+                        };
+
+                        serial@5c900000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x5c900000 0x1000>;
+                                interrupts = <0 83 0x4>;
+                                status = "disabled";
+                        };
+
+                        serial@5ca00000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x5ca00000 0x1000>;
+                                interrupts = <0 84 0x4>;
+                                status = "disabled";
+                        };
+
+                        serial@5cb00000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x5cb00000 0x1000>;
+                                interrupts = <0 85 0x4>;
+                                status = "disabled";
+                        };
+
+                        serial@5cc00000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x5cc00000 0x1000>;
+                                interrupts = <0 86 0x4>;
+                                status = "disabled";
+                        };
+
+                        thermal@e07008c4 {
+                                st,thermal-flags = <0x7000>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
new file mode 100644
index 000000000000..0d8472e5ab9f
--- /dev/null
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -0,0 +1,308 @@
+/*
+ * DTS file for SPEAr1340 Evaluation Baord
+ *
+ * Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "spear1340.dtsi"
+
+/ {
+        model = "ST SPEAr1340 Evaluation Board";
+        compatible = "st,spear1340-evb", "st,spear1340";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        memory {
+                reg = <0 0x40000000>;
+        };
+
+        ahb {
+                pinmux@e0700000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&state_default>;
+
+                        state_default: pinmux {
+                                pads_as_gpio {
+                                        st,pins = "pads_as_gpio_grp";
+                                        st,function = "pads_as_gpio";
+                                };
+                                fsmc {
+                                        st,pins = "fsmc_8bit_grp";
+                                        st,function = "fsmc";
+                                };
+                                kbd {
+                                        st,pins = "keyboard_row_col_grp",
+                                                "keyboard_col5_grp";
+                                        st,function = "keyboard";
+                                };
+                                uart0 {
+                                        st,pins = "uart0_grp", "uart0_enh_grp";
+                                        st,function = "uart0";
+                                };
+                                i2c0-pmx {
+                                        st,pins = "i2c0_grp";
+                                        st,function = "i2c0";
+                                };
+                                i2c1-pmx {
+                                        st,pins = "i2c1_grp";
+                                        st,function = "i2c1";
+                                };
+                                spdif-in {
+                                        st,pins = "spdif_in_grp";
+                                        st,function = "spdif_in";
+                                };
+                                spdif-out {
+                                        st,pins = "spdif_out_grp";
+                                        st,function = "spdif_out";
+                                };
+                                ssp0 {
+                                        st,pins = "ssp0_grp", "ssp0_cs1_grp",
+                                                "ssp0_cs3_grp";
+                                        st,function = "ssp0";
+                                };
+                                pwm {
+                                        st,pins = "pwm2_grp", "pwm3_grp";
+                                        st,function = "pwm";
+                                };
+                                smi-pmx {
+                                        st,pins = "smi_grp";
+                                        st,function = "smi";
+                                };
+                                i2s {
+                                        st,pins = "i2s_in_grp", "i2s_out_grp";
+                                        st,function = "i2s";
+                                };
+                                gmac {
+                                        st,pins = "gmii_grp", "rgmii_grp";
+                                        st,function = "gmac";
+                                };
+                                cam3 {
+                                        st,pins = "cam3_grp";
+                                        st,function = "cam3";
+                                };
+                                cec0 {
+                                        st,pins = "cec0_grp";
+                                        st,function = "cec0";
+                                };
+                                cec1 {
+                                        st,pins = "cec1_grp";
+                                        st,function = "cec1";
+                                };
+                                sdhci {
+                                        st,pins = "sdhci_grp";
+                                        st,function = "sdhci";
+                                };
+                                clcd {
+                                        st,pins = "clcd_grp";
+                                        st,function = "clcd";
+                                };
+                                sata {
+                                        st,pins = "sata_grp";
+                                        st,function = "sata";
+                                };
+                        };
+                };
+
+                dma@ea800000 {
+                        status = "okay";
+                };
+
+                dma@eb000000 {
+                        status = "okay";
+                };
+
+                fsmc: flash@b0000000 {
+                        status = "okay";
+                };
+
+                gmac0: eth@e2000000 {
+                        status = "okay";
+                };
+
+                sdhci@b3000000 {
+                        status = "okay";
+                };
+
+                smi: flash@ea000000 {
+                        status = "okay";
+                        clock-rate=<50000000>;
+
+                        flash@e6000000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xe6000000 0x800000>;
+                                st,smi-fast-mode;
+
+                                partition@0 {
+                                        label = "xloader";
+                                        reg = <0x0 0x10000>;
+                                };
+                                partition@10000 {
+                                        label = "u-boot";
+                                        reg = <0x10000 0x40000>;
+                                };
+                                partition@50000 {
+                                        label = "linux";
+                                        reg = <0x50000 0x2c0000>;
+                                };
+                                partition@310000 {
+                                        label = "rootfs";
+                                        reg = <0x310000 0x4f0000>;
+                                };
+                        };
+                };
+
+                spi0: spi@e0100000 {
+                        status = "okay";
+                };
+
+                ehci@e4800000 {
+                        status = "okay";
+                };
+
+                ehci@e5800000 {
+                        status = "okay";
+                };
+
+                ohci@e4000000 {
+                        status = "okay";
+                };
+
+                ohci@e5000000 {
+                        status = "okay";
+                };
+
+                apb {
+                        adc@e0080000 {
+                                status = "okay";
+                        };
+
+                        gpio0: gpio@e0600000 {
+                               status = "okay";
+                        };
+
+                        gpio1: gpio@e0680000 {
+                               status = "okay";
+                        };
+
+                        i2c0: i2c@e0280000 {
+                               status = "okay";
+                        };
+
+                        i2c1: i2c@b4000000 {
+                               status = "okay";
+                        };
+
+                        kbd@e0300000 {
+                                linux,keymap = < 0x00000001
+                                                 0x00010002
+                                                 0x00020003
+                                                 0x00030004
+                                                 0x00040005
+                                                 0x00050006
+                                                 0x00060007
+                                                 0x00070008
+                                                 0x00080009
+                                                 0x0100000a
+                                                 0x0101000c
+                                                 0x0102000d
+                                                 0x0103000e
+                                                 0x0104000f
+                                                 0x01050010
+                                                 0x01060011
+                                                 0x01070012
+                                                 0x01080013
+                                                 0x02000014
+                                                 0x02010015
+                                                 0x02020016
+                                                 0x02030017
+                                                 0x02040018
+                                                 0x02050019
+                                                 0x0206001a
+                                                 0x0207001b
+                                                 0x0208001c
+                                                 0x0300001d
+                                                 0x0301001e
+                                                 0x0302001f
+                                                 0x03030020
+                                                 0x03040021
+                                                 0x03050022
+                                                 0x03060023
+                                                 0x03070024
+                                                 0x03080025
+                                                 0x04000026
+                                                 0x04010027
+                                                 0x04020028
+                                                 0x04030029
+                                                 0x0404002a
+                                                 0x0405002b
+                                                 0x0406002c
+                                                 0x0407002d
+                                                 0x0408002e
+                                                 0x0500002f
+                                                 0x05010030
+                                                 0x05020031
+                                                 0x05030032
+                                                 0x05040033
+                                                 0x05050034
+                                                 0x05060035
+                                                 0x05070036
+                                                 0x05080037
+                                                 0x06000038
+                                                 0x06010039
+                                                 0x0602003a
+                                                 0x0603003b
+                                                 0x0604003c
+                                                 0x0605003d
+                                                 0x0606003e
+                                                 0x0607003f
+                                                 0x06080040
+                                                 0x07000041
+                                                 0x07010042
+                                                 0x07020043
+                                                 0x07030044
+                                                 0x07040045
+                                                 0x07050046
+                                                 0x07060047
+                                                 0x07070048
+                                                 0x07080049
+                                                 0x0800004a
+                                                 0x0801004b
+                                                 0x0802004c
+                                                 0x0803004d
+                                                 0x0804004e
+                                                 0x0805004f
+                                                 0x08060050
+                                                 0x08070051
+                                                 0x08080052 >;
+                               autorepeat;
+                               st,mode = <0>;
+                               status = "okay";
+                        };
+
+                        rtc@e0580000 {
+                               status = "okay";
+                        };
+
+                        serial@e0000000 {
+                               status = "okay";
+                        };
+
+                        serial@b4100000 {
+                               status = "okay";
+                        };
+
+                        wdt@ec800620 {
+                               status = "okay";
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
new file mode 100644
index 000000000000..a26fc47a55e8
--- /dev/null
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -0,0 +1,56 @@
+/*
+ * DTS file for all SPEAr1340 SoCs
+ *
+ * Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/include/ "spear13xx.dtsi"
+
+/ {
+        compatible = "st,spear1340";
+
+        ahb {
+                ahci@b1000000 {
+                        compatible = "snps,spear-ahci";
+                        reg = <0xb1000000 0x10000>;
+                        interrupts = <0 72 0x4>;
+                        status = "disabled";
+                };
+
+                spi1: spi@5d400000 {
+                        compatible = "arm,pl022", "arm,primecell";
+                        reg = <0x5d400000 0x1000>;
+                        interrupts = <0 99 0x4>;
+                        status = "disabled";
+                };
+
+                apb {
+                        i2c1: i2c@b4000000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0xb4000000 0x1000>;
+                                interrupts = <0 104 0x4>;
+                                status = "disabled";
+                        };
+
+                        serial@b4100000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0xb4100000 0x1000>;
+                                interrupts = <0 105 0x4>;
+                                status = "disabled";
+                        };
+
+                        thermal@e07008c4 {
+                                st,thermal-flags = <0x2a00>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
new file mode 100644
index 000000000000..1f8e1e1481df
--- /dev/null
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -0,0 +1,262 @@
+/*
+ * DTS file for all SPEAr13xx SoCs
+ *
+ * Copyright 2012 Viresh Kumar <viresh.kumar@st.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+        interrupt-parent = <&gic>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        compatible = "arm,cortex-a9";
+                        reg = <0>;
+                        next-level-cache = <&L2>;
+                };
+
+                cpu@1 {
+                        compatible = "arm,cortex-a9";
+                        reg = <1>;
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        gic: interrupt-controller@ec801000 {
+                compatible = "arm,cortex-a9-gic";
+                interrupt-controller;
+                #interrupt-cells = <3>;
+                reg = < 0xec801000 0x1000 >,
+                      < 0xec800100 0x0100 >;
+        };
+
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupts = <0 8 0x04
+                              0 9 0x04>;
+        };
+
+        L2: l2-cache {
+                    compatible = "arm,pl310-cache";
+                    reg = <0xed000000 0x1000>;
+                    cache-unified;
+                    cache-level = <2>;
+        };
+
+        memory {
+                name = "memory";
+                device_type = "memory";
+                reg = <0 0x40000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyAMA0,115200";
+        };
+
+        ahb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                ranges = <0x50000000 0x50000000 0x10000000
+                          0xb0000000 0xb0000000 0x10000000
+                          0xe0000000 0xe0000000 0x10000000>;
+
+                sdhci@b3000000 {
+                        compatible = "st,sdhci-spear";
+                        reg = <0xb3000000 0x100>;
+                        interrupts = <0 28 0x4>;
+                        status = "disabled";
+                };
+
+                cf@b2800000 {
+                        compatible = "arasan,cf-spear1340";
+                        reg = <0xb2800000 0x100>;
+                        interrupts = <0 29 0x4>;
+                        status = "disabled";
+                };
+
+                dma@ea800000 {
+                        compatible = "snps,dma-spear1340";
+                        reg = <0xea800000 0x1000>;
+                        interrupts = <0 19 0x4>;
+                        status = "disabled";
+                };
+
+                dma@eb000000 {
+                        compatible = "snps,dma-spear1340";
+                        reg = <0xeb000000 0x1000>;
+                        interrupts = <0 59 0x4>;
+                        status = "disabled";
+                };
+
+                fsmc: flash@b0000000 {
+                        compatible = "st,spear600-fsmc-nand";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0xb0000000 0x1000        /* FSMC Register */
+                               0xb0800000 0x0010>;      /* NAND Base */
+                        reg-names = "fsmc_regs", "nand_data";
+                        interrupts = <0 20 0x4
+                                      0 21 0x4
+                                      0 22 0x4
+                                      0 23 0x4>;
+                        st,ale-off = <0x20000>;
+                        st,cle-off = <0x10000>;
+                        status = "disabled";
+                };
+
+                gmac0: eth@e2000000 {
+                        compatible = "st,spear600-gmac";
+                        reg = <0xe2000000 0x8000>;
+                        interrupts = <0 23 0x4
+                                      0 24 0x4>;
+                        interrupt-names = "macirq", "eth_wake_irq";
+                        status = "disabled";
+                };
+
+                smi: flash@ea000000 {
+                        compatible = "st,spear600-smi";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0xea000000 0x1000>;
+                        interrupts = <0 30 0x4>;
+                        status = "disabled";
+                };
+
+                spi0: spi@e0100000 {
+                        compatible = "arm,pl022", "arm,primecell";
+                        reg = <0xe0100000 0x1000>;
+                        interrupts = <0 31 0x4>;
+                        status = "disabled";
+                };
+
+                ehci@e4800000 {
+                        compatible = "st,spear600-ehci", "usb-ehci";
+                        reg = <0xe4800000 0x1000>;
+                        interrupts = <0 64 0x4>;
+                        status = "disabled";
+                };
+
+                ehci@e5800000 {
+                        compatible = "st,spear600-ehci", "usb-ehci";
+                        reg = <0xe5800000 0x1000>;
+                        interrupts = <0 66 0x4>;
+                        status = "disabled";
+                };
+
+                ohci@e4000000 {
+                        compatible = "st,spear600-ohci", "usb-ohci";
+                        reg = <0xe4000000 0x1000>;
+                        interrupts = <0 65 0x4>;
+                        status = "disabled";
+                };
+
+                ohci@e5000000 {
+                        compatible = "st,spear600-ohci", "usb-ohci";
+                        reg = <0xe5000000 0x1000>;
+                        interrupts = <0 67 0x4>;
+                        status = "disabled";
+                };
+
+                apb {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "simple-bus";
+                        ranges = <0x50000000 0x50000000 0x10000000
+                                  0xb0000000 0xb0000000 0x10000000
+                                  0xe0000000 0xe0000000 0x10000000>;
+
+                        gpio0: gpio@e0600000 {
+                                compatible = "arm,pl061", "arm,primecell";
+                                reg = <0xe0600000 0x1000>;
+                                interrupts = <0 24 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                status = "disabled";
+                        };
+
+                        gpio1: gpio@e0680000 {
+                                compatible = "arm,pl061", "arm,primecell";
+                                reg = <0xe0680000 0x1000>;
+                                interrupts = <0 25 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                status = "disabled";
+                        };
+
+                        kbd@e0300000 {
+                                compatible = "st,spear300-kbd";
+                                reg = <0xe0300000 0x1000>;
+                                status = "disabled";
+                        };
+
+                        i2c0: i2c@e0280000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "snps,designware-i2c";
+                                reg = <0xe0280000 0x1000>;
+                                interrupts = <0 41 0x4>;
+                                status = "disabled";
+                        };
+
+                        rtc@e0580000 {
+                                compatible = "st,spear-rtc";
+                                reg = <0xe0580000 0x1000>;
+                                interrupts = <0 36 0x4>;
+                                status = "disabled";
+                        };
+
+                        serial@e0000000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0xe0000000 0x1000>;
+                                interrupts = <0 36 0x4>;
+                                status = "disabled";
+                        };
+
+                        adc@e0080000 {
+                                compatible = "st,spear600-adc";
+                                reg = <0xe0080000 0x1000>;
+                                interrupts = <0 44 0x4>;
+                                status = "disabled";
+                        };
+
+                        timer@e0380000 {
+                                compatible = "st,spear-timer";
+                                reg = <0xe0380000 0x400>;
+                                interrupts = <0 37 0x4>;
+                        };
+
+                        timer@ec800600 {
+                                compatible = "arm,cortex-a9-twd-timer";
+                                reg = <0xec800600 0x20>;
+                                interrupts = <1 13 0x301>;
+                        };
+
+                        wdt@ec800620 {
+                                compatible = "arm,cortex-a9-twd-wdt";
+                                reg = <0xec800620 0x20>;
+                                status = "disabled";
+                        };
+
+                        thermal@e07008c4 {
+                                compatible = "st,thermal-spear1340";
+                                reg = <0xe07008c4 0x4>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/spear300-evb.dts b/arch/arm/boot/dts/spear300-evb.dts
index 910e264b87c0..fc82b1a26458 100644
--- a/arch/arm/boot/dts/spear300-evb.dts
+++ b/arch/arm/boot/dts/spear300-evb.dts
@@ -87,6 +87,31 @@
 
                 smi: flash@fc000000 {
                         status = "okay";
+                        clock-rate=<50000000>;
+
+                        flash@f8000000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xf8000000 0x800000>;
+                                st,smi-fast-mode;
+
+                                partition@0 {
+                                        label = "xloader";
+                                        reg = <0x0 0x10000>;
+                                };
+                                partition@10000 {
+                                        label = "u-boot";
+                                        reg = <0x10000 0x40000>;
+                                };
+                                partition@50000 {
+                                        label = "linux";
+                                        reg = <0x50000 0x2c0000>;
+                                };
+                                partition@310000 {
+                                        label = "rootfs";
+                                        reg = <0x310000 0x4f0000>;
+                                };
+                        };
                 };
 
                 spi0: spi@d0100000 {
diff --git a/arch/arm/boot/dts/spear310-evb.dts b/arch/arm/boot/dts/spear310-evb.dts
index 6d95317100ad..dc5e2d445a93 100644
--- a/arch/arm/boot/dts/spear310-evb.dts
+++ b/arch/arm/boot/dts/spear310-evb.dts
@@ -103,11 +103,27 @@
                         clock-rate=<50000000>;
 
                         flash@f8000000 {
-                                label = "m25p64";
-                                reg = <0xf8000000 0x800000>;
                                 #address-cells = <1>;
                                 #size-cells = <1>;
+                                reg = <0xf8000000 0x800000>;
                                 st,smi-fast-mode;
+
+                                partition@0 {
+                                        label = "xloader";
+                                        reg = <0x0 0x10000>;
+                                };
+                                partition@10000 {
+                                        label = "u-boot";
+                                        reg = <0x10000 0x40000>;
+                                };
+                                partition@50000 {
+                                        label = "linux";
+                                        reg = <0x50000 0x2c0000>;
+                                };
+                                partition@310000 {
+                                        label = "rootfs";
+                                        reg = <0x310000 0x4f0000>;
+                                };
                         };
                 };
 
diff --git a/arch/arm/boot/dts/spear320-evb.dts b/arch/arm/boot/dts/spear320-evb.dts
index 0c6463b71a37..6308fa3bec1e 100644
--- a/arch/arm/boot/dts/spear320-evb.dts
+++ b/arch/arm/boot/dts/spear320-evb.dts
@@ -110,6 +110,31 @@
 
                 smi: flash@fc000000 {
                         status = "okay";
+                        clock-rate=<50000000>;
+
+                        flash@f8000000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xf8000000 0x800000>;
+                                st,smi-fast-mode;
+
+                                partition@0 {
+                                        label = "xloader";
+                                        reg = <0x0 0x10000>;
+                                };
+                                partition@10000 {
+                                        label = "u-boot";
+                                        reg = <0x10000 0x40000>;
+                                };
+                                partition@50000 {
+                                        label = "linux";
+                                        reg = <0x50000 0x2c0000>;
+                                };
+                                partition@310000 {
+                                        label = "rootfs";
+                                        reg = <0x310000 0x4f0000>;
+                                };
+                        };
                 };
 
                 spi0: spi@d0100000 {
diff --git a/arch/arm/boot/dts/spear3xx.dtsi b/arch/arm/boot/dts/spear3xx.dtsi
index 0ae7c8e86311..91072553963f 100644
--- a/arch/arm/boot/dts/spear3xx.dtsi
+++ b/arch/arm/boot/dts/spear3xx.dtsi
@@ -139,6 +139,12 @@
                                 interrupts = <12>;
                                 status = "disabled";
                         };
+
+                        timer@f0000000 {
+                                compatible = "st,spear-timer";
+                                reg = <0xf0000000 0x400>;
+                                interrupts = <2>;
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/spear600-evb.dts b/arch/arm/boot/dts/spear600-evb.dts
index 790a7a8a5ccd..1119c22c9a82 100644
--- a/arch/arm/boot/dts/spear600-evb.dts
+++ b/arch/arm/boot/dts/spear600-evb.dts
@@ -33,6 +33,35 @@
                         status = "okay";
                 };
 
+                smi: flash@fc000000 {
+                        status = "okay";
+                        clock-rate=<50000000>;
+
+                        flash@f8000000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xf8000000 0x800000>;
+                                st,smi-fast-mode;
+
+                                partition@0 {
+                                        label = "xloader";
+                                        reg = <0x0 0x10000>;
+                                };
+                                partition@10000 {
+                                        label = "u-boot";
+                                        reg = <0x10000 0x40000>;
+                                };
+                                partition@50000 {
+                                        label = "linux";
+                                        reg = <0x50000 0x2c0000>;
+                                };
+                                partition@310000 {
+                                        label = "rootfs";
+                                        reg = <0x310000 0x4f0000>;
+                                };
+                        };
+                };
+
                 apb {
                         serial@d0000000 {
                                 status = "okay";
diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
index d777e3a6f178..089f0a42c50e 100644
--- a/arch/arm/boot/dts/spear600.dtsi
+++ b/arch/arm/boot/dts/spear600.dtsi
@@ -177,6 +177,12 @@
                                 interrupts = <28>;
                                 status = "disabled";
                         };
+
+                        timer@f0000000 {
+                                compatible = "st,spear-timer";
+                                reg = <0xf0000000 0x400>;
+                                interrupts = <16>;
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts
index 0a9f34a2c3aa..36321bceec46 100644
--- a/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@ -7,10 +7,10 @@
         compatible = "nvidia,cardhu", "nvidia,tegra30";
 
         memory {
-                reg = < 0x80000000 0x40000000 >;
+                reg = <0x80000000 0x40000000>;
         };
 
-        pinmux@70000000 {
+        pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
 
@@ -51,64 +51,122 @@
                                 nvidia,pull = <2>;
                                 nvidia,tristate = <0>;
                         };
+                        dap2_fs_pa2 {
+                                nvidia,pins =   "dap2_fs_pa2",
+                                                "dap2_sclk_pa3",
+                                                "dap2_din_pa4",
+                                                "dap2_dout_pa5";
+                                nvidia,function = "i2s1";
+                                nvidia,pull = <0>;
+                                nvidia,tristate = <0>;
+                        };
                 };
         };
 
         serial@70006000 {
-                clock-frequency = < 408000000 >;
-        };
-
-        serial@70006040 {
-                status = "disable";
-        };
-
-        serial@70006200 {
-                status = "disable";
-        };
-
-        serial@70006300 {
-                status = "disable";
-        };
-
-        serial@70006400 {
-                status = "disable";
+                status = "okay";
+                clock-frequency = <408000000>;
         };
 
         i2c@7000c000 {
+                status = "okay";
                 clock-frequency = <100000>;
         };
 
         i2c@7000c400 {
+                status = "okay";
                 clock-frequency = <100000>;
         };
 
         i2c@7000c500 {
+                status = "okay";
                 clock-frequency = <100000>;
+
+                /* ALS and Proximity sensor */
+                isl29028@44 {
+                        compatible = "isil,isl29028";
+                        reg = <0x44>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <88 0x04>; /*gpio PL0 */
+                };
         };
 
         i2c@7000c700 {
+                status = "okay";
                 clock-frequency = <100000>;
         };
 
         i2c@7000d000 {
+                status = "okay";
                 clock-frequency = <100000>;
+
+                wm8903: wm8903@1a {
+                        compatible = "wlf,wm8903";
+                        reg = <0x1a>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <179 0x04>; /* gpio PW3 */
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        micdet-cfg = <0>;
+                        micdet-delay = <100>;
+                        gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
+                };
+
+                tps62361 {
+                        compatible = "ti,tps62361";
+                        reg = <0x60>;
+
+                        regulator-name = "tps62361-vout";
+                        regulator-min-microvolt = <500000>;
+                        regulator-max-microvolt = <1500000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                        ti,vsel0-state-high;
+                        ti,vsel1-state-high;
+                };
+        };
+
+        ahub {
+                i2s@70080400 {
+                        status = "okay";
+                };
         };
 
         sdhci@78000000 {
+                status = "okay";
                 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                 wp-gpios = <&gpio 155 0>; /* gpio PT3 */
                 power-gpios = <&gpio 31 0>; /* gpio PD7 */
+                bus-width = <4>;
         };
 
-        sdhci@78000200 {
-                status = "disable";
+        sdhci@78000600 {
+                status = "okay";
+                support-8bit;
+                bus-width = <8>;
         };
 
-        sdhci@78000400 {
-                status = "disable";
-        };
+        sound {
+                compatible = "nvidia,tegra-audio-wm8903-cardhu",
+                             "nvidia,tegra-audio-wm8903";
+                nvidia,model = "NVIDIA Tegra Cardhu";
 
-        sdhci@78000400 {
-                support-8bit;
+                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 --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index 1a0b1f182944..7de701365fce 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -6,11 +6,11 @@
         model = "NVIDIA Tegra2 Harmony evaluation board";
         compatible = "nvidia,harmony", "nvidia,tegra20";
 
-        memory@0 {
-                reg = < 0x00000000 0x40000000 >;
+        memory {
+                reg = <0x00000000 0x40000000>;
         };
 
-        pinmux@70000000 {
+        pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
 
@@ -167,28 +167,28 @@
                         };
                         conf_ata {
                                 nvidia,pins = "ata", "atb", "atc", "atd", "ate",
-                                        "cdev1", "dap1", "dtb", "gma", "gmb",
-                                        "gmc", "gmd", "gme", "gpu7", "gpv",
-                                        "i2cp", "pta", "rm", "slxa", "slxk",
-                                        "spia", "spib";
+                                        "cdev1", "cdev2", "dap1", "dtb", "gma",
+                                        "gmb", "gmc", "gmd", "gme", "gpu7",
+                                        "gpv", "i2cp", "pta", "rm", "slxa",
+                                        "slxk", "spia", "spib", "uac";
                                 nvidia,pull = <0>;
                                 nvidia,tristate = <0>;
                         };
-                        conf_cdev2 {
-                                nvidia,pins = "cdev2", "csus", "spid", "spif";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <1>;
-                        };
                         conf_ck32 {
                                 nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
                                         "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
                                 nvidia,pull = <0>;
                         };
+                        conf_csus {
+                                nvidia,pins = "csus", "spid", "spif";
+                                nvidia,pull = <1>;
+                                nvidia,tristate = <1>;
+                        };
                         conf_crtp {
                                 nvidia,pins = "crtp", "dap2", "dap3", "dap4",
                                         "dtc", "dte", "dtf", "gpu", "sdio1",
                                         "slxc", "slxd", "spdi", "spdo", "spig",
-                                        "uac", "uda";
+                                        "uda";
                                 nvidia,pull = <0>;
                                 nvidia,tristate = <1>;
                         };
@@ -234,42 +234,81 @@
                 };
         };
 
-        pmc@7000f400 {
-                nvidia,invert-interrupt;
+        i2s@70002800 {
+                status = "okay";
+        };
+
+        serial@70006300 {
+                status = "okay";
+                clock-frequency = <216000000>;
         };
 
         i2c@7000c000 {
+                status = "okay";
                 clock-frequency = <400000>;
 
                 wm8903: wm8903@1a {
                         compatible = "wlf,wm8903";
                         reg = <0x1a>;
                         interrupt-parent = <&gpio>;
-                        interrupts = < 187 0x04 >;
+                        interrupts = <187 0x04>;
 
                         gpio-controller;
                         #gpio-cells = <2>;
 
                         micdet-cfg = <0>;
                         micdet-delay = <100>;
-                        gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >;
+                        gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
                 };
         };
 
         i2c@7000c400 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000c500 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000d000 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
-        i2s@70002a00 {
-                status = "disable";
+        pmc {
+                nvidia,invert-interrupt;
+        };
+
+        usb@c5000000 {
+                status = "okay";
+        };
+
+        usb@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+        };
+
+        usb@c5008000 {
+                status = "okay";
+        };
+
+        sdhci@c8000200 {
+                status = "okay";
+                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+                wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+                power-gpios = <&gpio 155 0>; /* gpio PT3 */
+                bus-width = <4>;
+        };
+
+        sdhci@c8000600 {
+                status = "okay";
+                cd-gpios = <&gpio 58 0>; /* gpio PH2 */
+                wp-gpios = <&gpio 59 0>; /* gpio PH3 */
+                power-gpios = <&gpio 70 0>; /* gpio PI6 */
+                support-8bit;
+                bus-width = <8>;
         };
 
         sound {
@@ -295,45 +334,4 @@
                 nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
                 nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
         };
-
-        serial@70006000 {
-                status = "disable";
-        };
-
-        serial@70006040 {
-                status = "disable";
-        };
-
-        serial@70006200 {
-                status = "disable";
-        };
-
-        serial@70006300 {
-                clock-frequency = < 216000000 >;
-        };
-
-        serial@70006400 {
-                status = "disable";
-        };
-
-        sdhci@c8000000 {
-                status = "disable";
-        };
-
-        sdhci@c8000200 {
-                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
-                wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-                power-gpios = <&gpio 155 0>; /* gpio PT3 */
-        };
-
-        sdhci@c8000400 {
-                status = "disable";
-        };
-
-        sdhci@c8000600 {
-                cd-gpios = <&gpio 58 0>; /* gpio PH2 */
-                wp-gpios = <&gpio 59 0>; /* gpio PH3 */
-                power-gpios = <&gpio 70 0>; /* gpio PI6 */
-                support-8bit;
-        };
 };
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 10943fb2561c..bfeb117d5aea 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -6,11 +6,11 @@
         model = "Toshiba AC100 / Dynabook AZ";
         compatible = "compal,paz00", "nvidia,tegra20";
 
-        memory@0 {
+        memory {
                 reg = <0x00000000 0x20000000>;
         };
 
-        pinmux@70000000 {
+        pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
 
@@ -159,18 +159,14 @@
                         };
                         conf_ata {
                                 nvidia,pins = "ata", "atb", "atc", "atd", "ate",
-                                        "cdev1", "dap1", "dap2", "dtf", "gma",
-                                        "gmb", "gmc", "gmd", "gme", "gpu",
-                                        "gpu7", "gpv", "i2cp", "pta", "rm",
-                                        "sdio1", "slxk", "spdo", "uac", "uda";
+                                        "cdev1", "cdev2", "dap1", "dap2", "dtf",
+                                        "gma", "gmb", "gmc", "gmd", "gme",
+                                        "gpu", "gpu7", "gpv", "i2cp", "pta",
+                                        "rm", "sdio1", "slxk", "spdo", "uac",
+                                        "uda";
                                 nvidia,pull = <0>;
                                 nvidia,tristate = <0>;
                         };
-                        conf_cdev2 {
-                                nvidia,pins = "cdev2";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <0>;
-                        };
                         conf_ck32 {
                                 nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
                                         "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
@@ -230,7 +226,22 @@
                 };
         };
 
+        i2s@70002800 {
+                status = "okay";
+        };
+
+        serial@70006000 {
+                status = "okay";
+                clock-frequency = <216000000>;
+        };
+
+        serial@70006200 {
+                status = "okay";
+                clock-frequency = <216000000>;
+        };
+
         i2c@7000c000 {
+                status = "okay";
                 clock-frequency = <400000>;
 
                 alc5632: alc5632@1e {
@@ -242,25 +253,23 @@
         };
 
         i2c@7000c400 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
-        i2c@7000c500 {
-                status = "disable";
-        };
-
-        nvec@7000c500 {
-                #address-cells = <1>;
-                #size-cells = <0>;
+        nvec {
                 compatible = "nvidia,nvec";
-                reg = <0x7000C500 0x100>;
+                reg = <0x7000c500 0x100>;
                 interrupts = <0 92 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
                 clock-frequency = <80000>;
-                request-gpios = <&gpio 170 0>;
+                request-gpios = <&gpio 170 0>; /* gpio PV2 */
                 slave-addr = <138>;
         };
 
         i2c@7000d000 {
+                status = "okay";
                 clock-frequency = <400000>;
 
                 adt7461@4c {
@@ -269,66 +278,31 @@
                 };
         };
 
-        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>;
+        usb@c5000000 {
+                status = "okay";
         };
 
-        serial@70006040 {
-                status = "disable";
+        usb@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
         };
 
-        serial@70006200 {
-                clock-frequency = <216000000>;
-        };
-
-        serial@70006300 {
-                status = "disable";
-        };
-
-        serial@70006400 {
-                status = "disable";
+        usb@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000000 {
+                status = "okay";
                 cd-gpios = <&gpio 173 0>; /* gpio PV5 */
                 wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
                 power-gpios = <&gpio 169 0>; /* gpio PV1 */
-        };
-
-        sdhci@c8000200 {
-                status = "disable";
-        };
-
-        sdhci@c8000400 {
-                status = "disable";
+                bus-width = <4>;
         };
 
         sdhci@c8000600 {
+                status = "okay";
                 support-8bit;
+                bus-width = <8>;
         };
 
         gpio-keys {
@@ -347,8 +321,28 @@
 
                 wifi {
                         label = "wifi-led";
-                        gpios = <&gpio 24 0>;
+                        gpios = <&gpio 24 0>; /* gpio PD0 */
                         linux,default-trigger = "rfkill0";
                 };
         };
+
+        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 */
+        };
 };
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index ec33116f5df9..89cb7f2acd92 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -7,11 +7,10 @@
         compatible = "nvidia,seaboard", "nvidia,tegra20";
 
         memory {
-                device_type = "memory";
-                reg = < 0x00000000 0x40000000 >;
+                reg = <0x00000000 0x40000000>;
         };
 
-        pinmux@70000000 {
+        pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
 
@@ -100,7 +99,7 @@
                         };
                         hdint {
                                 nvidia,pins = "hdint", "lpw0", "lpw2", "lsc1",
-                                        "lsck", "lsda", "pta";
+                                        "lsck", "lsda";
                                 nvidia,function = "hdmi";
                         };
                         i2cp {
@@ -134,6 +133,10 @@
                                 nvidia,pins = "pmc";
                                 nvidia,function = "pwr_on";
                         };
+                        pta {
+                                nvidia,pins = "pta";
+                                nvidia,function = "i2c2";
+                        };
                         rm {
                                 nvidia,pins = "rm";
                                 nvidia,function = "i2c1";
@@ -254,108 +257,148 @@
                 };
         };
 
+        i2s@70002800 {
+                status = "okay";
+        };
+
+        serial@70006300 {
+                status = "okay";
+                clock-frequency = <216000000>;
+        };
+
         i2c@7000c000 {
+                status = "okay";
                 clock-frequency = <400000>;
 
                 wm8903: wm8903@1a {
                         compatible = "wlf,wm8903";
                         reg = <0x1a>;
                         interrupt-parent = <&gpio>;
-                        interrupts = < 187 0x04 >;
+                        interrupts = <187 0x04>;
 
                         gpio-controller;
                         #gpio-cells = <2>;
 
                         micdet-cfg = <0>;
                         micdet-delay = <100>;
-                        gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >;
+                        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>;
+                status = "okay";
+                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 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000d000 {
+                status = "okay";
                 clock-frequency = <400000>;
 
-                adt7461@4c {
-                        compatible = "adt7461";
+                temperature-sensor@4c {
+                        compatible = "nct1008";
                         reg = <0x4c>;
                 };
-        };
-
-        i2s@70002a00 {
-                status = "disable";
-        };
-
-        sound {
-                compatible = "nvidia,tegra-audio-wm8903-seaboard",
-                             "nvidia,tegra-audio-wm8903";
-                nvidia,model = "NVIDIA Tegra Seaboard";
-
-                nvidia,audio-routing =
-                        "Headphone Jack", "HPOUTR",
-                        "Headphone Jack", "HPOUTL",
-                        "Int Spk", "ROP",
-                        "Int Spk", "RON",
-                        "Int Spk", "LOP",
-                        "Int Spk", "LON",
-                        "Mic Jack", "MICBIAS",
-                        "IN1R", "Mic Jack";
-
-                nvidia,i2s-controller = <&tegra_i2s1>;
-                nvidia,audio-codec = <&wm8903>;
-
-                nvidia,spkr-en-gpios = <&wm8903 2 0>;
-                nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
-        };
 
-        serial@70006000 {
-                status = "disable";
-        };
-
-        serial@70006040 {
-                status = "disable";
+                magnetometer@c {
+                        compatible = "ak8975";
+                        reg = <0xc>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <109 0x04>; /* gpio PN5 */
+                };
         };
 
-        serial@70006200 {
-                status = "disable";
-        };
+        emc {
+                emc-table@190000 {
+                        reg = <190000>;
+                        compatible = "nvidia,tegra20-emc-table";
+                        clock-frequency = <190000>;
+                        nvidia,emc-registers = <0x0000000c 0x00000026
+                                0x00000009 0x00000003 0x00000004 0x00000004
+                                0x00000002 0x0000000c 0x00000003 0x00000003
+                                0x00000002 0x00000001 0x00000004 0x00000005
+                                0x00000004 0x00000009 0x0000000d 0x0000059f
+                                0x00000000 0x00000003 0x00000003 0x00000003
+                                0x00000003 0x00000001 0x0000000b 0x000000c8
+                                0x00000003 0x00000007 0x00000004 0x0000000f
+                                0x00000002 0x00000000 0x00000000 0x00000002
+                                0x00000000 0x00000000 0x00000083 0xa06204ae
+                                0x007dc010 0x00000000 0x00000000 0x00000000
+                                0x00000000 0x00000000 0x00000000 0x00000000>;
+                };
 
-        serial@70006300 {
-                clock-frequency = < 216000000 >;
+                emc-table@380000 {
+                        reg = <380000>;
+                        compatible = "nvidia,tegra20-emc-table";
+                        clock-frequency = <380000>;
+                        nvidia,emc-registers = <0x00000017 0x0000004b
+                                0x00000012 0x00000006 0x00000004 0x00000005
+                                0x00000003 0x0000000c 0x00000006 0x00000006
+                                0x00000003 0x00000001 0x00000004 0x00000005
+                                0x00000004 0x00000009 0x0000000d 0x00000b5f
+                                0x00000000 0x00000003 0x00000003 0x00000006
+                                0x00000006 0x00000001 0x00000011 0x000000c8
+                                0x00000003 0x0000000e 0x00000007 0x0000000f
+                                0x00000002 0x00000000 0x00000000 0x00000002
+                                0x00000000 0x00000000 0x00000083 0xe044048b
+                                0x007d8010 0x00000000 0x00000000 0x00000000
+                                0x00000000 0x00000000 0x00000000 0x00000000>;
+                };
         };
 
-        serial@70006400 {
-                status = "disable";
+        usb@c5000000 {
+                status = "okay";
+                nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
+                dr_mode = "otg";
         };
 
-        sdhci@c8000000 {
-                status = "disable";
+        usb@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
         };
 
-        sdhci@c8000200 {
-                status = "disable";
+        usb@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000400 {
+                status = "okay";
                 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
                 power-gpios = <&gpio 70 0>; /* gpio PI6 */
+                bus-width = <4>;
         };
 
         sdhci@c8000600 {
+                status = "okay";
                 support-8bit;
-        };
-
-        usb@c5000000 {
-                nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
-                dr_mode = "otg";
+                bus-width = <8>;
         };
 
         gpio-keys {
@@ -378,41 +421,25 @@
                 };
         };
 
-        emc@7000f400 {
-                emc-table@190000 {
-                        reg = < 190000 >;
-                        compatible = "nvidia,tegra20-emc-table";
-                        clock-frequency = < 190000 >;
-                        nvidia,emc-registers = < 0x0000000c 0x00000026
-                                0x00000009 0x00000003 0x00000004 0x00000004
-                                0x00000002 0x0000000c 0x00000003 0x00000003
-                                0x00000002 0x00000001 0x00000004 0x00000005
-                                0x00000004 0x00000009 0x0000000d 0x0000059f
-                                0x00000000 0x00000003 0x00000003 0x00000003
-                                0x00000003 0x00000001 0x0000000b 0x000000c8
-                                0x00000003 0x00000007 0x00000004 0x0000000f
-                                0x00000002 0x00000000 0x00000000 0x00000002
-                                0x00000000 0x00000000 0x00000083 0xa06204ae
-                                0x007dc010 0x00000000 0x00000000 0x00000000
-                                0x00000000 0x00000000 0x00000000 0x00000000 >;
-                };
+        sound {
+                compatible = "nvidia,tegra-audio-wm8903-seaboard",
+                             "nvidia,tegra-audio-wm8903";
+                nvidia,model = "NVIDIA Tegra Seaboard";
 
-                emc-table@380000 {
-                        reg = < 380000 >;
-                        compatible = "nvidia,tegra20-emc-table";
-                        clock-frequency = < 380000 >;
-                        nvidia,emc-registers = < 0x00000017 0x0000004b
-                                0x00000012 0x00000006 0x00000004 0x00000005
-                                0x00000003 0x0000000c 0x00000006 0x00000006
-                                0x00000003 0x00000001 0x00000004 0x00000005
-                                0x00000004 0x00000009 0x0000000d 0x00000b5f
-                                0x00000000 0x00000003 0x00000003 0x00000006
-                                0x00000006 0x00000001 0x00000011 0x000000c8
-                                0x00000003 0x0000000e 0x00000007 0x0000000f
-                                0x00000002 0x00000000 0x00000000 0x00000002
-                                0x00000000 0x00000000 0x00000083 0xe044048b
-                                0x007d8010 0x00000000 0x00000000 0x00000000
-                                0x00000000 0x00000000 0x00000000 0x00000000 >;
-                };
+                nvidia,audio-routing =
+                        "Headphone Jack", "HPOUTR",
+                        "Headphone Jack", "HPOUTL",
+                        "Int Spk", "ROP",
+                        "Int Spk", "RON",
+                        "Int Spk", "LOP",
+                        "Int Spk", "LON",
+                        "Mic Jack", "MICBIAS",
+                        "IN1R", "Mic Jack";
+
+                nvidia,i2s-controller = <&tegra_i2s1>;
+                nvidia,audio-codec = <&wm8903>;
+
+                nvidia,spkr-en-gpios = <&wm8903 2 0>;
+                nvidia,hp-det-gpios = <&gpio 185 0>; /* gpio PX1 */
         };
 };
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 98efd5b0d7f9..9de5636023f6 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -6,11 +6,11 @@
         model = "Compulab TrimSlice board";
         compatible = "compulab,trimslice", "nvidia,tegra20";
 
-        memory@0 {
-                reg = < 0x00000000 0x40000000 >;
+        memory {
+                reg = <0x00000000 0x40000000>;
         };
 
-        pinmux@70000000 {
+        pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
 
@@ -182,23 +182,23 @@
                                 nvidia,tristate = <1>;
                         };
                         conf_atb {
-                                nvidia,pins = "atb", "cdev1", "dap1", "gma",
-                                        "gmc", "gmd", "gpu", "gpu7", "gpv",
-                                        "sdio1", "slxa", "slxk", "uac";
+                                nvidia,pins = "atb", "cdev1", "cdev2", "dap1",
+                                        "gma", "gmc", "gmd", "gpu", "gpu7",
+                                        "gpv", "sdio1", "slxa", "slxk", "uac";
                                 nvidia,pull = <0>;
                                 nvidia,tristate = <0>;
                         };
-                        conf_cdev2 {
-                                nvidia,pins = "cdev2", "csus", "spia", "spib",
-                                        "spid", "spif";
-                                nvidia,pull = <1>;
-                                nvidia,tristate = <1>;
-                        };
                         conf_ck32 {
                                 nvidia,pins = "ck32", "ddrc", "pmca", "pmcb",
                                         "pmcc", "pmcd", "pmce", "xm2c", "xm2d";
                                 nvidia,pull = <0>;
                         };
+                        conf_csus {
+                                nvidia,pins = "csus", "spia", "spib",
+                                        "spid", "spif";
+                                nvidia,pull = <1>;
+                                nvidia,tristate = <1>;
+                        };
                         conf_ddc {
                                 nvidia,pins = "ddc", "dtf", "rm", "sdc", "sdd";
                                 nvidia,pull = <2>;
@@ -240,68 +240,67 @@
                 };
         };
 
+        i2s@70002800 {
+                status = "okay";
+        };
+
+        serial@70006000 {
+                status = "okay";
+                clock-frequency = <216000000>;
+        };
+
         i2c@7000c000 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000c400 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000c500 {
+                status = "okay";
                 clock-frequency = <400000>;
-        };
-
-        i2c@7000d000 {
-                status = "disable";
-        };
-
-        i2s@70002800 {
-                status = "disable";
-        };
-
-        i2s@70002a00 {
-                status = "disable";
-        };
-
-        das@70000c00 {
-                status = "disable";
-        };
 
-        serial@70006000 {
-                clock-frequency = < 216000000 >;
-        };
+                codec: codec@1a {
+                        compatible = "ti,tlv320aic23";
+                        reg = <0x1a>;
+                };
 
-        serial@70006040 {
-                status = "disable";
+                rtc@56 {
+                        compatible = "emmicro,em3027";
+                        reg = <0x56>;
+                };
         };
 
-        serial@70006200 {
-                status = "disable";
+        usb@c5000000 {
+                status = "okay";
         };
 
-        serial@70006300 {
-                status = "disable";
+        usb@c5004000 {
+                nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
         };
 
-        serial@70006400 {
-                status = "disable";
+        usb@c5008000 {
+                status = "okay";
         };
 
         sdhci@c8000000 {
-                status = "disable";
+                status = "okay";
+                bus-width = <4>;
         };
 
-        sdhci@c8000200 {
-                status = "disable";
-        };
-
-        sdhci@c8000400 {
-                status = "disable";
+        sdhci@c8000600 {
+                status = "okay";
+                cd-gpios = <&gpio 121 0>; /* gpio PP1 */
+                wp-gpios = <&gpio 122 0>; /* gpio PP2 */
+                bus-width = <4>;
         };
 
-        sdhci@c8000600 {
-                cd-gpios = <&gpio 121 0>;
-                wp-gpios = <&gpio 122 0>;
+        sound {
+                compatible = "nvidia,tegra-audio-trimslice";
+                nvidia,i2s-controller = <&tegra_i2s1>;
+                nvidia,audio-codec = <&codec>;
         };
 };
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 71eb2e50a668..445343b0fbdd 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -7,10 +7,10 @@
         compatible = "nvidia,ventana", "nvidia,tegra20";
 
         memory {
-                reg = < 0x00000000 0x40000000 >;
+                reg = <0x00000000 0x40000000>;
         };
 
-        pinmux@70000000 {
+        pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
 
@@ -240,38 +240,82 @@
                 };
         };
 
+        i2s@70002800 {
+                status = "okay";
+        };
+
+        serial@70006300 {
+                status = "okay";
+                clock-frequency = <216000000>;
+        };
+
         i2c@7000c000 {
+                status = "okay";
                 clock-frequency = <400000>;
 
                 wm8903: wm8903@1a {
                         compatible = "wlf,wm8903";
                         reg = <0x1a>;
                         interrupt-parent = <&gpio>;
-                        interrupts = < 187 0x04 >;
+                        interrupts = <187 0x04>;
 
                         gpio-controller;
                         #gpio-cells = <2>;
 
                         micdet-cfg = <0>;
                         micdet-delay = <100>;
-                        gpio-cfg = < 0xffffffff 0xffffffff 0 0xffffffff 0xffffffff >;
+                        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 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000c500 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
         i2c@7000d000 {
+                status = "okay";
                 clock-frequency = <400000>;
         };
 
-        i2s@70002a00 {
-                status = "disable";
+        usb@c5000000 {
+                status = "okay";
+        };
+
+        usb@c5004000 {
+                status = "okay";
+                nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */
+        };
+
+        usb@c5008000 {
+                status = "okay";
+        };
+
+        sdhci@c8000400 {
+                status = "okay";
+                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+                wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+                power-gpios = <&gpio 70 0>; /* gpio PI6 */
+                bus-width = <4>;
+        };
+
+        sdhci@c8000600 {
+                status = "okay";
+                support-8bit;
+                bus-width = <8>;
         };
 
         sound {
@@ -294,45 +338,7 @@
 
                 nvidia,spkr-en-gpios = <&wm8903 2 0>;
                 nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
-                nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
+                nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
                 nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
         };
-
-        serial@70006000 {
-                status = "disable";
-        };
-
-        serial@70006040 {
-                status = "disable";
-        };
-
-        serial@70006200 {
-                status = "disable";
-        };
-
-        serial@70006300 {
-                clock-frequency = < 216000000 >;
-        };
-
-        serial@70006400 {
-                status = "disable";
-        };
-
-        sdhci@c8000000 {
-                status = "disable";
-        };
-
-        sdhci@c8000200 {
-                status = "disable";
-        };
-
-        sdhci@c8000400 {
-                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
-                wp-gpios = <&gpio 57 0>; /* gpio PH1 */
-                power-gpios = <&gpio 70 0>; /* gpio PI6 */
-        };
-
-        sdhci@c8000600 {
-                support-8bit;
-        };
 };
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 108e894a8926..c417d67e9027 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -4,207 +4,242 @@
         compatible = "nvidia,tegra20";
         interrupt-parent = <&intc>;
 
-        pmc@7000f400 {
-                compatible = "nvidia,tegra20-pmc";
-                reg = <0x7000e400 0x400>;
-        };
-
-        intc: interrupt-controller@50041000 {
+        intc: interrupt-controller {
                 compatible = "arm,cortex-a9-gic";
+                reg = <0x50041000 0x1000
+                       0x50040100 0x0100>;
                 interrupt-controller;
                 #interrupt-cells = <3>;
-                reg = < 0x50041000 0x1000 >,
-                      < 0x50040100 0x0100 >;
         };
 
-        pmu {
-                compatible = "arm,cortex-a9-pmu";
-                interrupts = <0 56 0x04
-                              0 57 0x04>;
-        };
-
-        apbdma: dma@6000a000 {
+        apbdma: dma {
                 compatible = "nvidia,tegra20-apbdma";
                 reg = <0x6000a000 0x1200>;
-                interrupts = < 0 104 0x04
-                               0 105 0x04
-                               0 106 0x04
-                               0 107 0x04
-                               0 108 0x04
-                               0 109 0x04
-                               0 110 0x04
-                               0 111 0x04
-                               0 112 0x04
-                               0 113 0x04
-                               0 114 0x04
-                               0 115 0x04
-                               0 116 0x04
-                               0 117 0x04
-                               0 118 0x04
-                               0 119 0x04 >;
-        };
-
-        i2c@7000c000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "nvidia,tegra20-i2c";
-                reg = <0x7000C000 0x100>;
-                interrupts = < 0 38 0x04 >;
-        };
-
-        i2c@7000c400 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "nvidia,tegra20-i2c";
-                reg = <0x7000C400 0x100>;
-                interrupts = < 0 84 0x04 >;
+                interrupts = <0 104 0x04
+                              0 105 0x04
+                              0 106 0x04
+                              0 107 0x04
+                              0 108 0x04
+                              0 109 0x04
+                              0 110 0x04
+                              0 111 0x04
+                              0 112 0x04
+                              0 113 0x04
+                              0 114 0x04
+                              0 115 0x04
+                              0 116 0x04
+                              0 117 0x04
+                              0 118 0x04
+                              0 119 0x04>;
+        };
+
+        ahb {
+                compatible = "nvidia,tegra20-ahb";
+                reg = <0x6000c004 0x10c>; /* AHB Arbitration + Gizmo Controller */
+        };
+
+        gpio: gpio {
+                compatible = "nvidia,tegra20-gpio";
+                reg = <0x6000d000 0x1000>;
+                interrupts = <0 32 0x04
+                              0 33 0x04
+                              0 34 0x04
+                              0 35 0x04
+                              0 55 0x04
+                              0 87 0x04
+                              0 89 0x04>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                #interrupt-cells = <2>;
+                interrupt-controller;
         };
 
-        i2c@7000c500 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "nvidia,tegra20-i2c";
-                reg = <0x7000C500 0x100>;
-                interrupts = < 0 92 0x04 >;
+        pinmux: pinmux {
+                compatible = "nvidia,tegra20-pinmux";
+                reg = <0x70000014 0x10   /* Tri-state registers */
+                       0x70000080 0x20   /* Mux registers */
+                       0x700000a0 0x14   /* Pull-up/down registers */
+                       0x70000868 0xa8>; /* Pad control registers */
         };
 
-        i2c@7000d000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "nvidia,tegra20-i2c-dvc";
-                reg = <0x7000D000 0x200>;
-                interrupts = < 0 53 0x04 >;
+        das {
+                compatible = "nvidia,tegra20-das";
+                reg = <0x70000c00 0x80>;
         };
 
         tegra_i2s1: i2s@70002800 {
                 compatible = "nvidia,tegra20-i2s";
                 reg = <0x70002800 0x200>;
-                interrupts = < 0 13 0x04 >;
-                nvidia,dma-request-selector = < &apbdma 2 >;
+                interrupts = <0 13 0x04>;
+                nvidia,dma-request-selector = <&apbdma 2>;
+                status = "disable";
         };
 
         tegra_i2s2: i2s@70002a00 {
                 compatible = "nvidia,tegra20-i2s";
                 reg = <0x70002a00 0x200>;
-                interrupts = < 0 3 0x04 >;
-                nvidia,dma-request-selector = < &apbdma 1 >;
-        };
-
-        das@70000c00 {
-                compatible = "nvidia,tegra20-das";
-                reg = <0x70000c00 0x80>;
-        };
-
-        gpio: gpio@6000d000 {
-                compatible = "nvidia,tegra20-gpio";
-                reg = < 0x6000d000 0x1000 >;
-                interrupts = < 0 32 0x04
-                               0 33 0x04
-                               0 34 0x04
-                               0 35 0x04
-                               0 55 0x04
-                               0 87 0x04
-                               0 89 0x04 >;
-                #gpio-cells = <2>;
-                gpio-controller;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-        };
-
-        pinmux: pinmux@70000000 {
-                compatible = "nvidia,tegra20-pinmux";
-                reg = < 0x70000014 0x10    /* Tri-state registers */
-                        0x70000080 0x20    /* Mux registers */
-                        0x700000a0 0x14    /* Pull-up/down registers */
-                        0x70000868 0xa8 >; /* Pad control registers */
+                interrupts = <0 3 0x04>;
+                nvidia,dma-request-selector = <&apbdma 1>;
+                status = "disable";
         };
 
         serial@70006000 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006000 0x40>;
                 reg-shift = <2>;
-                interrupts = < 0 36 0x04 >;
+                interrupts = <0 36 0x04>;
+                status = "disable";
         };
 
         serial@70006040 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006040 0x40>;
                 reg-shift = <2>;
-                interrupts = < 0 37 0x04 >;
+                interrupts = <0 37 0x04>;
+                status = "disable";
         };
 
         serial@70006200 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006200 0x100>;
                 reg-shift = <2>;
-                interrupts = < 0 46 0x04 >;
+                interrupts = <0 46 0x04>;
+                status = "disable";
         };
 
         serial@70006300 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006300 0x100>;
                 reg-shift = <2>;
-                interrupts = < 0 90 0x04 >;
+                interrupts = <0 90 0x04>;
+                status = "disable";
         };
 
         serial@70006400 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006400 0x100>;
                 reg-shift = <2>;
-                interrupts = < 0 91 0x04 >;
+                interrupts = <0 91 0x04>;
+                status = "disable";
         };
 
-        emc@7000f400 {
+        i2c@7000c000 {
+                compatible = "nvidia,tegra20-i2c";
+                reg = <0x7000c000 0x100>;
+                interrupts = <0 38 0x04>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                compatible = "nvidia,tegra20-emc";
-                reg = <0x7000f400 0x200>;
+                status = "disable";
         };
 
-        sdhci@c8000000 {
-                compatible = "nvidia,tegra20-sdhci";
-                reg = <0xc8000000 0x200>;
-                interrupts = < 0 14 0x04 >;
+        i2c@7000c400 {
+                compatible = "nvidia,tegra20-i2c";
+                reg = <0x7000c400 0x100>;
+                interrupts = <0 84 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disable";
         };
 
-        sdhci@c8000200 {
-                compatible = "nvidia,tegra20-sdhci";
-                reg = <0xc8000200 0x200>;
-                interrupts = < 0 15 0x04 >;
+        i2c@7000c500 {
+                compatible = "nvidia,tegra20-i2c";
+                reg = <0x7000c500 0x100>;
+                interrupts = <0 92 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disable";
         };
 
-        sdhci@c8000400 {
-                compatible = "nvidia,tegra20-sdhci";
-                reg = <0xc8000400 0x200>;
-                interrupts = < 0 19 0x04 >;
+        i2c@7000d000 {
+                compatible = "nvidia,tegra20-i2c-dvc";
+                reg = <0x7000d000 0x200>;
+                interrupts = <0 53 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disable";
         };
 
-        sdhci@c8000600 {
-                compatible = "nvidia,tegra20-sdhci";
-                reg = <0xc8000600 0x200>;
-                interrupts = < 0 31 0x04 >;
+        pmc {
+                compatible = "nvidia,tegra20-pmc";
+                reg = <0x7000e400 0x400>;
+        };
+
+        mc {
+                compatible = "nvidia,tegra20-mc";
+                reg = <0x7000f000 0x024
+                       0x7000f03c 0x3c4>;
+                interrupts = <0 77 0x04>;
+        };
+
+        gart {
+                compatible = "nvidia,tegra20-gart";
+                reg = <0x7000f024 0x00000018    /* controller registers */
+                       0x58000000 0x02000000>;  /* GART aperture */
+        };
+
+        emc {
+                compatible = "nvidia,tegra20-emc";
+                reg = <0x7000f400 0x200>;
+                #address-cells = <1>;
+                #size-cells = <0>;
         };
 
         usb@c5000000 {
                 compatible = "nvidia,tegra20-ehci", "usb-ehci";
                 reg = <0xc5000000 0x4000>;
-                interrupts = < 0 20 0x04 >;
+                interrupts = <0 20 0x04>;
                 phy_type = "utmi";
                 nvidia,has-legacy-mode;
+                status = "disable";
         };
 
         usb@c5004000 {
                 compatible = "nvidia,tegra20-ehci", "usb-ehci";
                 reg = <0xc5004000 0x4000>;
-                interrupts = < 0 21 0x04 >;
+                interrupts = <0 21 0x04>;
                 phy_type = "ulpi";
+                status = "disable";
         };
 
         usb@c5008000 {
                 compatible = "nvidia,tegra20-ehci", "usb-ehci";
                 reg = <0xc5008000 0x4000>;
-                interrupts = < 0 97 0x04 >;
+                interrupts = <0 97 0x04>;
                 phy_type = "utmi";
+                status = "disable";
+        };
+
+        sdhci@c8000000 {
+                compatible = "nvidia,tegra20-sdhci";
+                reg = <0xc8000000 0x200>;
+                interrupts = <0 14 0x04>;
+                status = "disable";
         };
-};
 
+        sdhci@c8000200 {
+                compatible = "nvidia,tegra20-sdhci";
+                reg = <0xc8000200 0x200>;
+                interrupts = <0 15 0x04>;
+                status = "disable";
+        };
+
+        sdhci@c8000400 {
+                compatible = "nvidia,tegra20-sdhci";
+                reg = <0xc8000400 0x200>;
+                interrupts = <0 19 0x04>;
+                status = "disable";
+        };
+
+        sdhci@c8000600 {
+                compatible = "nvidia,tegra20-sdhci";
+                reg = <0xc8000600 0x200>;
+                interrupts = <0 31 0x04>;
+                status = "disable";
+        };
+
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupts = <0 56 0x04
+                              0 57 0x04>;
+        };
+};
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 62a7b39f1c9a..2dcc09e784b5 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -4,183 +4,268 @@
         compatible = "nvidia,tegra30";
         interrupt-parent = <&intc>;
 
-        pmc@7000f400 {
-                compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc";
-                reg = <0x7000e400 0x400>;
-        };
-
-        intc: interrupt-controller@50041000 {
+        intc: interrupt-controller {
                 compatible = "arm,cortex-a9-gic";
+                reg = <0x50041000 0x1000
+                       0x50040100 0x0100>;
                 interrupt-controller;
                 #interrupt-cells = <3>;
-                reg = < 0x50041000 0x1000 >,
-                      < 0x50040100 0x0100 >;
         };
 
-        pmu {
-                compatible = "arm,cortex-a9-pmu";
-                interrupts = <0 144 0x04
-                              0 145 0x04
-                              0 146 0x04
-                              0 147 0x04>;
-        };
-
-        apbdma: dma@6000a000 {
+        apbdma: dma {
                 compatible = "nvidia,tegra30-apbdma", "nvidia,tegra20-apbdma";
                 reg = <0x6000a000 0x1400>;
-                interrupts = < 0 104 0x04
-                               0 105 0x04
-                               0 106 0x04
-                               0 107 0x04
-                               0 108 0x04
-                               0 109 0x04
-                               0 110 0x04
-                               0 111 0x04
-                               0 112 0x04
-                               0 113 0x04
-                               0 114 0x04
-                               0 115 0x04
-                               0 116 0x04
-                               0 117 0x04
-                               0 118 0x04
-                               0 119 0x04
-                               0 128 0x04
-                               0 129 0x04
-                               0 130 0x04
-                               0 131 0x04
-                               0 132 0x04
-                               0 133 0x04
-                               0 134 0x04
-                               0 135 0x04
-                               0 136 0x04
-                               0 137 0x04
-                               0 138 0x04
-                               0 139 0x04
-                               0 140 0x04
-                               0 141 0x04
-                               0 142 0x04
-                               0 143 0x04 >;
-        };
-
-        i2c@7000c000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible =  "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
-                reg = <0x7000C000 0x100>;
-                interrupts = < 0 38 0x04 >;
-        };
-
-        i2c@7000c400 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
-                reg = <0x7000C400 0x100>;
-                interrupts = < 0 84 0x04 >;
-        };
-
-        i2c@7000c500 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
-                reg = <0x7000C500 0x100>;
-                interrupts = < 0 92 0x04 >;
+                interrupts = <0 104 0x04
+                              0 105 0x04
+                              0 106 0x04
+                              0 107 0x04
+                              0 108 0x04
+                              0 109 0x04
+                              0 110 0x04
+                              0 111 0x04
+                              0 112 0x04
+                              0 113 0x04
+                              0 114 0x04
+                              0 115 0x04
+                              0 116 0x04
+                              0 117 0x04
+                              0 118 0x04
+                              0 119 0x04
+                              0 128 0x04
+                              0 129 0x04
+                              0 130 0x04
+                              0 131 0x04
+                              0 132 0x04
+                              0 133 0x04
+                              0 134 0x04
+                              0 135 0x04
+                              0 136 0x04
+                              0 137 0x04
+                              0 138 0x04
+                              0 139 0x04
+                              0 140 0x04
+                              0 141 0x04
+                              0 142 0x04
+                              0 143 0x04>;
         };
 
-        i2c@7000c700 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
-                reg = <0x7000c700 0x100>;
-                interrupts = < 0 120 0x04 >;
+        ahb: ahb {
+                compatible = "nvidia,tegra30-ahb";
+                reg = <0x6000c004 0x14c>; /* AHB Arbitration + Gizmo Controller */
         };
 
-        i2c@7000d000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
-                reg = <0x7000D000 0x100>;
-                interrupts = < 0 53 0x04 >;
-        };
-
-        gpio: gpio@6000d000 {
+        gpio: gpio {
                 compatible = "nvidia,tegra30-gpio", "nvidia,tegra20-gpio";
-                reg = < 0x6000d000 0x1000 >;
-                interrupts = < 0 32 0x04
-                               0 33 0x04
-                               0 34 0x04
-                               0 35 0x04
-                               0 55 0x04
-                               0 87 0x04
-                               0 89 0x04
-                               0 125 0x04 >;
+                reg = <0x6000d000 0x1000>;
+                interrupts = <0 32 0x04
+                              0 33 0x04
+                              0 34 0x04
+                              0 35 0x04
+                              0 55 0x04
+                              0 87 0x04
+                              0 89 0x04
+                              0 125 0x04>;
                 #gpio-cells = <2>;
                 gpio-controller;
                 #interrupt-cells = <2>;
                 interrupt-controller;
         };
 
+        pinmux: pinmux {
+                compatible = "nvidia,tegra30-pinmux";
+                reg = <0x70000868 0xd0    /* Pad control registers */
+                       0x70003000 0x3e0>; /* Mux registers */
+        };
+
         serial@70006000 {
                 compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
                 reg = <0x70006000 0x40>;
                 reg-shift = <2>;
-                interrupts = < 0 36 0x04 >;
+                interrupts = <0 36 0x04>;
+                status = "disable";
         };
 
         serial@70006040 {
                 compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
                 reg = <0x70006040 0x40>;
                 reg-shift = <2>;
-                interrupts = < 0 37 0x04 >;
+                interrupts = <0 37 0x04>;
+                status = "disable";
         };
 
         serial@70006200 {
                 compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
                 reg = <0x70006200 0x100>;
                 reg-shift = <2>;
-                interrupts = < 0 46 0x04 >;
+                interrupts = <0 46 0x04>;
+                status = "disable";
         };
 
         serial@70006300 {
                 compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
                 reg = <0x70006300 0x100>;
                 reg-shift = <2>;
-                interrupts = < 0 90 0x04 >;
+                interrupts = <0 90 0x04>;
+                status = "disable";
         };
 
         serial@70006400 {
                 compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
                 reg = <0x70006400 0x100>;
                 reg-shift = <2>;
-                interrupts = < 0 91 0x04 >;
+                interrupts = <0 91 0x04>;
+                status = "disable";
+        };
+
+        i2c@7000c000 {
+                compatible =  "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000c000 0x100>;
+                interrupts = <0 38 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disable";
+        };
+
+        i2c@7000c400 {
+                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000c400 0x100>;
+                interrupts = <0 84 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disable";
+        };
+
+        i2c@7000c500 {
+                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000c500 0x100>;
+                interrupts = <0 92 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disable";
+        };
+
+        i2c@7000c700 {
+                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000c700 0x100>;
+                interrupts = <0 120 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disable";
+        };
+
+        i2c@7000d000 {
+                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000d000 0x100>;
+                interrupts = <0 53 0x04>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disable";
+        };
+
+        pmc {
+                compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc";
+                reg = <0x7000e400 0x400>;
+        };
+
+        mc {
+                compatible = "nvidia,tegra30-mc";
+                reg = <0x7000f000 0x010
+                       0x7000f03c 0x1b4
+                       0x7000f200 0x028
+                       0x7000f284 0x17c>;
+                interrupts = <0 77 0x04>;
+        };
+
+        smmu {
+                compatible = "nvidia,tegra30-smmu";
+                reg = <0x7000f010 0x02c
+                       0x7000f1f0 0x010
+                       0x7000f228 0x05c>;
+                nvidia,#asids = <4>;            /* # of ASIDs */
+                dma-window = <0 0x40000000>;    /* IOVA start & length */
+                nvidia,ahb = <&ahb>;
+        };
+
+        ahub {
+                compatible = "nvidia,tegra30-ahub";
+                reg = <0x70080000 0x200
+                       0x70080200 0x100>;
+                interrupts = <0 103 0x04>;
+                nvidia,dma-request-selector = <&apbdma 1>;
+
+                ranges;
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                tegra_i2s0: i2s@70080300 {
+                        compatible = "nvidia,tegra30-i2s";
+                        reg = <0x70080300 0x100>;
+                        nvidia,ahub-cif-ids = <4 4>;
+                        status = "disable";
+                };
+
+                tegra_i2s1: i2s@70080400 {
+                        compatible = "nvidia,tegra30-i2s";
+                        reg = <0x70080400 0x100>;
+                        nvidia,ahub-cif-ids = <5 5>;
+                        status = "disable";
+                };
+
+                tegra_i2s2: i2s@70080500 {
+                        compatible = "nvidia,tegra30-i2s";
+                        reg = <0x70080500 0x100>;
+                        nvidia,ahub-cif-ids = <6 6>;
+                        status = "disable";
+                };
+
+                tegra_i2s3: i2s@70080600 {
+                        compatible = "nvidia,tegra30-i2s";
+                        reg = <0x70080600 0x100>;
+                        nvidia,ahub-cif-ids = <7 7>;
+                        status = "disable";
+                };
+
+                tegra_i2s4: i2s@70080700 {
+                        compatible = "nvidia,tegra30-i2s";
+                        reg = <0x70080700 0x100>;
+                        nvidia,ahub-cif-ids = <8 8>;
+                        status = "disable";
+                };
         };
 
         sdhci@78000000 {
                 compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                 reg = <0x78000000 0x200>;
-                interrupts = < 0 14 0x04 >;
+                interrupts = <0 14 0x04>;
+                status = "disable";
         };
 
         sdhci@78000200 {
                 compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                 reg = <0x78000200 0x200>;
-                interrupts = < 0 15 0x04 >;
+                interrupts = <0 15 0x04>;
+                status = "disable";
         };
 
         sdhci@78000400 {
                 compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                 reg = <0x78000400 0x200>;
-                interrupts = < 0 19 0x04 >;
+                interrupts = <0 19 0x04>;
+                status = "disable";
         };
 
         sdhci@78000600 {
                 compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                 reg = <0x78000600 0x200>;
-                interrupts = < 0 31 0x04 >;
+                interrupts = <0 31 0x04>;
+                status = "disable";
         };
 
-        pinmux: pinmux@70000000 {
-                compatible = "nvidia,tegra30-pinmux";
-                reg = < 0x70000868 0xd0     /* Pad control registers */
-                        0x70003000 0x3e0 >; /* Mux registers */
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupts = <0 144 0x04
+                              0 145 0x04
+                              0 146 0x04
+                              0 147 0x04>;
         };
 };