Merge tag 'imx-dt-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Pull "i.MX device tree changes for 4.16" from Shawn Guo:

 - A few random updates for vf610-zii board: correct switch EEPROM size,
   enable edma1, correct GPIO expander interrupt, add PHYs for switch2
   device.
 - LS1021A device tree updates: add reboot and QSPI device nodes, label
   USB controllers, specify interrupt-affinity for PMU, fix TMR_FIPER1
   setting, enable esdhc device, add Moxa UC-8410A board support.
 - A bunch of patches from Fabio: fix reg - unit address mismatches,
   remove leading zero in unit address, move regulators out of
   simple-bus, move nodes with no reg property out of bus, remove extra
   clock cell, add missing phy-cells to usb-nop-xceiv, etc.
 - A couple series from Hummingboard developers: re-organise device tree
   files for better handling various board versions, and then add the
   new hummingboard2 board support on top of that.
 - Disable AC'97 input pins pad and add support for powering off for
   imx6qdl-udoo board.
 - Convert from fbdev to drm bindings for imx6sx-sdb and imx6sl-evk
   board.
 - Add device tree for Variscite DART-MX6 SoM and Carrier-board support.
 - Add new board support of TS-4600 and TS-7970 from Technologic
   Systems.
 - A series from Stefan to update imx7-colibri device tree and then add
   new version of Toradex Colibri iMX7D board with eMMC support.
 - Other random updates on various board support.

* tag 'imx-dt-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (126 commits)
  ARM: dts: imx7s: Avoid using label in unit address and reg
  ARM: dts: imx51-zii-rdu1: Add missing #phy-cells to usb-nop-xceiv
  ARM: dts: imx6qdl-hummingboard2: Remove leading zero in unit address
  ARM: dts: ls1021a: add support for Moxa UC-8410A open platform
  ARM: dts: imx51-babbage: Fix the 26MHz clock modelling
  ARM: dts: vf610-zii-dev-rev-b: add PHYs for switch2
  ARM: dts: vf610-zii-dev-rev-b: fix interrupt for GPIO expander
  ARM: dts: vf610-zii-dev: enable edma1
  ARM: dts: ls1021a-twr: Remove extra clock cell
  ARM: dts: ls1021a-qds: Remove extra clock cell
  ARM: dts: imx53: add srtc node
  dt-bindings: imx-gpcv2: Fix the unit address
  ARM: imx: dts: Use lower case for bindings notation
  ARM: dts: imx6q-h100: use usdhc2 VSELECT
  ARM: dts: imx6sx: Add support for PCI power domain
  ARM: dts: imx6sx: Fix PCI non-prefetchable memory range
  ARM: dts: imx6qdl-hummingboard2: rename regulators to match schematic
  ARM: dts: imx6qdl-hummingboard2: add v1.5 som with eMMC
  ARM: dts: imx6qdl-hummingboard2: add v1.5 som without eMMC
  ARM: dts: imx6qdl-hummingboard2: add PWM3 support
  ...

101 files changed, 5005 insertions, 1058 deletions

diff --git a/Documentation/devicetree/bindings/arm/technologic.txt b/Documentation/devicetree/bindings/arm/technologic.txt
index 33797acad846..f1cedc00dcab 100644
--- a/Documentation/devicetree/bindings/arm/technologic.txt
+++ b/Documentation/devicetree/bindings/arm/technologic.txt
@@ -1,6 +1,11 @@
 Technologic Systems Platforms Device Tree Bindings
 --------------------------------------------------
 
+TS-4600 is a System-on-Module based on the Freescale i.MX28 System-on-Chip.
+It can be mounted on a carrier board providing additional peripheral connectors.
+Required root node properties:
+        - compatible = "technologic,imx28-ts4600", "fsl,imx28"
+
 TS-4800 board
 Required root node properties:
         - compatible = "technologic,imx51-ts4800", "fsl,imx51";
@@ -10,3 +15,9 @@ It can be mounted on a carrier board providing additional peripheral connectors.
 Required root node properties:
         - compatible = "technologic,imx6dl-ts4900", "fsl,imx6dl"
         - compatible = "technologic,imx6q-ts4900", "fsl,imx6q"
+
+TS-7970 is a System-on-Module based on the Freescale i.MX6 System-on-Chip.
+It can be mounted on a carrier board providing additional peripheral connectors.
+Required root node properties:
+        - compatible = "technologic,imx6dl-ts7970", "fsl,imx6dl"
+        - compatible = "technologic,imx6q-ts7970", "fsl,imx6q"
diff --git a/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt b/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt
new file mode 100644
index 000000000000..d06644b555bd
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt
@@ -0,0 +1,41 @@
+Solomon Goldentek Display GKTW70SDAE4SE LVDS Display Panel
+==========================================================
+
+The GKTW70SDAE4SE is a 7" WVGA TFT-LCD display panel.
+
+These DT bindings follow the LVDS panel bindings defined in panel-lvds.txt
+with the following device-specific properties.
+
+Required properties:
+
+- compatible: Shall contain "sgd,gktw70sdae4se" and "panel-lvds", in that order.
+
+Example
+-------
+
+panel {
+        compatible = "sgd,gktw70sdae4se", "panel-lvds";
+
+        width-mm = <153>;
+        height-mm = <86>;
+
+        data-mapping = "jeida-18";
+
+        panel-timing {
+                clock-frequency = <32000000>;
+                hactive = <800>;
+                vactive = <480>;
+                hback-porch = <39>;
+                hfront-porch = <39>;
+                vback-porch = <29>;
+                vfront-porch = <13>;
+                hsync-len = <47>;
+                vsync-len = <2>;
+        };
+
+        port {
+                panel_in: endpoint {
+                        remote-endpoint = <&lvds_encoder>;
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt b/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt
index 02f45c65fd87..9acce75b29ab 100644
--- a/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt
+++ b/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt
@@ -44,10 +44,10 @@ Example:
                         #address-cells = <1>;
                         #size-cells = <0>;
 
-                        pgc_pcie_phy: power-domain@3 {
+                        pgc_pcie_phy: power-domain@1 {
                                 #power-domain-cells = <0>;
 
-                                reg = <IMX7_POWER_DOMAIN_PCIE_PHY>;
+                                reg = <1>;
                                 power-supply = <&reg_1p0d>;
                         };
                 };
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 9bce76f3118d..37f8c12eda19 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -306,6 +306,7 @@ seagate	Seagate Technology PLC
 semtech Semtech Corporation
 sensirion       Sensirion AG
 sff     Small Form Factor Committee
+sgd     Solomon Goldentek Display Corporation
 sgx     SGX Sensortech
 sharp   Sharp Corporation
 shimafuji       Shimafuji Electric, Inc.
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index a89ffaff8e8f..f3d22db29775 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -373,6 +373,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6dl-aristainetos2_7.dtb \
         imx6dl-colibri-eval-v3.dtb \
         imx6dl-cubox-i.dtb \
+        imx6dl-cubox-i-emmc-som-v15.dtb \
+        imx6dl-cubox-i-som-v15.dtb \
         imx6dl-dfi-fs700-m60.dtb \
         imx6dl-gw51xx.dtb \
         imx6dl-gw52xx.dtb \
@@ -385,6 +387,11 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6dl-gw5903.dtb \
         imx6dl-gw5904.dtb \
         imx6dl-hummingboard.dtb \
+        imx6dl-hummingboard-emmc-som-v15.dtb \
+        imx6dl-hummingboard-som-v15.dtb \
+        imx6dl-hummingboard2.dtb \
+        imx6dl-hummingboard2-emmc-som-v15.dtb \
+        imx6dl-hummingboard2-som-v15.dtb \
         imx6dl-icore.dtb \
         imx6dl-icore-rqs.dtb \
         imx6dl-nit6xlite.dtb \
@@ -397,6 +404,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6dl-sabresd.dtb \
         imx6dl-savageboard.dtb \
         imx6dl-ts4900.dtb \
+        imx6dl-ts7970.dtb \
         imx6dl-tx6dl-comtft.dtb \
         imx6dl-tx6s-8034.dtb \
         imx6dl-tx6s-8034-mb7.dtb \
@@ -422,6 +430,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6q-b850v3.dtb \
         imx6q-cm-fx6.dtb \
         imx6q-cubox-i.dtb \
+        imx6q-cubox-i-emmc-som-v15.dtb \
+        imx6q-cubox-i-som-v15.dtb \
         imx6q-dfi-fs700-m60.dtb \
         imx6q-display5-tianma-tm070-1280x768.dtb \
         imx6q-dmo-edmqmx6.dtb \
@@ -440,6 +450,11 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6q-gw5904.dtb \
         imx6q-h100.dtb \
         imx6q-hummingboard.dtb \
+        imx6q-hummingboard-emmc-som-v15.dtb \
+        imx6q-hummingboard-som-v15.dtb \
+        imx6q-hummingboard2.dtb \
+        imx6q-hummingboard2-emmc-som-v15.dtb \
+        imx6q-hummingboard2-som-v15.dtb \
         imx6q-icore.dtb \
         imx6q-icore-ofcap10.dtb \
         imx6q-icore-ofcap12.dtb \
@@ -460,6 +475,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6q-sbc6x.dtb \
         imx6q-tbs2910.dtb \
         imx6q-ts4900.dtb \
+        imx6q-ts7970.dtb \
         imx6q-tx6q-1010.dtb \
         imx6q-tx6q-1010-comtft.dtb \
         imx6q-tx6q-1020.dtb \
@@ -471,6 +487,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6q-tx6q-11x0-mb7.dtb \
         imx6q-udoo.dtb \
         imx6q-utilite-pro.dtb \
+        imx6q-var-dt6customboard.dtb \
         imx6q-wandboard.dtb \
         imx6q-wandboard-revb1.dtb \
         imx6q-wandboard-revd1.dtb \
@@ -512,15 +529,17 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
         imx6ull-14x14-evk.dtb
 dtb-$(CONFIG_SOC_IMX7D) += \
         imx7d-cl-som-imx7.dtb \
+        imx7d-colibri-emmc-eval-v3.dtb \
         imx7d-colibri-eval-v3.dtb \
         imx7d-nitrogen7.dtb \
-        imx7d-pico.dtb \
+        imx7d-pico-pi.dtb \
         imx7d-sbc-imx7.dtb \
         imx7d-sdb.dtb \
         imx7d-sdb-sht11.dtb \
         imx7s-colibri-eval-v3.dtb \
         imx7s-warp.dtb
 dtb-$(CONFIG_SOC_LS1021A) += \
+        ls1021a-moxa-uc-8410a.dtb \
         ls1021a-qds.dtb \
         ls1021a-twr.dtb
 dtb-$(CONFIG_SOC_VF610) += \
@@ -559,6 +578,7 @@ dtb-$(CONFIG_ARCH_MXS) += \
         imx28-m28cu3.dtb \
         imx28-m28evk.dtb \
         imx28-sps1.dtb \
+        imx28-ts4600.dtb \
         imx28-tx28.dtb
 dtb-$(CONFIG_ARCH_NOMADIK) += \
         ste-nomadik-s8815.dtb \
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 09ce8b81fafa..c43cf704b768 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -628,11 +628,13 @@
                 usbphy0: usb-phy@0 {
                         reg = <0>;
                         compatible = "usb-nop-xceiv";
+                        #phy-cells = <0>;
                 };
 
                 usbphy1: usb-phy@1 {
                         reg = <1>;
                         compatible = "usb-nop-xceiv";
+                        #phy-cells = <0>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx27-pdk.dts b/arch/arm/boot/dts/imx27-pdk.dts
index 96f442ba6d22..2a140c8ae6d2 100644
--- a/arch/arm/boot/dts/imx27-pdk.dts
+++ b/arch/arm/boot/dts/imx27-pdk.dts
@@ -30,6 +30,7 @@
                         reg = <0>;
                         clocks = <&clks IMX27_CLK_DUMMY>;
                         clock-names = "main_clk";
+                        #phy-cells = <0>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index 2a9198f99a8d..2ed2d73b087e 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -63,6 +63,7 @@
                         vcc-supply = <&reg_5v0>;
                         clocks = <&clks IMX27_CLK_DUMMY>;
                         clock-names = "main_clk";
+                        #phy-cells = <0>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
index c973c5d91875..c9095b7654c6 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@@ -53,6 +53,7 @@
                         vcc-supply = <&sw3_reg>;
                         clocks = <&clks IMX27_CLK_DUMMY>;
                         clock-names = "main_clk";
+                        #phy-cells = <0>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx28-ts4600.dts b/arch/arm/boot/dts/imx28-ts4600.dts
new file mode 100644
index 000000000000..1e391c9f1b7a
--- /dev/null
+++ b/arch/arm/boot/dts/imx28-ts4600.dts
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2016 Savoir-Faire Linux
+ * Author: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.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 "imx28.dtsi"
+#include "dt-bindings/gpio/gpio.h"
+
+/ {
+
+        model = "Technologic Systems i.MX28 TS-4600";
+        compatible = "technologic,imx28-ts4600", "fsl,imx28";
+
+        memory {
+                reg = <0x40000000 0x10000000>;   /* 256MB */
+        };
+
+        apb@80000000 {
+                apbh@80000000 {
+                        ssp0: ssp@80010000 {
+                                compatible = "fsl,imx28-mmc";
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&mmc0_4bit_pins_a
+                                             &mmc0_sck_cfg
+                                             &en_sd_pwr>;
+                                broken-cd = <1>;
+                                bus-width = <4>;
+                                vmmc-supply = <&reg_vddio_sd0>;
+                                status = "okay";
+                        };
+
+                        pinctrl@80018000 {
+
+                                en_sd_pwr: en-sd-pwr@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                MX28_PAD_PWM3__GPIO_3_28
+                                        >;
+                                        fsl,drive-strength = <MXS_DRIVE_4mA>;
+                                        fsl,voltage = <MXS_VOLTAGE_HIGH>;
+                                        fsl,pull-up = <MXS_PULL_DISABLE>;
+                                };
+
+                        };
+                };
+
+                apbx@80040000 {
+                        pwm: pwm@80064000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pwm2_pins_a>;
+                                status = "okay";
+                        };
+
+                        duart: serial@80074000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&duart_pins_a>;
+                                status = "okay";
+                        };
+                };
+        };
+
+        reg_vddio_sd0: regulator-vddio-sd0 {
+                compatible = "regulator-fixed";
+                regulator-name = "vddio-sd0";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-boot-on;
+                gpio = <&gpio3 28 GPIO_ACTIVE_LOW>;
+        };
+
+};
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 6d5e6a60bee7..f049c692c6b0 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -402,11 +402,13 @@
                 usbphy0: usb-phy@0 {
                         reg = <0>;
                         compatible = "usb-nop-xceiv";
+                        #phy-cells = <0>;
                 };
 
                 usbphy1: usb-phy@1 {
                         reg = <1>;
                         compatible = "usb-nop-xceiv";
+                        #phy-cells = <0>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 2a694c5cc8ae..4ac5ab614a7f 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -25,18 +25,41 @@
                 reg = <0x90000000 0x20000000>;
         };
 
-        clocks {
-                ckih1 {
-                        clock-frequency = <22579200>;
-                };
+        ckih1 {
+                clock-frequency = <22579200>;
+        };
 
-                clk_26M: codec_clock {
-                        compatible = "fixed-clock";
-                        reg=<0>;
-                        #clock-cells = <0>;
-                        clock-frequency = <26000000>;
-                        gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
-                };
+        clk_osc: clk-osc {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <26000000>;
+        };
+
+        clk_osc_gate: clk-osc-gate {
+                compatible = "gpio-gate-clock";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_clk26mhz_osc>;
+                clocks = <&clk_osc>;
+                #clock-cells = <0>;
+                enable-gpios = <&gpio3 1 GPIO_ACTIVE_HIGH>;
+        };
+
+        clk_audio: clk-audio {
+                compatible = "gpio-gate-clock";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_clk26mhz_audio>;
+                clocks = <&clk_osc_gate>;
+                #clock-cells = <0>;
+                enable-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
+        };
+
+        clk_usb: clk-usb {
+                compatible = "gpio-gate-clock";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_clk26mhz_usb>;
+                clocks = <&clk_osc_gate>;
+                #clock-cells = <0>;
+                enable-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
         };
 
         display1: disp1 {
@@ -162,9 +185,11 @@
                 usbh1phy: usbh1phy@0 {
                         compatible = "usb-nop-xceiv";
                         reg = <0>;
-                        clocks = <&clks IMX5_CLK_DUMMY>;
+                        clocks = <&clk_usb>;
                         clock-names = "main_clk";
                         reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
+                        vcc-supply = <&vusb_reg>;
+                        #phy-cells = <0>;
                 };
         };
 };
@@ -240,6 +265,10 @@
                                 regulator-max-microvolt = <3150000>;
                         };
 
+                        vusb_reg: vusb {
+                                regulator-boot-on;
+                        };
+
                         vusb2_reg: vusb2 {
                                 regulator-min-microvolt = <2400000>;
                                 regulator-max-microvolt = <2775000>;
@@ -339,10 +368,8 @@
 
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
-                pinctrl-names = "default";
-                pinctrl-0 = <&pinctrl_clkcodec>;
                 reg = <0x0a>;
-                clocks = <&clk_26M>;
+                clocks = <&clk_audio>;
                 VDDA-supply = <&vdig_reg>;
                 VDDIO-supply = <&vvideo_reg>;
         };
@@ -413,6 +440,10 @@
         status = "okay";
 };
 
+&usbphy0 {
+        vcc-supply = <&vusb_reg>;
+};
+
 &usbotg {
         dr_mode = "otg";
         disable-over-current;
@@ -431,9 +462,21 @@
                         >;
                 };
 
-                pinctrl_clkcodec: clkcodecgrp {
+                pinctrl_clk26mhz_audio: clk26mhzaudiocgrp {
+                        fsl,pins = <
+                                MX51_PAD_CSPI1_RDY__GPIO4_26            0x85
+                        >;
+                };
+
+                pinctrl_clk26mhz_osc: clk26mhzoscgrp {
+                        fsl,pins = <
+                                MX51_PAD_DI1_PIN12__GPIO3_1             0x85
+                        >;
+                };
+
+                pinctrl_clk26mhz_usb: clk26mhzusbgrp {
                         fsl,pins = <
-                                MX51_PAD_CSPI1_RDY__GPIO4_26            0x80000000
+                                MX51_PAD_EIM_D17__GPIO2_1               0x85
                         >;
                 };
 
diff --git a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
index 1305b05c7ed9..b3d952f37cdc 100644
--- a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
+++ b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
@@ -94,6 +94,7 @@
                         clocks = <&clks IMX5_CLK_USB_PHY_GATE>;
                         clock-names = "main_clk";
                         clock-frequency = <19200000>;
+                        #phy-cells = <0>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts
index 564233e97412..f59b02bae68d 100644
--- a/arch/arm/boot/dts/imx51-ts4800.dts
+++ b/arch/arm/boot/dts/imx51-ts4800.dts
@@ -149,18 +149,18 @@
                 #size-cells = <1>;
                 ranges = <0 0 0 0x1d000>;
 
-                syscon: syscon@b0010000 {
+                syscon: syscon@10000 {
                         compatible = "syscon", "simple-mfd";
                         reg = <0x10000 0x3d>;
                         reg-io-width = <2>;
 
-                        wdt@e {
+                        wdt {
                                 compatible = "technologic,ts4800-wdt";
                                 syscon = <&syscon 0xe>;
                         };
                 };
 
-                touchscreen {
+                touchscreen@12000 {
                         compatible = "technologic,ts4800-ts";
                         reg = <0x12000 0x1000>;
                         syscon = <&syscon 0x10 6>;
diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index 49be0e1c812d..5306b78de0ca 100644
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -242,7 +242,7 @@
 
         sound {
                 compatible = "simple-audio-card";
-                simple-audio-card,name = "RDU1 audio";
+                simple-audio-card,name = "Front";
                 simple-audio-card,format = "i2s";
                 simple-audio-card,bitclock-master = <&sound_codec>;
                 simple-audio-card,frame-master = <&sound_codec>;
@@ -251,7 +251,7 @@
                 simple-audio-card,routing =
                         "Headphone Jack", "HPLEFT",
                         "Headphone Jack", "HPRIGHT";
-                simple-audio-card,aux-devs = <&tpa6130a2>;
+                simple-audio-card,aux-devs = <&hpa1>;
 
                 sound_cpu: simple-audio-card,cpu {
                         sound-dai = <&ssi2>;
@@ -271,6 +271,7 @@
                 clock-names = "main_clk";
                 reset-gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;
                 vcc-supply = <&vusb_reg>;
+                #phy-cells = <0>;
         };
 
         usbh2phy: usbphy2 {
@@ -281,6 +282,7 @@
                 clock-names = "main_clk";
                 reset-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;
                 vcc-supply = <&vusb_reg>;
+                #phy-cells = <0>;
         };
 };
 
@@ -428,13 +430,13 @@
                         #size-cells = <0>;
                         led-control = <0x0 0x0 0x3f83f8 0x0>;
 
-                        sysled0 {
+                        sysled0@3 {
                                 reg = <3>;
                                 label = "system:green:status";
                                 linux,default-trigger = "default-on";
                         };
 
-                        sysled1 {
+                        sysled1@4 {
                                 reg = <4>;
                                 label = "system:green:act";
                                 linux,default-trigger = "heartbeat";
@@ -479,7 +481,7 @@
                 reg = <0x50>;
         };
 
-        tpa6130a2: amp@60 {
+        hpa1: amp@60 {
                 compatible = "ti,tpa6130a2";
                 reg = <0x60>;
                 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 378be720b3c7..00d30bd70068 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -113,6 +113,7 @@
                         reg = <0>;
                         clocks = <&clks IMX5_CLK_USB_PHY_GATE>;
                         clock-names = "main_clk";
+                        #phy-cells = <0>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/imx53-cx9020.dts b/arch/arm/boot/dts/imx53-cx9020.dts
index 4f54fd4418a3..5e67e43004e7 100644
--- a/arch/arm/boot/dts/imx53-cx9020.dts
+++ b/arch/arm/boot/dts/imx53-cx9020.dts
@@ -152,7 +152,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_fec>;
         phy-mode = "rmii";
-        phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_HIGH>;
+        phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi
index ec390aa562c3..7ce69c63510c 100644
--- a/arch/arm/boot/dts/imx53-m53.dtsi
+++ b/arch/arm/boot/dts/imx53-m53.dtsi
@@ -64,7 +64,6 @@
 
                 stmpe_touchscreen {
                         compatible = "st,stmpe-ts";
-                        reg = <0>;
                         st,sample-time = <4>;
                         st,mod-12b = <1>;
                         st,ref-sel = <0>;
diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts
index 7eb53e48c2f4..fe15c9555d6e 100644
--- a/arch/arm/boot/dts/imx53-tx53-x03x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts
@@ -53,132 +53,130 @@
                 display = &display;
         };
 
-        soc {
-                display: disp0 {
-                        compatible = "fsl,imx-parallel-display";
-                        interface-pix-fmt = "rgb24";
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_rgb24_vga1>;
-                        status = "okay";
+        display: disp0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_rgb24_vga1>;
+                status = "okay";
 
-                        port {
-                                display0_in: endpoint {
-                                        remote-endpoint = <&ipu_di0_disp0>;
-                                };
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu_di0_disp0>;
                         };
+                };
 
-                        display-timings {
-                                VGA {
-                                        clock-frequency = <25200000>;
-                                        hactive = <640>;
-                                        vactive = <480>;
-                                        hback-porch = <48>;
-                                        hsync-len = <96>;
-                                        hfront-porch = <16>;
-                                        vback-porch = <31>;
-                                        vsync-len = <2>;
-                                        vfront-porch = <12>;
-                                        hsync-active = <0>;
-                                        vsync-active = <0>;
-                                        de-active = <1>;
-                                        pixelclk-active = <0>;
-                                };
+                display-timings {
+                        VGA {
+                                clock-frequency = <25200000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <48>;
+                                hsync-len = <96>;
+                                hfront-porch = <16>;
+                                vback-porch = <31>;
+                                vsync-len = <2>;
+                                vfront-porch = <12>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
 
-                                ETV570 {
-                                        clock-frequency = <25200000>;
-                                        hactive = <640>;
-                                        vactive = <480>;
-                                        hback-porch = <114>;
-                                        hsync-len = <30>;
-                                        hfront-porch = <16>;
-                                        vback-porch = <32>;
-                                        vsync-len = <3>;
-                                        vfront-porch = <10>;
-                                        hsync-active = <0>;
-                                        vsync-active = <0>;
-                                        de-active = <1>;
-                                        pixelclk-active = <0>;
-                                };
+                        ETV570 {
+                                clock-frequency = <25200000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <114>;
+                                hsync-len = <30>;
+                                hfront-porch = <16>;
+                                vback-porch = <32>;
+                                vsync-len = <3>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
 
-                                ET0350 {
-                                        clock-frequency = <6413760>;
-                                        hactive = <320>;
-                                        vactive = <240>;
-                                        hback-porch = <34>;
-                                        hsync-len = <34>;
-                                        hfront-porch = <20>;
-                                        vback-porch = <15>;
-                                        vsync-len = <3>;
-                                        vfront-porch = <4>;
-                                        hsync-active = <0>;
-                                        vsync-active = <0>;
-                                        de-active = <1>;
-                                        pixelclk-active = <0>;
-                                };
+                        ET0350 {
+                                clock-frequency = <6413760>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <34>;
+                                hsync-len = <34>;
+                                hfront-porch = <20>;
+                                vback-porch = <15>;
+                                vsync-len = <3>;
+                                vfront-porch = <4>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
 
-                                ET0430 {
-                                        clock-frequency = <9009000>;
-                                        hactive = <480>;
-                                        vactive = <272>;
-                                        hback-porch = <2>;
-                                        hsync-len = <41>;
-                                        hfront-porch = <2>;
-                                        vback-porch = <2>;
-                                        vsync-len = <10>;
-                                        vfront-porch = <2>;
-                                        hsync-active = <0>;
-                                        vsync-active = <0>;
-                                        de-active = <1>;
-                                        pixelclk-active = <1>;
-                                };
+                        ET0430 {
+                                clock-frequency = <9009000>;
+                                hactive = <480>;
+                                vactive = <272>;
+                                hback-porch = <2>;
+                                hsync-len = <41>;
+                                hfront-porch = <2>;
+                                vback-porch = <2>;
+                                vsync-len = <10>;
+                                vfront-porch = <2>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
 
-                                ET0500 {
-                                        clock-frequency = <33264000>;
-                                        hactive = <800>;
-                                        vactive = <480>;
-                                        hback-porch = <88>;
-                                        hsync-len = <128>;
-                                        hfront-porch = <40>;
-                                        vback-porch = <33>;
-                                        vsync-len = <2>;
-                                        vfront-porch = <10>;
-                                        hsync-active = <0>;
-                                        vsync-active = <0>;
-                                        de-active = <1>;
-                                        pixelclk-active = <0>;
-                                };
+                        ET0500 {
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
 
-                                ET0700 { /* same as ET0500 */
-                                        clock-frequency = <33264000>;
-                                        hactive = <800>;
-                                        vactive = <480>;
-                                        hback-porch = <88>;
-                                        hsync-len = <128>;
-                                        hfront-porch = <40>;
-                                        vback-porch = <33>;
-                                        vsync-len = <2>;
-                                        vfront-porch = <10>;
-                                        hsync-active = <0>;
-                                        vsync-active = <0>;
-                                        de-active = <1>;
-                                        pixelclk-active = <0>;
-                                };
+                        ET0700 { /* same as ET0500 */
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
 
-                                ETQ570 {
-                                        clock-frequency = <6596040>;
-                                        hactive = <320>;
-                                        vactive = <240>;
-                                        hback-porch = <38>;
-                                        hsync-len = <30>;
-                                        hfront-porch = <30>;
-                                        vback-porch = <16>;
-                                        vsync-len = <3>;
-                                        vfront-porch = <4>;
-                                        hsync-active = <0>;
-                                        vsync-active = <0>;
-                                        de-active = <1>;
-                                        pixelclk-active = <0>;
-                                };
+                        ETQ570 {
+                                clock-frequency = <6596040>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <38>;
+                                hsync-len = <30>;
+                                hfront-porch = <30>;
+                                vback-porch = <16>;
+                                vsync-len = <3>;
+                                vfront-porch = <4>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
                         };
                 };
         };
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index 71b58b6933e1..a22e461fc168 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -225,10 +225,16 @@
         mac-address = [000000000000]; /* placeholder; will be overwritten by bootloader */
         status = "okay";
 
-        phy0: ethernet-phy@0 {
-                interrupt-parent = <&gpio2>;
-                interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
-                device_type = "ethernet-phy";
+        mdio {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                phy0: ethernet-phy@0 {
+                        reg = <0>;
+                        interrupt-parent = <&gpio2>;
+                        interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+                        device_type = "ethernet-phy";
+                };
         };
 };
 
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 84f17f7abb71..38b31a37339b 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -116,6 +116,28 @@
                 };
         };
 
+        pmu {
+                compatible = "arm,cortex-a8-pmu";
+                interrupt-parent = <&tzic>;
+                interrupts = <77>;
+        };
+
+        usbphy0: usbphy-0 {
+                compatible = "usb-nop-xceiv";
+                clocks = <&clks IMX5_CLK_USB_PHY1_GATE>;
+                clock-names = "main_clk";
+                #phy-cells = <0>;
+                status = "okay";
+        };
+
+        usbphy1: usbphy-1 {
+                compatible = "usb-nop-xceiv";
+                clocks = <&clks IMX5_CLK_USB_PHY2_GATE>;
+                clock-names = "main_clk";
+                #phy-cells = <0>;
+                status = "okay";
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -299,20 +321,6 @@
                                 reg = <0x53f00000 0x60>;
                         };
 
-                        usbphy0: usbphy-0 {
-                                compatible = "usb-nop-xceiv";
-                                clocks = <&clks IMX5_CLK_USB_PHY1_GATE>;
-                                clock-names = "main_clk";
-                                status = "okay";
-                        };
-
-                        usbphy1: usbphy-1 {
-                                compatible = "usb-nop-xceiv";
-                                clocks = <&clks IMX5_CLK_USB_PHY2_GATE>;
-                                clock-names = "main_clk";
-                                status = "okay";
-                        };
-
                         usbotg: usb@53f80000 {
                                 compatible = "fsl,imx53-usb", "fsl,imx27-usb";
                                 reg = <0x53f80000 0x0200>;
@@ -433,6 +441,13 @@
                                 clock-names = "ipg", "per";
                         };
 
+                        srtc: rtc@53fa4000 {
+                                compatible = "fsl,imx53-rtc";
+                                reg = <0x53fa4000 0x4000>;
+                                interrupts = <24>;
+                                clocks = <&clks IMX5_CLK_SRTC_GATE>;
+                        };
+
                         iomuxc: iomuxc@53fa8000 {
                                 compatible = "fsl,imx53-iomuxc";
                                 reg = <0x53fa8000 0x4000>;
@@ -813,10 +828,5 @@
                         reg = <0xf8000000 0x20000>;
                         clocks = <&clks IMX5_CLK_OCRAM>;
                 };
-
-                pmu {
-                        compatible = "arm,cortex-a8-pmu";
-                        interrupts = <77>;
-                };
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
index cc418cecabdb..3c9f4af9e9ff 100644
--- a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
@@ -31,35 +31,33 @@
                 reg = <0x10000000 0x40000000>;
         };
 
-        soc {
-                display0: disp0 {
-                        compatible = "fsl,imx-parallel-display";
-                        interface-pix-fmt = "rgb24";
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_ipu_disp>;
-                        status = "okay";
+        display0: disp0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_ipu_disp>;
+                status = "okay";
 
-                        display-timings {
-                                480x800p60 {
-                                        native-mode;
-                                        clock-frequency = <30000000>;
-                                        hactive = <480>;
-                                        vactive = <800>;
-                                        hfront-porch = <59>;
-                                        hback-porch = <10>;
-                                        hsync-len = <10>;
-                                        vback-porch = <15>;
-                                        vfront-porch = <15>;
-                                        vsync-len = <15>;
-                                        hsync-active = <1>;
-                                        vsync-active = <1>;
-                                };
+                display-timings {
+                        480x800p60 {
+                                native-mode;
+                                clock-frequency = <30000000>;
+                                hactive = <480>;
+                                vactive = <800>;
+                                hfront-porch = <59>;
+                                hback-porch = <10>;
+                                hsync-len = <10>;
+                                vback-porch = <15>;
+                                vfront-porch = <15>;
+                                vsync-len = <15>;
+                                hsync-active = <1>;
+                                vsync-active = <1>;
                         };
+                };
 
-                        port {
-                                display0_in: endpoint {
-                                        remote-endpoint = <&ipu1_di0_disp0>;
-                                };
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu1_di0_disp0>;
                         };
                 };
         };
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
index 126ff964eded..96cd835ccbf6 100644
--- a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
@@ -20,34 +20,32 @@
                 reg = <0x10000000 0x40000000>;
         };
 
-        soc {
-                display0: disp0 {
-                        compatible = "fsl,imx-parallel-display";
-                        interface-pix-fmt = "rgb24";
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_ipu_disp>;
-                        status = "okay";
+        display0: disp0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_ipu_disp>;
+                status = "okay";
 
-                        display-timings {
-                                800x480p60 {
-                                        native-mode;
-                                        clock-frequency = <33246000>;
-                                        hactive = <800>;
-                                        vactive = <480>;
-                                        hfront-porch = <88>;
-                                        hback-porch = <88>;
-                                        hsync-len = <80>;
-                                        vback-porch = <10>;
-                                        vfront-porch = <10>;
-                                        vsync-len = <25>;
-                                        vsync-active = <1>;
-                                };
+                display-timings {
+                        800x480p60 {
+                                native-mode;
+                                clock-frequency = <33246000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hfront-porch = <88>;
+                                hback-porch = <88>;
+                                hsync-len = <80>;
+                                vback-porch = <10>;
+                                vfront-porch = <10>;
+                                vsync-len = <25>;
+                                vsync-active = <1>;
                         };
+                };
 
-                        port {
-                                display0_in: endpoint {
-                                        remote-endpoint = <&ipu1_di0_disp0>;
-                                };
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu1_di0_disp0>;
                         };
                 };
         };
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 5705ebee0595..dcf9206f3e0d 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -163,7 +163,7 @@
 
         /* M41T0M6 real time clock on carrier board */
         rtc_i2c: rtc@68 {
-                compatible = "st,m41t00";
+                compatible = "st,m41t0";
                 reg = <0x68>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts b/arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts
new file mode 100644
index 000000000000..2b2fc360b865
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-sr-som-emmc.dtsi"
+#include "imx6qdl-cubox-i.dtsi"
+
+/ {
+        model = "SolidRun Cubox-i Solo/DualLite (1.5som+emmc)";
+        compatible = "solidrun,cubox-i/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts b/arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts
new file mode 100644
index 000000000000..e09c565d1d1f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2014 Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-cubox-i.dtsi"
+
+/ {
+        model = "SolidRun Cubox-i Solo/DualLite (1.5som)";
+        compatible = "solidrun,cubox-i/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6dl-cubox-i.dts b/arch/arm/boot/dts/imx6dl-cubox-i.dts
index f10a36b8647d..2b1b3e193f53 100644
--- a/arch/arm/boot/dts/imx6dl-cubox-i.dts
+++ b/arch/arm/boot/dts/imx6dl-cubox-i.dts
@@ -41,6 +41,8 @@
 /dts-v1/;
 
 #include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 #include "imx6qdl-cubox-i.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard-emmc-som-v15.dts b/arch/arm/boot/dts/imx6dl-hummingboard-emmc-som-v15.dts
new file mode 100644
index 000000000000..a63f742f20d9
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-hummingboard-emmc-som-v15.dts
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2014 Rabeeh Khoury (rabeeh@solid-run.com)
+ * Based on dt work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-sr-som-emmc.dtsi"
+#include "imx6qdl-hummingboard.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard Solo/DualLite (1.5som+emmc)";
+        compatible = "solidrun,hummingboard/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard-som-v15.dts b/arch/arm/boot/dts/imx6dl-hummingboard-som-v15.dts
new file mode 100644
index 000000000000..66a06cf3cdf3
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-hummingboard-som-v15.dts
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 Rabeeh Khoury (rabeeh@solid-run.com)
+ * Based on dt work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-hummingboard.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard Solo/DualLite (1.5som)";
+        compatible = "solidrun,hummingboard/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
index 39c2602fa87c..cbd02eb486e1 100644
--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
@@ -42,6 +42,8 @@
 /dts-v1/;
 
 #include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 #include "imx6qdl-hummingboard.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2-emmc-som-v15.dts b/arch/arm/boot/dts/imx6dl-hummingboard2-emmc-som-v15.dts
new file mode 100644
index 000000000000..80313c13bcdb
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-hummingboard2-emmc-som-v15.dts
@@ -0,0 +1,55 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ * Based on work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License.
+ *
+ *     This file is distributed in the hope that it will be useful
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-emmc.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-hummingboard2.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard2 Solo/DualLite (1.5som+emmc)";
+        compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2-som-v15.dts b/arch/arm/boot/dts/imx6dl-hummingboard2-som-v15.dts
new file mode 100644
index 000000000000..e61ef1156f8b
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-hummingboard2-som-v15.dts
@@ -0,0 +1,54 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ * Based on work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License.
+ *
+ *     This file is distributed in the hope that it will be useful
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-hummingboard2.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard2 Solo/DualLite (1.5som)";
+        compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6dl-hummingboard2.dts b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
new file mode 100644
index 000000000000..b12cd87f3f94
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-hummingboard2.dts
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ * Based on dt work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
+#include "imx6qdl-hummingboard2.dtsi"
+#include "imx6qdl-hummingboard2-emmc.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard2 Solo/DualLite";
+        compatible = "solidrun,hummingboard2/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6dl-pinfunc.h b/arch/arm/boot/dts/imx6dl-pinfunc.h
index 0ead323fdbd2..37e430a261de 100644
--- a/arch/arm/boot/dts/imx6dl-pinfunc.h
+++ b/arch/arm/boot/dts/imx6dl-pinfunc.h
@@ -668,6 +668,7 @@
 #define MX6QDL_PAD_ENET_RX_ER__SPDIF_IN             0x1f4 0x5c4 0x8f0 0x3 0x1
 #define MX6QDL_PAD_ENET_RX_ER__ENET_1588_EVENT2_OUT 0x1f4 0x5c4 0x000 0x4 0x0
 #define MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24           0x1f4 0x5c4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_RXD0__OSC32K_32K_OUT        0x1f8 0x5c8 0x000 0x0 0x0
 #define MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0         0x1f8 0x5c8 0x818 0x1 0x0
 #define MX6QDL_PAD_ENET_RXD0__ESAI_TX_HF_CLK        0x1f8 0x5c8 0x838 0x2 0x0
 #define MX6QDL_PAD_ENET_RXD0__SPDIF_OUT             0x1f8 0x5c8 0x000 0x3 0x0
diff --git a/arch/arm/boot/dts/imx6dl-ts7970.dts b/arch/arm/boot/dts/imx6dl-ts7970.dts
new file mode 100644
index 000000000000..d104daf305d9
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-ts7970.dts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Technologic Systems
+ * Copyright 2017 Savoir-faire Linux
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-ts7970.dtsi"
+
+/ {
+        model = "Technologic Systems i.MX6 Solo/DualLite TS-7970 (Default Device Tree)";
+        compatible = "technologic,imx6dl-ts7970", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 4d693a75ce98..c01674fa098a 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -170,7 +170,7 @@
 };
 
 &gpr {
-        ipu1_csi0_mux: ipu1_csi0_mux@34 {
+        ipu1_csi0_mux {
                 compatible = "video-mux";
                 mux-controls = <&mux 0>;
                 #address-cells = <1>;
@@ -224,7 +224,7 @@
                 };
         };
 
-        ipu1_csi1_mux: ipu1_csi1_mux@34 {
+        ipu1_csi1_mux {
                 compatible = "video-mux";
                 mux-controls = <&mux 1>;
                 #address-cells = <1>;
@@ -309,10 +309,12 @@
                 #size-cells = <0>;
 
                 mipi_vc0_to_ipu1_csi0_mux: endpoint@0 {
+                        reg = <0>;
                         remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>;
                 };
 
                 mipi_vc0_to_ipu1_csi1_mux: endpoint@1 {
+                        reg = <1>;
                         remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc0>;
                 };
         };
@@ -323,10 +325,12 @@
                 #size-cells = <0>;
 
                 mipi_vc1_to_ipu1_csi0_mux: endpoint@0 {
+                        reg = <0>;
                         remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc1>;
                 };
 
                 mipi_vc1_to_ipu1_csi1_mux: endpoint@1 {
+                        reg = <1>;
                         remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc1>;
                 };
         };
@@ -337,10 +341,12 @@
                 #size-cells = <0>;
 
                 mipi_vc2_to_ipu1_csi0_mux: endpoint@0 {
+                        reg = <0>;
                         remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc2>;
                 };
 
                 mipi_vc2_to_ipu1_csi1_mux: endpoint@1 {
+                        reg = <1>;
                         remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc2>;
                 };
         };
@@ -351,10 +357,12 @@
                 #size-cells = <0>;
 
                 mipi_vc3_to_ipu1_csi0_mux: endpoint@0 {
+                        reg = <0>;
                         remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc3>;
                 };
 
                 mipi_vc3_to_ipu1_csi1_mux: endpoint@1 {
+                        reg = <1>;
                         remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc3>;
                 };
         };
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 8b56656e53da..aa0e631f3c0a 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -158,7 +158,7 @@
 
         /* M41T0M6 real time clock on carrier board */
         rtc_i2c: rtc@68 {
-                compatible = "st,m41t00";
+                compatible = "st,m41t0";
                 reg = <0x68>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
index 27dc0fc686a9..e8dccf552122 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
@@ -170,7 +170,7 @@
 
         /* M41T0M6 real time clock on carrier board */
         rtc_i2c: rtc@68 {
-                compatible = "st,m41t00";
+                compatible = "st,m41t0";
                 reg = <0x68>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 40b2c67fe7af..6831dfd24cc1 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -174,7 +174,7 @@
 
         /* M41T0M6 real time clock on carrier board */
         rtc_i2c: rtc@68 {
-                compatible = "st,m41t00";
+                compatible = "st,m41t0";
                 reg = <0x68>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts b/arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts
new file mode 100644
index 000000000000..3e59ebbb3608
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-sr-som-emmc.dtsi"
+#include "imx6qdl-cubox-i.dtsi"
+
+/ {
+        model = "SolidRun Cubox-i Dual/Quad (1.5som+emmc)";
+        compatible = "solidrun,cubox-i/q", "fsl,imx6q";
+};
+
+&sata {
+        status = "okay";
+        fsl,transmit-level-mV = <1104>;
+        fsl,transmit-boost-mdB = <0>;
+        fsl,transmit-atten-16ths = <9>;
+        fsl,no-spread-spectrum;
+};
diff --git a/arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts b/arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts
new file mode 100644
index 000000000000..dab70d1230a2
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2014 Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-cubox-i.dtsi"
+
+/ {
+        model = "SolidRun Cubox-i Dual/Quad (1.5som)";
+        compatible = "solidrun,cubox-i/q", "fsl,imx6q";
+};
+
+&sata {
+        status = "okay";
+        fsl,transmit-level-mV = <1104>;
+        fsl,transmit-boost-mdB = <0>;
+        fsl,transmit-atten-16ths = <9>;
+        fsl,no-spread-spectrum;
+};
diff --git a/arch/arm/boot/dts/imx6q-cubox-i.dts b/arch/arm/boot/dts/imx6q-cubox-i.dts
index b68aa0e57f20..1c7b262e3709 100644
--- a/arch/arm/boot/dts/imx6q-cubox-i.dts
+++ b/arch/arm/boot/dts/imx6q-cubox-i.dts
@@ -41,6 +41,8 @@
 /dts-v1/;
 
 #include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 #include "imx6qdl-cubox-i.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/imx6q-display5.dtsi b/arch/arm/boot/dts/imx6q-display5.dtsi
index 4084de43d4d9..09085fde3341 100644
--- a/arch/arm/boot/dts/imx6q-display5.dtsi
+++ b/arch/arm/boot/dts/imx6q-display5.dtsi
@@ -255,7 +255,7 @@
         pinctrl-0 = <&pinctrl_i2c1>;
         status = "okay";
 
-        codec: tfa9879@6C {
+        codec: tfa9879@6c {
                 #sound-dai-cells = <0>;
                 compatible = "nxp,tfa9879";
                 reg = <0x6C>;
diff --git a/arch/arm/boot/dts/imx6q-h100.dts b/arch/arm/boot/dts/imx6q-h100.dts
index a3269f57df2b..8a2ea6c58902 100644
--- a/arch/arm/boot/dts/imx6q-h100.dts
+++ b/arch/arm/boot/dts/imx6q-h100.dts
@@ -42,8 +42,8 @@
 /dts-v1/;
 
 #include "imx6q.dtsi"
-#include "imx6qdl-microsom.dtsi"
-#include "imx6qdl-microsom-ar8035.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 
 / {
         model = "Auvidea H100";
@@ -108,21 +108,6 @@
                 regulator-always-on;
         };
 
-        reg_nvcc_sd2: regulator-nvcc-sd2 {
-                pinctrl-names = "default";
-                pinctrl-0 = <&pinctrl_h100_reg_nvcc_sd2>;
-                compatible = "regulator-gpio";
-                regulator-name = "NVCC_SD2";
-                regulator-min-microvolt = <1800000>;
-                regulator-max-microvolt = <3300000>;
-                regulator-type = "voltage";
-                regulator-boot-on;
-                regulator-always-on;
-                gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
-                states = <1800000 0x1
-                          3300000 0x0>;
-        };
-
         reg_usbh1_vbus: regulator-usb-h1-vbus {
                 compatible = "regulator-fixed";
                 enable-active-high;
@@ -205,7 +190,7 @@
                 reset-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>;
                 /* IRQ has a wrong pull resistor which renders it useless  */
 
-                port@0 {
+                port {
                         tc358743_out: endpoint {
                                 remote-endpoint = <&mipi_csi2_in>;
                                 data-lanes = <1 2 3 4>;
@@ -260,12 +245,6 @@
                         >;
                 };
 
-                pinctrl_h100_reg_nvcc_sd2: h100-reg-nvcc-sd2 {
-                        fsl,pins = <
-                                MX6QDL_PAD_KEY_ROW1__GPIO4_IO09         0x1b0b0
-                        >;
-                };
-
                 pinctrl_h100_sgtl5000: h100-sgtl5000 {
                         fsl,pins = <
                                 MX6QDL_PAD_DISP0_DAT19__AUD5_RXD        0x130b0
@@ -316,6 +295,7 @@
                                 MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x17059
                                 MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x17059
                                 MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x13059
+                                MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
                         >;
                 };
 
@@ -328,6 +308,7 @@
                                 MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x170b9
                                 MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x170b9
                                 MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x170b9
+                                MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
                         >;
                 };
 
@@ -340,6 +321,7 @@
                                 MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x170f9
                                 MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x170f9
                                 MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x170f9
+                                MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
                         >;
                 };
         };
@@ -348,7 +330,7 @@
 &mipi_csi {
         status = "okay";
 
-        port@0 {
+        port {
                 mipi_csi2_in: endpoint {
                         remote-endpoint = <&tc358743_out>;
                         data-lanes = <1 2 3 4>;
@@ -389,7 +371,6 @@
         pinctrl-1 = <&pinctrl_h100_usdhc2_100mhz>;
         pinctrl-2 = <&pinctrl_h100_usdhc2_200mhz>;
         vmmc-supply = <&reg_3p3v>;
-        vqmmc-supply = <&reg_nvcc_sd2>;
         cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6q-hummingboard-emmc-som-v15.dts b/arch/arm/boot/dts/imx6q-hummingboard-emmc-som-v15.dts
new file mode 100644
index 000000000000..c51b4e4fd71e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-hummingboard-emmc-som-v15.dts
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2014 Rabeeh Khoury (rabeeh@solid-run.com)
+ * Based on dt work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-sr-som-emmc.dtsi"
+#include "imx6qdl-hummingboard.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard Dual/Quad (1.5som+emmc)";
+        compatible = "solidrun,hummingboard/q", "fsl,imx6q";
+};
+
+&sata {
+        status = "okay";
+        fsl,transmit-level-mV = <1025>;
+        fsl,transmit-boost-mdB = <3330>;
+        fsl,transmit-atten-16ths = <9>;
+        fsl,receive-eq-mdB = <3000>;
+};
diff --git a/arch/arm/boot/dts/imx6q-hummingboard-som-v15.dts b/arch/arm/boot/dts/imx6q-hummingboard-som-v15.dts
new file mode 100644
index 000000000000..e4132d62ffa2
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-hummingboard-som-v15.dts
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Rabeeh Khoury (rabeeh@solid-run.com)
+ * Based on dt work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-hummingboard.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard Dual/Quad (1.5som)";
+        compatible = "solidrun,hummingboard/q", "fsl,imx6q";
+};
+
+&sata {
+        status = "okay";
+        fsl,transmit-level-mV = <1025>;
+        fsl,transmit-boost-mdB = <3330>;
+        fsl,transmit-atten-16ths = <9>;
+        fsl,receive-eq-mdB = <3000>;
+};
diff --git a/arch/arm/boot/dts/imx6q-hummingboard.dts b/arch/arm/boot/dts/imx6q-hummingboard.dts
index 69a7a0a1cb21..8c9e94e648a7 100644
--- a/arch/arm/boot/dts/imx6q-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6q-hummingboard.dts
@@ -42,6 +42,8 @@
 /dts-v1/;
 
 #include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
 #include "imx6qdl-hummingboard.dtsi"
 
 / {
diff --git a/arch/arm/boot/dts/imx6q-hummingboard2-emmc-som-v15.dts b/arch/arm/boot/dts/imx6q-hummingboard2-emmc-som-v15.dts
new file mode 100644
index 000000000000..1998ebfa0fe0
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-hummingboard2-emmc-som-v15.dts
@@ -0,0 +1,63 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ * Based on work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License.
+ *
+ *     This file is distributed in the hope that it will be useful
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-emmc.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-hummingboard2.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard2 Dual/Quad (1.5som+emmc)";
+        compatible = "solidrun,hummingboard2/q", "fsl,imx6q";
+};
+
+&sata {
+        status = "okay";
+        fsl,transmit-level-mV = <1104>;
+        fsl,transmit-boost-mdB = <0>;
+        fsl,transmit-atten-16ths = <9>;
+        fsl,no-spread-spectrum;
+};
diff --git a/arch/arm/boot/dts/imx6q-hummingboard2-som-v15.dts b/arch/arm/boot/dts/imx6q-hummingboard2-som-v15.dts
new file mode 100644
index 000000000000..d3ad7329cd6d
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-hummingboard2-som-v15.dts
@@ -0,0 +1,62 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ * Based on work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License.
+ *
+ *     This file is distributed in the hope that it will be useful
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-ti.dtsi"
+#include "imx6qdl-hummingboard2.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard2 Dual/Quad (1.5som)";
+        compatible = "solidrun,hummingboard2/q", "fsl,imx6q";
+};
+
+&sata {
+        status = "okay";
+        fsl,transmit-level-mV = <1104>;
+        fsl,transmit-boost-mdB = <0>;
+        fsl,transmit-atten-16ths = <9>;
+        fsl,no-spread-spectrum;
+};
diff --git a/arch/arm/boot/dts/imx6q-hummingboard2.dts b/arch/arm/boot/dts/imx6q-hummingboard2.dts
new file mode 100644
index 000000000000..5249f53dcdbc
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-hummingboard2.dts
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ * Based on dt work by Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-sr-som.dtsi"
+#include "imx6qdl-sr-som-brcm.dtsi"
+#include "imx6qdl-hummingboard2.dtsi"
+#include "imx6qdl-hummingboard2-emmc.dtsi"
+
+/ {
+        model = "SolidRun HummingBoard2 Dual/Quad";
+        compatible = "solidrun,hummingboard2/q", "fsl,imx6q";
+};
+
+&sata {
+        status = "okay";
+        fsl,transmit-level-mV = <1104>;
+        fsl,transmit-boost-mdB = <0>;
+        fsl,transmit-atten-16ths = <9>;
+        fsl,no-spread-spectrum;
+};
diff --git a/arch/arm/boot/dts/imx6q-pinfunc.h b/arch/arm/boot/dts/imx6q-pinfunc.h
index 9fc6120a1853..cfb11d3e739c 100644
--- a/arch/arm/boot/dts/imx6q-pinfunc.h
+++ b/arch/arm/boot/dts/imx6q-pinfunc.h
@@ -551,6 +551,7 @@
 #define MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS            0x1e0 0x4f4 0x860 0x2 0x0
 #define MX6QDL_PAD_ENET_RXD1__ENET_1588_EVENT3_OUT  0x1e0 0x4f4 0x000 0x4 0x0
 #define MX6QDL_PAD_ENET_RXD1__GPIO1_IO26            0x1e0 0x4f4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_RXD0__OSC32K_32K_OUT        0x1e4 0x4f8 0x000 0x0 0x0
 #define MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0         0x1e4 0x4f8 0x848 0x1 0x1
 #define MX6QDL_PAD_ENET_RXD0__ESAI_TX_HF_CLK        0x1e4 0x4f8 0x868 0x2 0x0
 #define MX6QDL_PAD_ENET_RXD0__SPDIF_OUT             0x1e4 0x4f8 0x000 0x3 0x0
diff --git a/arch/arm/boot/dts/imx6q-ts7970.dts b/arch/arm/boot/dts/imx6q-ts7970.dts
new file mode 100644
index 000000000000..f19e18995e68
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-ts7970.dts
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 Technologic Systems
+ * Copyright 2017 Savoir-faire Linux
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-ts7970.dtsi"
+
+/ {
+        model = "Technologic Systems i.MX6 Quad TS-7970 (Default Device Tree)";
+        compatible = "technologic,imx6q-ts7970", "fsl,imx6q";
+};
+
+&sata {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q-var-dt6customboard.dts b/arch/arm/boot/dts/imx6q-var-dt6customboard.dts
new file mode 100644
index 000000000000..e0728d475f6f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-var-dt6customboard.dts
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Support for Variscite DART-MX6 Carrier-board
+ *
+ * Copyright 2017 BayLibre, SAS
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-var-dart.dtsi"
+#include <dt-bindings/input/linux-event-codes.h>
+
+/ {
+        model = "Variscite DART-MX6 Carrier-board";
+        compatible = "variscite,dt6customboard", "fsl,imx6q";
+
+        backlight_lvds: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 50000>;
+                brightness-levels = <0 4 8 16 32 64 128 248>;
+                default-brightness-level = <7>;
+                status = "okay";
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+
+                back {
+                        gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_BACK>;
+                        label = "Key Back";
+                        linux,input-type = <1>;
+                        debounce-interval = <100>;
+                        wakeup-source;
+                };
+
+                home {
+                        gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_HOME>;
+                        label = "Key Home";
+                        linux,input-type = <1>;
+                        debounce-interval = <100>;
+                        wakeup-source;
+                };
+
+                menu {
+                        gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_MENU>;
+                        label = "Key Menu";
+                        linux,input-type = <1>;
+                        debounce-interval = <100>;
+                        wakeup-source;
+                };
+        };
+
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                led1 {
+                        gpios = <&gpio4 27 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+
+                led2 {
+                        gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "default-on";
+                };
+        };
+
+        panel1: lvds-panel {
+                compatible = "sgd,gktw70sdae4se", "panel-lvds";
+                backlight = <&backlight_lvds>;
+                width-mm = <153>;
+                height-mm = <86>;
+                label = "gktw70sdae4se";
+                data-mapping = "jeida-18";
+
+                panel-timing {
+                        clock-frequency = <32000000>;
+                        hactive = <800>;
+                        vactive = <480>;
+                        hback-porch = <39>;
+                        hfront-porch = <39>;
+                        vback-porch = <29>;
+                        vfront-porch = <13>;
+                        hsync-len = <47>;
+                        vsync-len = <2>;
+                };
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&lvds1_out>;
+                        };
+                };
+        };
+
+        reg_usb_h1_vbus: regulator-usbh1vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_h1_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_usb_otg_vbus: regulator-usbotgvbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_otg_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "dt6-customboard-audio";
+                simple-audio-card,format = "i2s";
+                simple-audio-card,bitclock-master = <&sound_codec>;
+                simple-audio-card,frame-master = <&sound_codec>;
+                simple-audio-card,widgets = "Headphone", "Headphone Jack",
+                                            "Line", "Line In";
+                simple-audio-card,routing = "Headphone Jack", "HPLOUT",
+                                            "Headphone Jack", "HPROUT",
+                                            "LINE1L", "Line In",
+                                            "LINE1R", "Line In";
+
+                sound_cpu: simple-audio-card,cpu {
+                        sound-dai = <&ssi2>;
+                };
+
+                sound_codec: simple-audio-card,codec {
+                        sound-dai = <&tlv320aic3106>;
+                        clocks = <&clks IMX6QDL_CLK_CKO>;
+                };
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&ecspi1 {
+        cs-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>,
+                   <&gpio4 10 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&fec {
+        status = "okay";
+        phy-mode = "rgmii";
+        phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
+};
+
+&hdmi {
+        status = "okay";
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        status = "okay";
+};
+
+&i2c3 {
+        clock-frequency = <100000>;
+        status = "okay";
+
+        touchscreen@38 {
+                compatible = "edt,edt-ft5x06";
+                reg = <0x38>;
+                interrupt-parent = <&gpio1>;
+                interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+                touchscreen-size-x = <800>;
+                touchscreen-size-y = <480>;
+                touchscreen-inverted-x;
+                touchscreen-inverted-y;
+        };
+
+        rtc@68 {
+                compatible = "isil,isl12057";
+                reg = <0x68>;
+        };
+};
+
+&ldb {
+        status = "okay";
+
+        lvds-channel@1 {
+                status = "okay";
+
+                port@4 {
+                        reg = <4>;
+
+                        lvds1_out: endpoint {
+                                remote-endpoint = <&panel_in>;
+                        };
+                };
+        };
+};
+
+&pwm2 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&usbh1 {
+        vbus-supply = <&reg_usb_h1_vbus>;
+        status = "okay";
+};
+
+&usbotg {
+        vbus-supply = <&reg_usb_otg_vbus>;
+        dr_mode = "otg";
+        srp-disable;
+        hnp-disable;
+        adp-disable;
+        status = "okay";
+};
+
+&usdhc2 {
+        cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index e80fdca585f8..4e776e036cbc 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -338,7 +338,6 @@
 
                 stmpe_touchscreen {
                         compatible = "st,stmpe-ts";
-                        reg = <0>;
                         /* 3.25 MHz ADC clock speed */
                         st,adc-freq = <1>;
                         /* 8 sample average control */
diff --git a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
index 829a47938179..9fc1fa449f64 100644
--- a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -111,32 +111,28 @@
                 };
         };
 
-        regulators {
-                compatible = "simple-bus";
-
-                reg_3p3v: 3p3v {
-                        compatible = "regulator-fixed";
-                        regulator-name = "3P3V";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        regulator-always-on;
-                };
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "3P3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+        };
 
-                reg_usbh1_vbus: usb-h1-vbus {
-                        compatible = "regulator-fixed";
-                        regulator-name = "usb_h1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        regulator-always-on;
-                };
+        reg_usbh1_vbus: regulator-usb-h1-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_h1_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+        };
 
-                reg_usb_otg_vbus: usb-otg-vbus {
-                        compatible = "regulator-fixed";
-                        regulator-name = "usb_otg_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        regulator-always-on;
-                };
+        reg_usb_otg_vbus: regulator-usb-otg-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_otg_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
         };
 
         sound {
diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
index 7d64075204ae..ee4d0f84eeb2 100644
--- a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
@@ -12,48 +12,43 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                reg_2p5v: regulator@0 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "2P5V";
-                        regulator-min-microvolt = <2500000>;
-                        regulator-max-microvolt = <2500000>;
-                        regulator-always-on;
-                };
 
-                reg_3p3v: regulator@1 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "3P3V";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        regulator-always-on;
-                };
+        reg_2p5v: regulator-2p5v {
+                compatible = "regulator-fixed";
+                regulator-name = "2P5V";
+                regulator-min-microvolt = <2500000>;
+                regulator-max-microvolt = <2500000>;
+                regulator-always-on;
+        };
 
-                reg_usbh1_vbus: regulator@2 {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_aristainetos_usbh1_vbus>;
-                        regulator-name = "usb_h1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "3P3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+        };
 
-                reg_usbotg_vbus: regulator@3 {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_aristainetos_usbotg_vbus>;
-                        regulator-name = "usb_otg_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
+        reg_usbh1_vbus: regulator-usbh1-vbus {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_aristainetos_usbh1_vbus>;
+                regulator-name = "usb_h1_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+        };
+
+        reg_usbotg_vbus: regulator-usbotg-vbus {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_aristainetos_usbotg_vbus>;
+                regulator-name = "usb_otg_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
         };
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
index 1b1872873207..376750882ed3 100644
--- a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
@@ -52,46 +52,42 @@
                 enable-gpios = <&gpio6 31 GPIO_ACTIVE_HIGH>;
         };
 
-        regulators {
-                compatible = "simple-bus";
-
-                reg_2p5v: 2p5v {
-                        compatible = "regulator-fixed";
-                        regulator-name = "2P5V";
-                        regulator-min-microvolt = <2500000>;
-                        regulator-max-microvolt = <2500000>;
-                        regulator-always-on;
-                };
-
-                reg_3p3v: 3p3v {
-                        compatible = "regulator-fixed";
-                        regulator-name = "3P3V";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        regulator-always-on;
-                };
-
-                reg_usbh1_vbus: usb-h1-vbus {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_aristainetos2_usbh1_vbus>;
-                        regulator-name = "usb_h1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
-
-                reg_usbotg_vbus: usb-otg-vbus {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_aristainetos2_usbotg_vbus>;
-                        regulator-name = "usb_otg_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
+        reg_2p5v: regulator-2p5v {
+                compatible = "regulator-fixed";
+                regulator-name = "2P5V";
+                regulator-min-microvolt = <2500000>;
+                regulator-max-microvolt = <2500000>;
+                regulator-always-on;
+        };
+
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "3P3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+        };
+
+        reg_usbh1_vbus: regulator-usbh1-vbus {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_aristainetos2_usbh1_vbus>;
+                regulator-name = "usb_h1_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+        };
+
+        reg_usbotg_vbus: regulator-usbotg-vbus {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_aristainetos2_usbotg_vbus>;
+                regulator-name = "usb_otg_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
         };
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index fc66bbfd6796..e4eb300549d4 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -274,7 +274,6 @@
 
                 stmpe_touchscreen {
                         compatible = "st,stmpe-ts";
-                        reg = <0>;
                         /* 3.25 MHz ADC clock speed */
                         st,adc-freq = <1>;
                         /* 8 sample average control */
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 14fff4ee6516..d1cfdc264126 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -38,8 +38,6 @@
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "imx6qdl-microsom.dtsi"
-#include "imx6qdl-microsom-ar8035.dtsi"
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 
@@ -64,38 +62,36 @@
                 };
         };
 
-        regulators {
-                compatible = "simple-bus";
-
-                reg_3p3v: 3p3v {
-                        compatible = "regulator-fixed";
-                        regulator-name = "3P3V";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        regulator-always-on;
-                };
+        v_5v0: regulator-v-5v0 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_5v0";
+        };
 
-                reg_usbh1_vbus: usb-h1-vbus {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio1 0 0>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_cubox_i_usbh1_vbus>;
-                        regulator-name = "usb_h1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
+        v_usb2: regulator-v-usb2 {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_cubox_i_usbh1_vbus>;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_usb2";
+                vin-supply = <&v_5v0>;
+        };
 
-                reg_usbotg_vbus: usb-otg-vbus {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio3 22 0>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_cubox_i_usbotg_vbus>;
-                        regulator-name = "usb_otg_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
+        v_usb1: regulator-v-usb1 {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_cubox_i_usbotg_vbus>;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_usb1";
+                vin-supply = <&v_5v0>;
         };
 
         sound-spdif {
@@ -139,7 +135,7 @@
 
         status = "okay";
 
-        rtc: pcf8523@68 {
+        rtc@68 {
                 compatible = "nxp,pcf8523";
                 reg = <0x68>;
         };
@@ -243,21 +239,25 @@
 &usbh1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_cubox_i_usbh1>;
-        vbus-supply = <&reg_usbh1_vbus>;
+        vbus-supply = <&v_usb2>;
         status = "okay";
 };
 
 &usbotg {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_cubox_i_usbotg>;
-        vbus-supply = <&reg_usbotg_vbus>;
+        vbus-supply = <&v_usb1>;
         status = "okay";
 };
 
 &usdhc2 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>;
-        vmmc-supply = <&reg_3p3v>;
+        vmmc-supply = <&vcc_3v3>;
         cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
+
+&vcc_3v3 {
+        vin-supply = <&v_5v0>;
+};
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 37c07c0748aa..92583238ca4a 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -38,8 +38,6 @@
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "imx6qdl-microsom.dtsi"
-#include "imx6qdl-microsom-ar8035.dtsi"
 
 / {
         chosen {
@@ -53,38 +51,58 @@
                 pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>;
         };
 
-        regulators {
-                compatible = "simple-bus";
+        v_3v2: regulator-v-3v2 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-max-microvolt = <3300000>;
+                regulator-min-microvolt = <3300000>;
+                regulator-name = "v_3v2";
+                vin-supply = <&v_5v0>;
+        };
 
-                reg_3p3v: 3p3v {
-                        compatible = "regulator-fixed";
-                        regulator-name = "3P3V";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        regulator-always-on;
-                };
+        v_5v0: regulator-v-5v0 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_5v0";
+        };
 
-                reg_usbh1_vbus: usb-h1-vbus {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>;
-                        regulator-name = "usb_h1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
+        v_sd: regulator-v-sd {
+                compatible = "regulator-fixed";
+                gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard_vmmc>;
+                regulator-boot-on;
+                regulator-max-microvolt = <3300000>;
+                regulator-min-microvolt = <3300000>;
+                regulator-name = "v_sd";
+                startup-delay-us = <1000>;
+                vin-supply = <&v_3v2>;
+        };
 
-                reg_usbotg_vbus: usb-otg-vbus {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>;
-                        regulator-name = "usb_otg_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
+        v_usb2: regulator-v-usb2 {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_usb2";
+                vin-supply = <&v_5v0>;
+        };
+
+        v_usb1: regulator-v-usb1 {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_usb1";
+                vin-supply = <&v_5v0>;
         };
 
         sound-sgtl5000 {
@@ -132,20 +150,20 @@
         status = "okay";
 
         /* Pro baseboard model */
-        rtc: pcf8523@68 {
+        rtc@68 {
                 compatible = "nxp,pcf8523";
                 reg = <0x68>;
         };
 
         /* Pro baseboard model */
-        sgtl5000: sgtl5000@a {
+        sgtl5000: codec@a {
                 clocks = <&clks IMX6QDL_CLK_CKO>;
                 compatible = "fsl,sgtl5000";
                 pinctrl-names = "default";
                 pinctrl-0 = <&pinctrl_hummingboard_sgtl5000>;
                 reg = <0x0a>;
-                VDDA-supply = <&reg_3p3v>;
-                VDDIO-supply = <&reg_3p3v>;
+                VDDA-supply = <&v_3v2>;
+                VDDIO-supply = <&v_3v2>;
         };
 };
 
@@ -247,6 +265,11 @@
                                 MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
                         >;
                 };
+                pinctrl_hummingboard_vmmc: hummingboard-vmmc {
+                        fsl,pins = <
+                                MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0
+                        >;
+                };
         };
 };
 
@@ -280,7 +303,7 @@
 
 &usbh1 {
         disable-over-current;
-        vbus-supply = <&reg_usbh1_vbus>;
+        vbus-supply = <&v_usb2>;
         status = "okay";
 };
 
@@ -288,7 +311,7 @@
         disable-over-current;
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
-        vbus-supply = <&reg_usbotg_vbus>;
+        vbus-supply = <&v_usb1>;
         status = "okay";
 };
 
@@ -298,7 +321,11 @@
                 &pinctrl_hummingboard_usdhc2_aux
                 &pinctrl_hummingboard_usdhc2
         >;
-        vmmc-supply = <&reg_3p3v>;
+        vmmc-supply = <&v_sd>;
         cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
+
+&vcc_3v3 {
+        vin-supply = <&v_3v2>;
+};
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi
new file mode 100644
index 000000000000..f400405381a7
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi
@@ -0,0 +1,72 @@
+/*
+ * Device Tree file for SolidRun HummingBoard2
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+&iomuxc {
+        hummingboard2 {
+                pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD3_CMD__SD3_CMD    0x17059
+                                MX6QDL_PAD_SD3_CLK__SD3_CLK    0x10059
+                                MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+                                MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+                                MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+                                MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+                                MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
+                                MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
+                                MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
+                                MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
+                                MX6QDL_PAD_SD3_RST__SD3_RESET  0x17059
+                        >;
+                };
+        };
+};
+
+&usdhc3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_usdhc3>;
+        vmmc-supply = <&v_3v2>;
+        vqmmc-supply = <&v_3v2>;
+        bus-width = <8>;
+        non-removable;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
new file mode 100644
index 000000000000..dffbc92e0023
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -0,0 +1,540 @@
+/*
+ * Copyright (C) 2015 Rabeeh Khoury <rabeeh@solid-run.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/ {
+        chosen {
+                stdout-path = &uart1;
+        };
+
+        ir_recv: ir-receiver {
+                compatible = "gpio-ir-receiver";
+                gpios = <&gpio7 9 GPIO_ACTIVE_LOW>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard2_gpio7_9>;
+                linux,rc-map-name = "rc-rc6-mce";
+        };
+
+        v_3v2: regulator-v-3v2 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-max-microvolt = <3300000>;
+                regulator-min-microvolt = <3300000>;
+                regulator-name = "v_3v2";
+        };
+
+        v_5v0: regulator-v-5v0 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_5v0";
+        };
+
+        vcc_1p8: regulator-vcc-1p8 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-max-microvolt = <1800000>;
+                regulator-min-microvolt = <1800000>;
+                regulator-name = "vcc_1p8";
+                vin-supply = <&v_3v2>;
+        };
+
+        v_sd: regulator-v-sd {
+                compatible = "regulator-fixed";
+                gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard2_vmmc>;
+                regulator-boot-on;
+                regulator-max-microvolt = <3300000>;
+                regulator-min-microvolt = <3300000>;
+                regulator-name = "v_sd";
+                startup-delay-us = <1000>;
+                vin-supply = <&v_3v2>;
+        };
+
+        v_usb1: regulator-v-usb1 {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard2_usbotg_vbus>;
+                regulator-always-on;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_usb1";
+                vin-supply = <&v_5v0>;
+        };
+
+        v_usb2: regulator-v-usb2 {
+                /* USB hub port 1 */
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>;
+                regulator-always-on;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_usb2";
+                vin-supply = <&v_5v0>;
+        };
+
+        v_usb3: regulator-v-usb3 {
+                /* USB hub port 3 */
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard2_usbh2_vbus>;
+                regulator-always-on;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_usb3";
+                vin-supply = <&v_5v0>;
+        };
+
+        v_usb4: regulator-v-usb4 {
+                /* USB hub port 4 */
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio7 10 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard2_usbh3_vbus>;
+                regulator-always-on;
+                regulator-max-microvolt = <5000000>;
+                regulator-min-microvolt = <5000000>;
+                regulator-name = "v_usb4";
+                vin-supply = <&v_5v0>;
+        };
+
+        sound-sgtl5000 {
+                audio-codec = <&sgtl5000>;
+                audio-routing =
+                        "MIC_IN", "Mic Jack",
+                        "Mic Jack", "Mic Bias",
+                        "Headphone Jack", "HP_OUT";
+                compatible = "fsl,imx-audio-sgtl5000";
+                model = "On-board Codec";
+                mux-ext-port = <5>;
+                mux-int-port = <1>;
+                ssi-controller = <&ssi1>;
+        };
+};
+
+&audmux {
+        status = "okay";
+};
+
+&ecspi2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_ecspi2>;
+        cs-gpios = <&gpio2 26 0>;
+        status = "okay";
+};
+
+&hdmi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_hdmi>;
+        ddc-i2c-bus = <&i2c2>;
+        status = "okay";
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_i2c1>;
+        status = "okay";
+
+        pcf8523: rtc@68 {
+                compatible = "nxp,pcf8523";
+                reg = <0x68>;
+        };
+
+        sgtl5000: codec@a {
+                clocks = <&clks IMX6QDL_CLK_CKO>;
+                compatible = "fsl,sgtl5000";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>;
+                reg = <0x0a>;
+                VDDA-supply = <&v_3v2>;
+                VDDD-supply = <&vcc_1p8>;
+                VDDIO-supply = <&v_3v2>;
+        };
+};
+
+&i2c2 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_i2c2>;
+        status = "okay";
+};
+
+&i2c3 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_i2c3>;
+        status = "okay";
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog>;
+
+        hummingboard2 {
+                pinctrl_hog: hoggrp {
+                fsl,pins = <
+                                /*
+                                 * 36 pin headers GPIO description. The pins
+                                 * numbering as following -
+                                 *
+                                 *      3.2v    5v      74      75
+                                 *      73      72      71      70
+                                 *      69      68      67      66
+                                 *
+                                 *      77      78      79      76
+                                 *      65      64      61      60
+                                 *      53      52      51      50
+                                 *      49      48      166     132
+                                 *      95      94      90      91
+                                 *      GND     54      24      204
+                                 *
+                                 * The GPIO numbers can be extracted using
+                                 * signal name from below.
+                                 * Example -
+                                 * MX6QDL_PAD_EIM_DA10__GPIO3_IO10 is
+                                 * GPIO(3,10) which is (3-1)*32+10 = gpio 74
+                                 *
+                                 * i.e. The mapping of GPIO(X,Y) to Linux gpio
+                                 * number is : gpio number = (X-1) * 32 + Y
+                                 */
+                                /* DI1_PIN15 */
+                                MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x400130b1
+                                /* DI1_PIN02 */
+                                MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x400130b1
+                                /* DISP1_DATA00 */
+                                MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x400130b1
+                                /* DISP1_DATA01 */
+                                MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x400130b1
+                                /* DISP1_DATA02 */
+                                MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x400130b1
+                                /* DISP1_DATA03 */
+                                MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x400130b1
+                                /* DISP1_DATA04 */
+                                MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x400130b1
+                                /* DISP1_DATA05 */
+                                MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x400130b1
+                                /* DISP1_DATA06 */
+                                MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x400130b1
+                                /* DISP1_DATA07 */
+                                MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x400130b1
+                                /* DI1_D0_CS */
+                                MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x400130b1
+                                /* DI1_D1_CS */
+                                MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x400130b1
+                                /* DI1_PIN01 */
+                                MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x400130b1
+                                /* DI1_PIN03 */
+                                MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x400130b1
+                                /* DISP1_DATA08 */
+                                MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x400130b1
+                                /* DISP1_DATA09 */
+                                MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x400130b1
+                                /* DISP1_DATA10 */
+                                MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x400130b1
+                                /* DISP1_DATA11 */
+                                MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x400130b1
+                                /* DISP1_DATA12 */
+                                MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x400130b1
+                                /* DISP1_DATA13 */
+                                MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x400130b1
+                                /* DISP1_DATA14 */
+                                MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x400130b1
+                                /* DISP1_DATA15 */
+                                MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x400130b1
+                                /* DISP1_DATA16 */
+                                MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x400130b1
+                                /* DISP1_DATA17 */
+                                MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x400130b1
+                                /* DISP1_DATA18 */
+                                MX6QDL_PAD_EIM_A23__GPIO6_IO06 0x400130b1
+                                /* DISP1_DATA19 */
+                                MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x400130b1
+                                /* DISP1_DATA20 */
+                                MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x400130b1
+                                /* DISP1_DATA21 */
+                                MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x400130b1
+                                /* DISP1_DATA22 */
+                                MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x400130b1
+                                /* DISP1_DATA23 */
+                                MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x400130b1
+                                /* DI1_DISP_CLK */
+                                MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x400130b1
+                                /* SPDIF_IN */
+                                MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x400130b1
+                                /* SPDIF_OUT */
+                                MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x400130b1
+
+                                /* MikroBUS GPIO pin number 10 */
+                                MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x400130b1
+                        >;
+                };
+
+                pinctrl_hummingboard2_ecspi2: hummingboard2-ecspi2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_OE__ECSPI2_MISO  0x100b1
+                                MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1
+                                MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1
+                                MX6QDL_PAD_EIM_RW__GPIO2_IO26   0x000b1 /* CS */
+                        >;
+                };
+
+                pinctrl_hummingboard2_gpio7_9: hummingboard2-gpio7_9 {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_CMD__GPIO7_IO09 0x80000000
+                        >;
+                };
+
+                pinctrl_hummingboard2_hdmi: hummingboard2-hdmi {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+                        >;
+                };
+
+                pinctrl_hummingboard2_i2c1: hummingboard2-i2c1 {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
+                                MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
+                        >;
+                };
+
+                pinctrl_hummingboard2_i2c2: hummingboard2-i2c2 {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+                                MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+                        >;
+                };
+
+                pinctrl_hummingboard2_i2c3: hummingboard2-i2c3 {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
+                                MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+                        >;
+                };
+
+                pinctrl_hummingboard2_mipi: hummingboard2_mipi {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x4001b8b1
+                                MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x4001b8b1
+                                MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0
+                        >;
+                };
+
+                pinctrl_hummingboard2_pcie_reset: hummingboard2-pcie-reset {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x1b0b1
+                        >;
+                };
+
+                pinctrl_hummingboard2_pwm1: pwm1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1
+                        >;
+                };
+
+                pinctrl_hummingboard2_pwm3: pwm3grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
+                        >;
+                };
+
+                pinctrl_hummingboard2_sgtl5000: hummingboard2-sgtl5000 {
+                        fsl,pins = <
+                                MX6QDL_PAD_DISP0_DAT19__AUD5_RXD 0x130b0
+                                MX6QDL_PAD_KEY_COL0__AUD5_TXC 0x130b0
+                                MX6QDL_PAD_KEY_ROW0__AUD5_TXD 0x110b0
+                                MX6QDL_PAD_KEY_COL1__AUD5_TXFS 0x130b0
+                                MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
+                        >;
+                };
+
+                pinctrl_hummingboard2_usbh1_vbus: hummingboard2-usbh1-vbus {
+                        fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;
+                };
+
+                pinctrl_hummingboard2_usbh2_vbus: hummingboard2-usbh2-vbus {
+                        fsl,pins = <MX6QDL_PAD_SD4_DAT5__GPIO2_IO13 0x1b0b0>;
+                };
+
+                pinctrl_hummingboard2_usbh3_vbus: hummingboard2-usbh3-vbus {
+                        fsl,pins = <MX6QDL_PAD_SD4_CLK__GPIO7_IO10 0x1b0b0>;
+                };
+
+                pinctrl_hummingboard2_usbotg_id: hummingboard2-usbotg-id {
+                        /*
+                         * Similar to pinctrl_usbotg_2, but we want it
+                         * pulled down for a fixed host connection.
+                         */
+                        fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
+                };
+
+                pinctrl_hummingboard2_usbotg_vbus: hummingboard2-usbotg-vbus {
+                        fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;
+                };
+
+                pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_4__GPIO1_IO04    0x1f071
+                                MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071
+                        >;
+                };
+
+                pinctrl_hummingboard2_usdhc2: hummingboard2-usdhc2 {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD2_CMD__SD2_CMD    0x17059
+                                MX6QDL_PAD_SD2_CLK__SD2_CLK    0x10059
+                                MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
+                                MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
+                                MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
+                                MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
+                        >;
+                };
+
+                pinctrl_hummingboard2_usdhc2_100mhz: hummingboard2-usdhc2-100mhz {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD2_CMD__SD2_CMD    0x170b9
+                                MX6QDL_PAD_SD2_CLK__SD2_CLK    0x100b9
+                                MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170b9
+                                MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170b9
+                                MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170b9
+                                MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130b9
+                        >;
+                };
+
+                pinctrl_hummingboard2_usdhc2_200mhz: hummingboard2-usdhc2-200mhz {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD2_CMD__SD2_CMD    0x170f9
+                                MX6QDL_PAD_SD2_CLK__SD2_CLK    0x100f9
+                                MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x170f9
+                                MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x170f9
+                                MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x170f9
+                                MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x130f9
+                        >;
+                };
+
+                pinctrl_hummingboard2_vmmc: hummingboard2-vmmc {
+                        fsl,pins = <
+                                MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0
+                        >;
+                };
+
+                pinctrl_hummingboard2_uart3: hummingboard2-uart3 {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D25__UART3_TX_DATA       0x1b0b1
+                                MX6QDL_PAD_EIM_D24__UART3_RX_DATA       0x40013000
+                        >;
+                };
+        };
+};
+
+&pcie {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_pcie_reset>;
+        reset-gpio = <&gpio2 11 GPIO_ACTIVE_LOW>;
+        status = "okay";
+};
+
+&pwm1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_pwm1>;
+        status = "okay";
+};
+
+&pwm3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_pwm3>;
+        status = "okay";
+};
+
+&ssi1 {
+        status = "okay";
+};
+
+&usbh1 {
+        disable-over-current;
+        status = "okay";
+};
+
+&usbotg {
+        disable-over-current;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_usbotg_id>;
+        vbus-supply = <&v_usb1>;
+        status = "okay";
+};
+
+&usdhc2 {
+        pinctrl-names = "default", "state_100mhz", "state_200mhz";
+        pinctrl-0 = <
+                &pinctrl_hummingboard2_usdhc2_aux
+                &pinctrl_hummingboard2_usdhc2
+        >;
+        pinctrl-1 = <
+                &pinctrl_hummingboard2_usdhc2_aux
+                &pinctrl_hummingboard2_usdhc2_100mhz
+        >;
+        pinctrl-2 = <
+                &pinctrl_hummingboard2_usdhc2_aux
+                &pinctrl_hummingboard2_usdhc2_200mhz
+        >;
+        vmmc-supply = <&v_sd>;
+        cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+        status = "okay";
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hummingboard2_uart3>;
+        status = "okay";
+};
+
+&vcc_3v3 {
+        vin-supply = <&v_3v2>;
+};
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index 3a77f0fedfce..fd05f7caa472 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@ -172,7 +172,7 @@
                 };
         };
 
-        i2cmux@2 {
+        i2c2mux {
                 compatible = "i2c-mux-gpio";
                 pinctrl-names = "default";
                 pinctrl-0 = <&pinctrl_i2c2mux>;
@@ -183,20 +183,20 @@
                 i2c-parent = <&i2c2>;
                 idle-state = <0>;
 
-                i2c2@1 {
+                i2c2mux@1 {
                         reg = <1>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                 };
 
-                i2c2@2 {
+                i2c2mux@2 {
                         reg = <2>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                 };
         };
 
-        i2cmux@3 {
+        i2c3mux {
                 compatible = "i2c-mux-gpio";
                 pinctrl-names = "default";
                 pinctrl-0 = <&pinctrl_i2c3mux>;
@@ -206,7 +206,7 @@
                 i2c-parent = <&i2c3>;
                 idle-state = <0>;
 
-                i2c3@1 {
+                i2c3mux@1 {
                         reg = <1>;
                         #address-cells = <1>;
                         #size-cells = <0>;
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 4bdf29169d2a..919b6b7619a4 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -276,6 +276,23 @@
                 compatible = "sst,sst25vf016b", "jedec,spi-nor";
                 spi-max-frequency = <20000000>;
                 reg = <0>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                partition@0 {
+                        label = "bootloader";
+                        reg = <0x0 0xc0000>;
+                };
+
+                partition@c0000 {
+                        label = "env";
+                        reg = <0xc0000 0x2000>;
+                };
+
+                partition@c2000 {
+                        label = "splash";
+                        reg = <0xc2000 0x13e000>;
+                };
         };
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 4fa2fac3877b..82d6ccb46982 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -235,6 +235,9 @@
 };
 
 &hdmi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hdmi_cec>;
+        ddc-i2c-bus = <&i2c2>;
         status = "okay";
 };
 
@@ -453,6 +456,12 @@
                         >;
                 };
 
+                pinctrl_hdmi_cec: hdmicecgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE    0x1f8b0
+                        >;
+                };
+
                 pinctrl_i2c2: i2c2grp {
                         fsl,pins = <
                                 MX6QDL_PAD_EIM_EB2__I2C2_SCL    0x4001b8b1
diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som-brcm.dtsi
index 6a410160c9ee..b55af61dfeca 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sr-som-brcm.dtsi
@@ -40,7 +40,7 @@
  */
 #include <dt-bindings/gpio/gpio.h>
 / {
-        clk_sdio: sdio-clock {
+        clk_brcm: brcm-clock {
                 compatible = "gpio-gate-clock";
                 #clock-cells = <0>;
                 pinctrl-names = "default";
@@ -48,27 +48,23 @@
                 enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
         };
 
-        regulators {
-                compatible = "simple-bus";
-
-                reg_brcm: brcm-reg {
-                        compatible = "regulator-fixed";
-                        enable-active-high;
-                        gpio = <&gpio3 19 0>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
-                        regulator-name = "brcm_reg";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        startup-delay-us = <200000>;
-                };
+        reg_brcm: brcm-reg {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio3 19 0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
+                regulator-name = "brcm_reg";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                startup-delay-us = <200000>;
         };
 
         usdhc1_pwrseq: usdhc1_pwrseq {
                 compatible = "mmc-pwrseq-simple";
                 reset-gpios = <&gpio5 26 GPIO_ACTIVE_LOW>,
                               <&gpio6 0 GPIO_ACTIVE_LOW>;
-                clocks = <&clk_sdio>;
+                clocks = <&clk_brcm>;
                 clock-names = "ext_clock";
         };
 };
@@ -104,13 +100,6 @@
                         >;
                 };
 
-                pinctrl_microsom_uart1: microsom-uart1 {
-                        fsl,pins = <
-                                MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA    0x1b0b1
-                                MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA    0x1b0b1
-                        >;
-                };
-
                 pinctrl_microsom_uart4: microsom-uart4 {
                         fsl,pins = <
                                 MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
@@ -133,12 +122,6 @@
         };
 };
 
-&uart1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_microsom_uart1>;
-        status = "okay";
-};
-
 /* UART4 - Connected to optional BRCM Wifi/BT/FM */
 &uart4 {
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/imx6qdl-sr-som-emmc.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som-emmc.dtsi
new file mode 100644
index 000000000000..5f3b8baab20f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-sr-som-emmc.dtsi
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2013,2014 Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+&iomuxc {
+        microsom {
+                pinctrl_microsom_usdhc3: microsom-usdhc3 {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD3_CMD__SD3_CMD    0x17059
+                                MX6QDL_PAD_SD3_CLK__SD3_CLK    0x10059
+                                MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+                                MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+                                MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+                                MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+                                MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
+                                MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
+                                MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
+                                MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
+                                MX6QDL_PAD_SD3_RST__SD3_RESET  0x17059
+                        >;
+                };
+        };
+};
+
+/* USDHC3 - eMMC */
+&usdhc3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_microsom_usdhc3>;
+        bus-width = <8>;
+        non-removable;
+        vmmc-supply = <&vcc_3v3>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi
new file mode 100644
index 000000000000..44a97ba93a95
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2013,2014 Russell King
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        nvcc_sd1: regulator-nvcc-sd1 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-name = "nvcc_sd1";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                vin-supply = <&vcc_3v3>;
+        };
+
+        clk_ti_wifi: ti-wifi-clock {
+                /* This is a hack around the kernel - using "fixed clock"
+                 * results in the "pinctrl" properties being ignored, and
+                 * the clock not being output.  Instead, use a gated clock
+                 * and the unrouted WL_XTAL_PU gpio.
+                 */
+                compatible = "gpio-gate-clock";
+                #clock-cells = <0>;
+                clock-frequency = <32768>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_microsom_ti_clk>;
+                enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
+        };
+
+        pwrseq_ti_wifi: ti-wifi-pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_microsom_ti_wifi_en>;
+                reset-gpios = <&gpio5 26 GPIO_ACTIVE_LOW>;
+                post-power-on-delay-ms = <200>;
+                clocks = <&clk_ti_wifi>;
+                clock-names = "ext_clock";
+        };
+};
+
+&iomuxc {
+        microsom {
+                pinctrl_microsom_ti_bt: microsom-ti-bt {
+                        fsl,pins = <
+                                /* BT_EN_SOC */
+                                MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00       0x40013070
+                        >;
+                };
+
+                pinctrl_microsom_ti_clk: microsom-ti-clk {
+                        fsl,pins = <
+                                /* EXT_32K */
+                                MX6QDL_PAD_GPIO_8__XTALOSC_REF_CLK_32K  0x1b0b0
+                                /* WL_XTAL_PU (unrouted) */
+                                MX6QDL_PAD_DISP0_DAT11__GPIO5_IO05 0x40013070
+                        >;
+                };
+
+                pinctrl_microsom_ti_wifi_en: microsom-ti-wifi-en {
+                        fsl,pins = <
+                                /* WLAN_EN_SOC */
+                                MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26        0x40013070
+                        >;
+                };
+
+                pinctrl_microsom_ti_wifi_irq: microsom-ti-wifi-irq {
+                        fsl,pins = <
+                                /* WLAN_IRQ */
+                                MX6QDL_PAD_CSI0_DAT18__GPIO6_IO04       0x40013070
+                        >;
+                };
+
+                pinctrl_microsom_uart4: microsom-uart4 {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B 0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B 0x1b0b1
+                        >;
+                };
+
+                pinctrl_microsom_usdhc1: microsom-usdhc1 {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD1_CMD__SD1_CMD    0x17059
+                                MX6QDL_PAD_SD1_CLK__SD1_CLK    0x10059
+                                MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
+                                MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+                                MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+                                MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
+                        >;
+                };
+        };
+};
+
+/* UART4 - Connected to optional TI Wi-Fi/BT/FM */
+&uart4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_microsom_uart4>;
+        uart-has-rtscts;
+        status = "okay";
+
+        bluetooth {
+                compatible = "ti,wl1837-st";
+                clocks = <&clk_ti_wifi>;
+                clock-names = "ext_clock";
+                enable-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_microsom_ti_bt>;
+        };
+};
+
+/* USDHC1 - Connected to optional TI Wi-Fi/BT/FM */
+&usdhc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_microsom_usdhc1>;
+        bus-width = <4>;
+        keep-power-in-suspend;
+        mmc-pwrseq = <&pwrseq_ti_wifi>;
+        non-removable;
+        vmmc-supply = <&vcc_3v3>;
+        /* vqmmc-supply = <&nvcc_sd1>; - MMC layer doesn't like it! */
+        status = "okay";
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        wlcore@2 {
+                compatible = "ti,wl1837";
+                reg = <2>;
+                interrupts-extended = <&gpio6 4 IRQ_TYPE_LEVEL_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_microsom_ti_wifi_irq>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
index 900e8c781f91..4ccb7afc4b35 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
@@ -1,9 +1,6 @@
 /*
  * Copyright (C) 2013,2014 Russell King
  *
- * This describes the hookup for an AR8035 to the iMX6 on the SolidRun
- * MicroSOM.
- *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
  * licensing only applies to this file, and not this project as a
@@ -41,6 +38,18 @@
  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        vcc_3v3: regulator-vcc-3v3 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-name = "vcc_3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+};
+
 &fec {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
@@ -51,7 +60,7 @@
 };
 
 &iomuxc {
-        enet {
+        microsom {
                 pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
                         fsl,pins = <
                                 MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b8b0
@@ -59,10 +68,10 @@
                                 /* AR8035 reset */
                                 MX6QDL_PAD_KEY_ROW4__GPIO4_IO15         0x130b0
                                 /* AR8035 interrupt */
-                                MX6QDL_PAD_DI0_PIN2__GPIO4_IO18         0x80000000
+                                MX6QDL_PAD_DI0_PIN2__GPIO4_IO18         0x1b0b0
                                 /* GPIO16 -> AR8035 25MHz */
-                                MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0xc0000000
-                                MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x80000000
+                                MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0x4001b0b0
+                                MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x13030
                                 MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
                                 MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
                                 MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
@@ -95,5 +104,18 @@
                                 MX6QDL_PAD_ENET_RXD1__GPIO1_IO26        0x03000
                         >;
                 };
+
+                pinctrl_microsom_uart1: microsom-uart1 {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA    0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA    0x1b0b1
+                        >;
+                };
         };
 };
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_microsom_uart1>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi
new file mode 100644
index 000000000000..f0be516dc28e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi
@@ -0,0 +1,594 @@
+/*
+ * Copyright 2015 Technologic Systems
+ * Copyright 2017 Savoir-Faire Linux
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License
+ *     version 2 as published by the Free Software Foundation.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+        leds {
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_leds1>;
+                compatible = "gpio-leds";
+
+                green-led {
+                        label = "green-led";
+                        gpios = <&gpio3 27 GPIO_ACTIVE_LOW>;
+                        default-state = "on";
+                };
+
+                red-led {
+                        label = "red-led";
+                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                };
+
+                yel-led {
+                        label = "yellow-led";
+                        gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                };
+
+                blue-led {
+                        label = "blue-led";
+                        gpios = <&gpio4 25 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                };
+
+                en-usb-5v {
+                        label = "en-usb-5v";
+                        gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                };
+
+                sel_dc_usb {
+                        label = "sel_dc_usb";
+                        gpios = <&gpio5 17 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+        };
+
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "3p3v";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+        };
+
+        reg_can1_3v3: reg_can1_3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "reg_can1_3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_can2_3v3: en-reg_can2_3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "reg_can2_3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio6 31 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_usb_otg_vbus: regulator-usb-otg-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_otg_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_wlan_vmmc: regulator_wlan_vmmc {
+                compatible = "regulator-fixed";
+                regulator-name = "wlan_vmmc";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                gpio = <&gpio8 14 GPIO_ACTIVE_HIGH>;
+                startup-delay-us = <70000>;
+                enable-active-high;
+        };
+
+        sound-sgtl5000 {
+                audio-codec = <&sgtl5000>;
+                audio-routing =
+                        "MIC_IN", "Mic Jack",
+                        "Mic Jack", "Mic Bias",
+                        "Headphone Jack", "HP_OUT";
+                compatible = "fsl,imx-audio-sgtl5000";
+                model = "On-board Codec";
+                mux-ext-port = <3>;
+                mux-int-port = <1>;
+                ssi-controller = <&ssi1>;
+        };
+};
+
+&audmux {
+        status = "okay";
+};
+
+&can1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan1>;
+        xceiver-supply = <&reg_can1_3v3>;
+        status = "okay";
+};
+
+&can2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan2>;
+        xceiver-supply = <&reg_can2_3v3>;
+        status = "okay";
+};
+
+&ecspi1 {
+        cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi1>;
+        status = "okay";
+
+        n25q064: flash@0 {
+                compatible = "micron,n25q064", "jedec,spi-nor";
+                reg = <0>;
+                spi-max-frequency = <20000000>;
+        };
+};
+
+&ecspi2 {
+        cs-gpios = <
+                &gpio5 31 GPIO_ACTIVE_HIGH
+                &gpio7 12 GPIO_ACTIVE_HIGH
+                &gpio5 18 GPIO_ACTIVE_HIGH
+        >;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi2>;
+        status = "okay";
+};
+
+&fec {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet>;
+        phy-mode = "rgmii";
+        interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
+                              <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
+        fsl,err006687-workaround-present;
+        status = "okay";
+};
+
+&hdmi {
+        status = "okay";
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default", "gpio";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        pinctrl-1 = <&pinctrl_i2c1_gpio>;
+        scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+        sda-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+
+        m41t00s: rtc@68 {
+                compatible = "m41t00";
+                reg = <0x68>;
+        };
+
+        isl12022: rtc@6f {
+                compatible = "isl,isl12022";
+                reg = <0x6f>;
+        };
+
+        gpio8: gpio@28 {
+                compatible = "technologic,ts7970-gpio";
+                reg = <0x28>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                ngpio = <32>;
+        };
+
+        sgtl5000: codec@a {
+                compatible = "fsl,sgtl5000";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_sgtl5000>;
+                reg = <0x0a>;
+                clocks = <&clks IMX6QDL_CLK_CKO>;
+                VDDA-supply = <&reg_3p3v>;
+                VDDIO-supply = <&reg_3p3v>;
+        };
+};
+
+&i2c2 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default", "gpio";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        pinctrl-1 = <&pinctrl_i2c2_gpio>;
+        scl-gpios = <&gpio4 12 GPIO_ACTIVE_HIGH>;
+        sda-gpios = <&gpio4 13 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog>;
+
+        pinctrl_ecspi1: ecspi1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D17__ECSPI1_MISO         0x100b1
+                        MX6QDL_PAD_EIM_D18__ECSPI1_MOSI         0x100b1
+                        MX6QDL_PAD_EIM_D16__ECSPI1_SCLK         0x100b1
+                        MX6QDL_PAD_EIM_D19__GPIO3_IO19          0x100b1 /* Onboard Flash CS */
+                >;
+        };
+
+        pinctrl_ecspi2: ecspi2 {
+                fsl,pins = <
+                        MX6QDL_PAD_CSI0_DAT8__ECSPI2_SCLK      0x100b1
+                        MX6QDL_PAD_CSI0_DAT9__ECSPI2_MOSI      0x100b1
+                        MX6QDL_PAD_CSI0_DAT10__ECSPI2_MISO     0x100b1
+                        MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31      0x100b1 /* FPGA_SPI_CS0 */
+                        MX6QDL_PAD_GPIO_17__GPIO7_IO12         0x100b1 /* FPGA_SPI_CS1 */
+                        MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18     0x100b1 /* HD1_SPI_CS */
+                        MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21      0x1b088 /* FPGA_RESET */
+                        MX6QDL_PAD_GPIO_3__XTALOSC_REF_CLK_24M 0x10    /* FPGA 24MHZ */
+                        MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20    0x1b088 /* FPGA_IRQ_0 */
+                        MX6QDL_PAD_GPIO_4__GPIO1_IO04          0x1b088 /* FPGA_IRQ_1 */
+                >;
+        };
+
+        pinctrl_enet: enet {
+                fsl,pins = <
+                        MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
+                        MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
+                        MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b0b0
+                        MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b0b0
+                        MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b0b0
+                        MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b0b0
+                        MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b0b0
+                        MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b0b0
+                        MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b0b0
+                        MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b0b0
+                        MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b0b0
+                        MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b0b0
+                        MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b0b0
+                        MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b0b0
+                        MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
+                        MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28       0x1b088
+                        MX6QDL_PAD_DI0_PIN4__GPIO4_IO20         0x1b088 /* ETH_PHY_RESET */
+                        MX6QDL_PAD_GPIO_6__ENET_IRQ             0x000b1
+                >;
+        };
+
+        pinctrl_flexcan1: flexcan1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX        0x1b088
+                        MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX        0x1b088
+                        MX6QDL_PAD_DISP0_DAT0__GPIO4_IO21       0x1b088 /* EN_CAN_1 */
+                >;
+        };
+
+        pinctrl_flexcan2: flexcan2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX        0x1b088
+                        MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX        0x1b088
+                        MX6QDL_PAD_EIM_BCLK__GPIO6_IO31         0x1b088 /* EN_CAN_2 */
+                >;
+        };
+
+        pinctrl_hog: hoggrp {
+                fsl,pins = <
+                        /* Onboard */
+                        MX6QDL_PAD_SD4_DAT3__GPIO2_IO11         0x1b088 /* USB_HUB_RESET */
+                        MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17      0x1b088 /* SEL_DC_USB */
+                        MX6QDL_PAD_EIM_A16__GPIO2_IO22          0x1b088 /* EN_USB_5V */
+                        MX6QDL_PAD_DISP0_DAT14__GPIO5_IO08      0x1b088 /* JTAG_FPGA_TMS */
+                        MX6QDL_PAD_DISP0_DAT17__GPIO5_IO11      0x1b088 /* JTAG_FPGA_TCK */
+                        MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12      0x1b088 /* JTAG_FPGA_TDO */
+                        MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16      0x1b088 /* JTAG_FPGA_TDI */
+                        MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14      0x1b088 /* GYRO_INT */
+                        MX6QDL_PAD_EIM_OE__GPIO2_IO25           0x1b088 /* MODBUS_FAULT */
+                        MX6QDL_PAD_EIM_RW__GPIO2_IO26           0x1b088 /* BUS_DIR/JP_SD_BOOT */
+                        MX6QDL_PAD_EIM_A19__GPIO2_IO19          0x1b088 /* EN_MODBUS_24V */
+                        MX6QDL_PAD_DISP0_DAT5__GPIO4_IO26       0x1b088 /* EN_MODBUS_3V */
+                        MX6QDL_PAD_EIM_A17__GPIO2_IO21          0x1b088 /* I210_RESET */
+                        MX6QDL_PAD_EIM_D23__GPIO3_IO23          0x1b088 /* EN_RTC_PWR */
+                        MX6QDL_PAD_SD3_DAT4__GPIO7_IO01         0x1b088 /* REVSTRAP1 */
+
+                        /* Offboard */
+                        MX6QDL_PAD_DISP0_DAT7__GPIO4_IO28       0x1b088 /* LCD_D09 */
+                        MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30       0x1b088 /* HD1_IRQ */
+                        MX6QDL_PAD_DISP0_DAT10__GPIO4_IO31      0x1b088 /* LCD_D10 */
+                        MX6QDL_PAD_DISP0_DAT11__GPIO5_IO05      0x1b088 /* LCD_D11 */
+                        MX6QDL_PAD_EIM_EB1__GPIO2_IO29          0x1b088 /* BUS_BHE */
+                        MX6QDL_PAD_EIM_LBA__GPIO2_IO27          0x1b088 /* BUS_ALE */
+                        MX6QDL_PAD_EIM_CS0__GPIO2_IO23          0x1b088 /* BUS_CS */
+                        MX6QDL_PAD_EIM_A24__GPIO5_IO04          0x1b088 /* DIO_20 */
+                        MX6QDL_PAD_EIM_WAIT__GPIO5_IO00         0x1b088 /* BUS_WAIT */
+                        MX6QDL_PAD_EIM_DA0__GPIO3_IO00          0x1b088 /* MUX_AD_00 */
+                        MX6QDL_PAD_EIM_DA1__GPIO3_IO01          0x1b088 /* MUX_AD_01 */
+                        MX6QDL_PAD_EIM_DA2__GPIO3_IO02          0x1b088 /* MUX_AD_02 */
+                        MX6QDL_PAD_EIM_DA3__GPIO3_IO03          0x1b088 /* MUX_AD_03 */
+                        MX6QDL_PAD_EIM_DA4__GPIO3_IO04          0x1b088 /* MUX_AD_04 */
+                        MX6QDL_PAD_EIM_DA5__GPIO3_IO05          0x1b088 /* MUX_AD_05 */
+                        MX6QDL_PAD_EIM_DA6__GPIO3_IO06          0x1b088 /* MUX_AD_06 */
+                        MX6QDL_PAD_EIM_DA7__GPIO3_IO07          0x1b088 /* MUX_AD_07 */
+                        MX6QDL_PAD_EIM_DA8__GPIO3_IO08          0x1b088 /* MUX_AD_08 */
+                        MX6QDL_PAD_EIM_DA9__GPIO3_IO09          0x1b088 /* MUX_AD_09 */
+                        MX6QDL_PAD_EIM_DA10__GPIO3_IO10         0x1b088 /* MUX_AD_10 */
+                        MX6QDL_PAD_EIM_DA11__GPIO3_IO11         0x1b088 /* MUX_AD_11 */
+                        MX6QDL_PAD_EIM_DA12__GPIO3_IO12         0x1b088 /* MUX_AD_12 */
+                        MX6QDL_PAD_EIM_DA13__GPIO3_IO13         0x1b088 /* MUX_AD_13 */
+                        MX6QDL_PAD_EIM_DA14__GPIO3_IO14         0x1b088 /* MUX_AD_14 */
+                        MX6QDL_PAD_EIM_DA15__GPIO3_IO15         0x1b088 /* MUX_AD_15 */
+
+                        /* Strapping only */
+                        MX6QDL_PAD_EIM_A18__GPIO2_IO20          0x1b088
+                        MX6QDL_PAD_EIM_A21__GPIO2_IO17          0x1b088
+                >;
+        };
+
+        pinctrl_i2c1: i2c1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
+                        MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
+                >;
+        };
+
+        pinctrl_i2c1_gpio: i2c1gpiogrp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D21__GPIO3_IO21          0x4001b8b1
+                        MX6QDL_PAD_EIM_D28__GPIO3_IO28          0x4001b8b1
+                >;
+        };
+
+        pinctrl_i2c2: i2c2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
+                        MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
+                >;
+        };
+
+        pinctrl_i2c2_gpio: i2c2gpiogrp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL3__GPIO4_IO12         0x4001b8b1
+                        MX6QDL_PAD_KEY_ROW3__GPIO4_IO13         0x4001b8b1
+                >;
+        };
+
+        pinctrl_leds1: leds1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D27__GPIO3_IO27          0x1b088 /* GREEN_LED */
+                        MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x1b088 /* RED_LED */
+                        MX6QDL_PAD_GPIO_9__GPIO1_IO09           0x1b088 /* YEL_LED */
+                        MX6QDL_PAD_DISP0_DAT4__GPIO4_IO25       0x1b088 /* IMX6_BLUE_LED */
+                >;
+        };
+
+        pinctrl_sgtl5000: sgtl5000grp {
+                fsl,pins = <
+                        MX6QDL_PAD_CSI0_DAT7__AUD3_RXD          0x130b0
+                        MX6QDL_PAD_CSI0_DAT4__AUD3_TXC          0x130b0
+                        MX6QDL_PAD_CSI0_DAT5__AUD3_TXD          0x110b0
+                        MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS         0x130b0
+                        MX6QDL_PAD_GPIO_0__CCM_CLKO1            0x130b0 /* Audio CLK */
+                >;
+        };
+
+        pinctrl_uart1: uart1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA      0x1b088
+                        MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA      0x1b088
+                >;
+        };
+
+        pinctrl_uart2: uart2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_7__UART2_TX_DATA        0x1b088
+                        MX6QDL_PAD_GPIO_8__UART2_RX_DATA        0x1b088
+                        MX6QDL_PAD_SD4_DAT6__UART2_CTS_B        0x1b088
+                        MX6QDL_PAD_SD4_DAT5__UART2_RTS_B        0x1b088
+                >;
+        };
+
+        pinctrl_uart3: uart3grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D24__UART3_TX_DATA       0x1b088
+                        MX6QDL_PAD_EIM_D25__UART3_RX_DATA       0x1b088
+                        MX6QDL_PAD_EIM_D30__UART3_RTS_B         0x1b088
+                        MX6QDL_PAD_EIM_D31__UART3_CTS_B         0x1b088
+                >;
+        };
+
+        pinctrl_uart4: uart4grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL0__UART4_TX_DATA      0x1b088
+                        MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA      0x1b088
+                >;
+        };
+
+        pinctrl_uart5: uart5grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL1__UART5_TX_DATA      0x1b088
+                        MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA      0x1b088
+                >;
+        };
+
+        pinctrl_usbotg: usbotggrp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
+                >;
+        };
+
+        pinctrl_usdhc1: usdhc1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD1_CMD__SD1_CMD             0x17059
+                        MX6QDL_PAD_SD1_CLK__SD1_CLK             0x10059
+                        MX6QDL_PAD_SD1_DAT0__SD1_DATA0          0x17059
+                        MX6QDL_PAD_SD1_DAT1__SD1_DATA1          0x17059
+                        MX6QDL_PAD_SD1_DAT2__SD1_DATA2          0x17059
+                        MX6QDL_PAD_SD1_DAT3__SD1_DATA3          0x17059
+                        MX6QDL_PAD_ENET_RXD1__GPIO1_IO26        0x17059 /* WIFI IRQ */
+                >;
+        };
+
+        pinctrl_usdhc2: usdhc2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD2_CMD__SD2_CMD             0x17059
+                        MX6QDL_PAD_SD2_CLK__SD2_CLK             0x10059
+                        MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x17059
+                        MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x17059
+                        MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x17059
+                        MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x17059
+                        MX6QDL_PAD_EIM_EB0__GPIO2_IO28          0x1b088 /* EN_SD_POWER */
+                >;
+        };
+
+        pinctrl_usdhc3: usdhc3grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
+                        MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
+                        MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
+                        MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
+                        MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
+                        MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
+                >;
+        };
+};
+
+&pcie {
+        status = "okay";
+};
+
+&snvs_rtc {
+        status = "disabled";
+};
+
+&ssi1 {
+        fsl,mode = "i2s-slave";
+        status = "okay";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart1>;
+        status = "okay";
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2>;
+        uart-has-rtscts;
+        status = "okay";
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart3>;
+        status = "okay";
+};
+
+&uart4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart4>;
+        status = "okay";
+};
+
+&uart5 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart5>;
+        status = "okay";
+};
+
+&usbh1 {
+        status = "okay";
+};
+
+&usbotg {
+        vbus-supply = <&reg_usb_otg_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg>;
+        disable-over-current;
+        status = "okay";
+};
+
+/* WIFI */
+&usdhc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc1>;
+        vmmc-supply = <&reg_wlan_vmmc>;
+        bus-width = <4>;
+        non-removable;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        status = "okay";
+
+        wlcore: wlcore@2 {
+                compatible = "ti,wl1271";
+                reg = <2>;
+                interrupt-parent = <&gpio1>;
+                interrupts = <26 IRQ_TYPE_LEVEL_HIGH>;
+                ref-clock-frequency = <38400000>;
+        };
+};
+
+/* SD */
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        vmmc-supply = <&reg_3p3v>;
+        bus-width = <4>;
+        fsl,wp-controller;
+        status = "okay";
+};
+
+/* eMMC */
+&usdhc3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc3>;
+        vmmc-supply = <&reg_3p3v>;
+        bus-width = <4>;
+        non-removable;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
index c96c91d83678..4161b7d4323a 100644
--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
@@ -28,6 +28,13 @@
                 status = "disabled";
         };
 
+        gpio-poweroff {
+                compatible = "gpio-poweroff";
+                gpios = <&gpio2 4 0>;
+                pinctrl-0 = <&pinctrl_power_off>;
+                pinctrl-names = "default";
+        };
+
         memory {
                 reg = <0x10000000 0x40000000>;
         };
@@ -172,6 +179,12 @@
                         >;
                 };
 
+                pinctrl_power_off: poweroffgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_NANDF_D4__GPIO2_IO04         0x30
+                        >;
+                };
+
                 pinctrl_touchscreenp7: touchscreenp7grp {
                         fsl,pins = <
                                 MX6QDL_PAD_SD2_DAT0__GPIO1_IO15         0x70
@@ -208,8 +221,8 @@
                         fsl,pins = <
                                 MX6QDL_PAD_DI0_PIN2__AUD6_TXD           0x1b0b0
                                 MX6QDL_PAD_DI0_PIN3__AUD6_TXFS          0x1b0b0
-                                MX6QDL_PAD_DI0_PIN4__AUD6_RXD           0x1b0b0
-                                MX6QDL_PAD_DI0_PIN15__AUD6_TXC          0x1b0b0
+                                MX6QDL_PAD_DI0_PIN4__AUD6_RXD           0x13080
+                                MX6QDL_PAD_DI0_PIN15__AUD6_TXC          0x13080
                                 MX6QDL_PAD_EIM_EB2__GPIO2_IO30          0x1b0b0
                         >;
                 };
@@ -218,8 +231,8 @@
                         fsl,pins = <
                                 MX6QDL_PAD_DI0_PIN2__AUD6_TXD           0x1b0b0
                                 MX6QDL_PAD_DI0_PIN3__GPIO4_IO19         0x1b0b0
-                                MX6QDL_PAD_DI0_PIN4__AUD6_RXD           0x1b0b0
-                                MX6QDL_PAD_DI0_PIN15__AUD6_TXC          0x1b0b0
+                                MX6QDL_PAD_DI0_PIN4__AUD6_RXD           0x13080
+                                MX6QDL_PAD_DI0_PIN15__AUD6_TXC          0x13080
                                 MX6QDL_PAD_EIM_EB2__GPIO2_IO30          0x1b0b0
                         >;
                 };
@@ -228,8 +241,8 @@
                         fsl,pins = <
                                 MX6QDL_PAD_DI0_PIN2__GPIO4_IO18         0x1b0b0
                                 MX6QDL_PAD_DI0_PIN3__GPIO4_IO19         0x1b0b0
-                                MX6QDL_PAD_DI0_PIN4__AUD6_RXD           0x1b0b0
-                                MX6QDL_PAD_DI0_PIN15__AUD6_TXC          0x1b0b0
+                                MX6QDL_PAD_DI0_PIN4__AUD6_RXD           0x13080
+                                MX6QDL_PAD_DI0_PIN15__AUD6_TXC          0x13080
                                 MX6QDL_PAD_EIM_EB2__GPIO2_IO30          0x1b0b0
                         >;
                 };
diff --git a/arch/arm/boot/dts/imx6qdl-var-dart.dtsi b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
new file mode 100644
index 000000000000..421d6f527609
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
@@ -0,0 +1,503 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Support for Variscite DART-MX6 Module
+ *
+ * Copyright 2017 BayLibre, SAS
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/sound/fsl-imx-audmux.h>
+
+/ {
+        memory {
+                reg = <0x10000000 0x40000000>;
+        };
+
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "3P3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+        };
+
+        reg_wl18xx_vmmc: regulator-wl18xx {
+                compatible = "regulator-fixed";
+                regulator-name = "vwl1807";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                gpio = <&gpio7 8 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                startup-delay-us = <70000>;
+        };
+};
+
+&audmux {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_audmux>;
+        status = "okay";
+
+        ssi2 {
+                fsl,audmux-port = <1>;
+                fsl,port-config = <
+                        (IMX_AUDMUX_V2_PTCR_SYN |
+                        IMX_AUDMUX_V2_PTCR_TFSDIR |
+                        IMX_AUDMUX_V2_PTCR_TFSEL(2) |
+                        IMX_AUDMUX_V2_PTCR_TCLKDIR |
+                        IMX_AUDMUX_V2_PTCR_TCSEL(2))
+                        IMX_AUDMUX_V2_PDCR_RXDSEL(2)
+                >;
+        };
+
+        aud3 {
+                fsl,audmux-port = <2>;
+                fsl,port-config = <
+                        IMX_AUDMUX_V2_PTCR_SYN
+                        IMX_AUDMUX_V2_PDCR_RXDSEL(1)
+                >;
+        };
+};
+
+&can1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan1>;
+        status = "disabled";
+};
+
+&can2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan2>;
+        status = "disabled";
+};
+
+&ecspi1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi1>;
+        status = "disabled";
+};
+
+&fec {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet>;
+        phy-mode = "rgmii";
+        status = "disabled";
+};
+
+&hdmi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hdmicec>;
+        ddc-i2c-bus = <&i2c1>;
+        status = "disabled";
+};
+
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "disabled";
+};
+
+&i2c2 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        status = "okay";
+
+        pmic@8 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_pmic>;
+                compatible = "fsl,pfuze100";
+                reg = <0x08>;
+
+                regulators {
+                        sw1a_reg: sw1ab {
+                                regulator-min-microvolt = <300000>;
+                                regulator-max-microvolt = <1875000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                                regulator-ramp-delay = <6250>;
+                        };
+
+                        sw1c_reg: sw1c {
+                                regulator-min-microvolt = <300000>;
+                                regulator-max-microvolt = <1875000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                                regulator-ramp-delay = <6250>;
+                        };
+
+                        sw2_reg: sw2 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw3a_reg: sw3a {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <3950000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw3b_reg: sw3b {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <3950000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw4_reg: sw4 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <3950000>;
+                        };
+
+                        snvs_reg: vsnvs {
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        vref_reg: vrefddr {
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        vgen6_reg: vgen6 {
+                                regulator-min-microvolt = <2800000>;
+                                regulator-max-microvolt = <2800000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+                };
+        };
+
+        tlv320aic3106: codec@1b {
+                compatible = "ti,tlv320aic3106";
+                reg = <0x1b>;
+                #sound-dai-cells = <0>;
+                DRVDD-supply = <&reg_3p3v>;
+                AVDD-supply = <&reg_3p3v>;
+                IOVDD-supply = <&reg_3p3v>;
+                DVDD-supply = <&reg_3p3v>;
+                ai3x-ocmv = <0>;
+                gpio-reset = <&gpio5 5 GPIO_ACTIVE_LOW>;
+        };
+};
+
+&i2c3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c3>;
+        status = "disabled";
+};
+
+&iomuxc {
+        pinctrl_audmux: audmux {
+                fsl,pins = <
+                        MX6QDL_PAD_CSI0_DAT7__AUD3_RXD          0x130b0
+                        MX6QDL_PAD_CSI0_DAT4__AUD3_TXC          0x130b0
+                        MX6QDL_PAD_CSI0_DAT5__AUD3_TXD          0x110b0
+                        MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS         0x130b0
+                        /* Audio Clock */
+                        MX6QDL_PAD_GPIO_0__CCM_CLKO1            0x130b0
+                >;
+        };
+
+        pinctrl_bt: bt {
+                fsl,pins = <
+                        /* Bluetooth enable */
+                        MX6QDL_PAD_SD3_DAT6__GPIO6_IO18         0x1b0b1
+                        /* Bluetooth Slow Clock */
+                        MX6QDL_PAD_ENET_RXD0__OSC32K_32K_OUT    0x000b0
+                >;
+        };
+
+        pinctrl_ecspi1: ecspi1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL1__ECSPI1_MISO        0x100b1
+                        MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI        0x100b1
+                        MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK        0x100b1
+                        /* SPI1 CS0 */
+                        MX6QDL_PAD_KEY_ROW1__GPIO4_IO09         0x1b0b0
+                        /* SPI1 CS1 */
+                        MX6QDL_PAD_KEY_COL2__GPIO4_IO10         0x1b0b0
+                >;
+        };
+
+        pinctrl_enet: enetgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x100b0
+                        MX6QDL_PAD_ENET_MDC__ENET_MDC           0x100b0
+                        MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x10030
+                        MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x10030
+                        MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x10030
+                        MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x10030
+                        MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x10030
+                        MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x10030
+                        MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x100b0
+                        MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
+                        MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
+                        MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
+                        MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
+                        MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
+                        MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
+                >;
+        };
+
+        pinctrl_flexcan1: flexcan1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_7__FLEXCAN1_TX  0x1b0b0
+                        MX6QDL_PAD_GPIO_8__FLEXCAN1_RX  0x1b0b0
+                >;
+        };
+
+        pinctrl_flexcan2: flexcan2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX        0x1b0b0
+                        MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX        0x1b0b0
+                >;
+        };
+
+        pinctrl_hdmicec: hdmicecgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE   0x1f8b0
+                >;
+        };
+
+        pinctrl_i2c1: i2c1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_CSI0_DAT8__I2C1_SDA  0x4001b8b1
+                        MX6QDL_PAD_CSI0_DAT9__I2C1_SCL  0x4001b8b1
+                >;
+        };
+
+        pinctrl_i2c2: i2c2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL3__I2C2_SCL   0x4001b8b1
+                        MX6QDL_PAD_KEY_ROW3__I2C2_SDA   0x4001b8b1
+                >;
+        };
+
+        pinctrl_i2c3: i2c3grp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_5__I2C3_SCL     0x4001b8b1
+                        MX6QDL_PAD_GPIO_16__I2C3_SDA    0x4001b8b1
+                >;
+        };
+
+        pinctrl_pmic: pmicgrp {
+                fsl,pins = <
+                        /* PMIC INT */
+                        MX6QDL_PAD_GPIO_17__GPIO7_IO12  0x1b0b1
+                >;
+        };
+
+        pinctrl_pwm2: pwm2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_DISP0_DAT9__PWM2_OUT 0x1b0b1
+                >;
+        };
+
+        pinctrl_uart1: uart1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+                        MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
+                >;
+        };
+
+        pinctrl_uart2: uart2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD3_DAT4__UART2_RX_DATA      0x1b0b1
+                        MX6QDL_PAD_SD3_DAT5__UART2_TX_DATA      0x1b0b1
+                        MX6QDL_PAD_SD4_DAT6__UART2_CTS_B        0x1b0b1
+                        MX6QDL_PAD_SD4_DAT5__UART2_RTS_B        0x1b0b1
+                >;
+        };
+
+        pinctrl_uart3: uart3grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+                        MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
+                        MX6QDL_PAD_EIM_D23__UART3_CTS_B   0x1b0b1
+                        MX6QDL_PAD_EIM_EB3__UART3_RTS_B   0x1b0b1
+                >;
+        };
+
+        pinctrl_usbotg: usbotggrp {
+                fsl,pins = <
+                        MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+                >;
+        };
+
+        pinctrl_usdhc1: usdhc1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD1_CMD__SD1_CMD     0x17059
+                        MX6QDL_PAD_SD1_CLK__SD1_CLK     0x10059
+                        MX6QDL_PAD_SD1_DAT0__SD1_DATA0  0x17059
+                        MX6QDL_PAD_SD1_DAT1__SD1_DATA1  0x17059
+                        MX6QDL_PAD_SD1_DAT2__SD1_DATA2  0x17059
+                        MX6QDL_PAD_SD1_DAT3__SD1_DATA3  0x17059
+                        /* WL_EN */
+                        MX6QDL_PAD_SD3_DAT7__GPIO6_IO17 0x17071
+                        /* WL_IRQ */
+                        MX6QDL_PAD_SD3_RST__GPIO7_IO08  0x17071
+                >;
+        };
+
+        pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
+                fsl,pins = <
+                        MX6QDL_PAD_SD1_CMD__SD1_CMD     0x170B9
+                        MX6QDL_PAD_SD1_CLK__SD1_CLK     0x100B9
+                        MX6QDL_PAD_SD1_DAT0__SD1_DATA0  0x170B9
+                        MX6QDL_PAD_SD1_DAT1__SD1_DATA1  0x170B9
+                        MX6QDL_PAD_SD1_DAT2__SD1_DATA2  0x170B9
+                        MX6QDL_PAD_SD1_DAT3__SD1_DATA3  0x170B9
+                >;
+        };
+
+        pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
+                fsl,pins = <
+                        MX6QDL_PAD_SD1_CMD__SD1_CMD     0x170F9
+                        MX6QDL_PAD_SD1_CLK__SD1_CLK     0x100F9
+                        MX6QDL_PAD_SD1_DAT0__SD1_DATA0  0x170F9
+                        MX6QDL_PAD_SD1_DAT1__SD1_DATA1  0x170F9
+                        MX6QDL_PAD_SD1_DAT2__SD1_DATA2  0x170F9
+                        MX6QDL_PAD_SD1_DAT3__SD1_DATA3  0x170F9
+                >;
+        };
+
+        pinctrl_usdhc2: usdhc2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD2_CMD__SD2_CMD     0x17059
+                        MX6QDL_PAD_SD2_CLK__SD2_CLK     0x10059
+                        MX6QDL_PAD_SD2_DAT0__SD2_DATA0  0x17059
+                        MX6QDL_PAD_SD2_DAT1__SD2_DATA1  0x17059
+                        MX6QDL_PAD_SD2_DAT2__SD2_DATA2  0x17059
+                        MX6QDL_PAD_SD2_DAT3__SD2_DATA3  0x17059
+                >;
+        };
+
+        pinctrl_usdhc3: usdhc3grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD3_CMD__SD3_CMD     0x17059
+                        MX6QDL_PAD_SD3_CLK__SD3_CLK     0x10059
+                        MX6QDL_PAD_SD3_DAT0__SD3_DATA0  0x17059
+                        MX6QDL_PAD_SD3_DAT1__SD3_DATA1  0x17059
+                        MX6QDL_PAD_SD3_DAT2__SD3_DATA2  0x17059
+                        MX6QDL_PAD_SD3_DAT3__SD3_DATA3  0x17059
+                >;
+        };
+};
+
+&pcie {
+        fsl,tx-swing-full = <103>;
+        fsl,tx-swing-low = <103>;
+        reset-gpio = <&gpio4 11 GPIO_ACTIVE_LOW>;
+        status = "disabled";
+};
+
+&pwm2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm2>;
+        status = "disabled";
+};
+
+&reg_arm {
+        vin-supply = <&sw1a_reg>;
+};
+
+&reg_pu {
+        vin-supply = <&sw1c_reg>;
+};
+
+&reg_soc {
+        vin-supply = <&sw1c_reg>;
+};
+
+&snvs_poweroff {
+        status = "okay";
+};
+
+&ssi2 {
+        status = "okay";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart1>;
+        status = "disabled";
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2 &pinctrl_bt>;
+        uart-has-rtscts;
+        status = "okay";
+
+        bluetooth {
+                compatible = "ti,wl1835-st";
+                enable-gpios = <&gpio6 18 GPIO_ACTIVE_HIGH>;
+        };
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart3>;
+        uart-has-rtscts;
+        status = "disabled";
+};
+
+&usbh1 {
+        status = "disabled";
+};
+
+&usbotg {
+        vbus-supply = <&reg_usb_otg_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg>;
+        disable-over-current;
+        status = "disabled";
+};
+
+&usdhc1 {
+        pinctrl-names = "default", "state_100mhz", "state_200mhz";
+        pinctrl-0 = <&pinctrl_usdhc1>;
+        pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
+        pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
+        bus-width = <4>;
+        vmmc-supply = <&reg_wl18xx_vmmc>;
+        non-removable;
+        wakeup-source;
+        keep-power-in-suspend;
+        cap-power-off-card;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        status = "okay";
+
+        wlcore: wlcore@2 {
+                compatible = "ti,wl1835";
+                reg = <2>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;
+                ref-clock-frequency = <38400000>;
+        };
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        no-1-8-v;
+        keep-power-in-suspend;
+        wakeup-source;
+        status = "disabled";
+};
+
+&usdhc3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc3>;
+        non-removable;
+        keep-power-in-suspend;
+        wakeup-source;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi
index 6d8d9ca96646..3a8a4952d45e 100644
--- a/arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi
@@ -21,6 +21,11 @@
         };
 };
 
+&hdmi {
+        ddc-i2c-bus = <&i2c2>;
+        status = "okay";
+};
+
 &i2c3 {
         clock-frequency = <100000>;
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
index 7812fbac963c..72f52fcecee1 100644
--- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
@@ -49,6 +49,7 @@
 
         aliases {
                 mdio-gpio0 = &mdio1;
+                rtc0 = &ds1341;
         };
 
         mdio1: mdio {
@@ -501,7 +502,7 @@
                 reg = <0x54>;
         };
 
-        rtc@68 {
+        ds1341: rtc@68 {
                 compatible = "dallas,ds1341";
                 reg = <0x68>;
         };
@@ -580,6 +581,17 @@
         pinctrl-0 = <&pinctrl_pcie>;
         reset-gpio = <&gpio7 12 GPIO_ACTIVE_LOW>;
         status = "okay";
+
+        host@0 {
+                reg = <0 0 0 0 0>;
+
+                #address-cells = <3>;
+                #size-cells = <2>;
+
+                i210: i210@0 {
+                        reg = <0 0 0 0 0>;
+                };
+        };
 };
 
 &usdhc2 {
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 1ce4eabf0590..59ff86695a14 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -80,6 +80,75 @@
                 };
         };
 
+        tempmon: tempmon {
+                compatible = "fsl,imx6q-tempmon";
+                interrupt-parent = <&gpc>;
+                interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;
+                fsl,tempmon = <&anatop>;
+                fsl,tempmon-data = <&ocotp>;
+                clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
+        };
+
+        ldb: ldb {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb";
+                gpr = <&gpr>;
+                status = "disabled";
+
+                lvds-channel@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        status = "disabled";
+
+                        port@0 {
+                                reg = <0>;
+
+                                lvds0_mux_0: endpoint {
+                                        remote-endpoint = <&ipu1_di0_lvds0>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                lvds0_mux_1: endpoint {
+                                        remote-endpoint = <&ipu1_di1_lvds0>;
+                                };
+                        };
+                };
+
+                lvds-channel@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        status = "disabled";
+
+                        port@0 {
+                                reg = <0>;
+
+                                lvds1_mux_0: endpoint {
+                                        remote-endpoint = <&ipu1_di0_lvds1>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                lvds1_mux_1: endpoint {
+                                        remote-endpoint = <&ipu1_di1_lvds1>;
+                                };
+                        };
+                };
+        };
+
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupt-parent = <&gpc>;
+                interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -224,11 +293,6 @@
                         status = "disabled";
                 };
 
-                pmu {
-                        compatible = "arm,cortex-a9-pmu";
-                        interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
-                };
-
                 aips-bus@2000000 { /* AIPS1 */
                         compatible = "fsl,aips-bus", "simple-bus";
                         #address-cells = <1>;
@@ -631,8 +695,11 @@
                                 interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>,
                                              <0 54 IRQ_TYPE_LEVEL_HIGH>,
                                              <0 127 IRQ_TYPE_LEVEL_HIGH>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
 
-                                regulator-1p1 {
+                                regulator-1p1@20c8110 {
+                                        reg = <0x20c8110>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd1p1";
                                         regulator-min-microvolt = <1000000>;
@@ -647,7 +714,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                regulator-3p0 {
+                                regulator-3p0@20c8120 {
+                                        reg = <0x20c8120>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd3p0";
                                         regulator-min-microvolt = <2800000>;
@@ -662,7 +730,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                regulator-2p5 {
+                                regulator-2p5@20c8130 {
+                                        reg = <0x20c8130>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd2p5";
                                         regulator-min-microvolt = <2250000>;
@@ -677,7 +746,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                reg_arm: regulator-vddcore {
+                                reg_arm: regulator-vddcore@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddarm";
                                         regulator-min-microvolt = <725000>;
@@ -694,7 +764,8 @@
                                         anatop-max-voltage = <1450000>;
                                 };
 
-                                reg_pu: regulator-vddpu {
+                                reg_pu: regulator-vddpu@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddpu";
                                         regulator-min-microvolt = <725000>;
@@ -711,7 +782,8 @@
                                         anatop-max-voltage = <1450000>;
                                 };
 
-                                reg_soc: regulator-vddsoc {
+                                reg_soc: regulator-vddsoc@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddsoc";
                                         regulator-min-microvolt = <725000>;
@@ -729,14 +801,6 @@
                                 };
                         };
 
-                        tempmon: tempmon {
-                                compatible = "fsl,imx6q-tempmon";
-                                interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;
-                                fsl,tempmon = <&anatop>;
-                                fsl,tempmon-data = <&ocotp>;
-                                clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
-                        };
-
                         usbphy1: usbphy@20c9000 {
                                 compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
                                 reg = <0x020c9000 0x1000>;
@@ -773,6 +837,10 @@
                                         mask = <0x60>;
                                         status = "disabled";
                                 };
+
+                                snvs_lpgpr: snvs-lpgpr {
+                                        compatible = "fsl,imx6q-snvs-lpgpr";
+                                };
                         };
 
                         epit1: epit@20d0000 { /* EPIT1 */
@@ -841,60 +909,6 @@
                                 reg = <0x20e0000 0x4000>;
                         };
 
-                        ldb: ldb {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb";
-                                gpr = <&gpr>;
-                                status = "disabled";
-
-                                lvds-channel@0 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <0>;
-                                        status = "disabled";
-
-                                        port@0 {
-                                                reg = <0>;
-
-                                                lvds0_mux_0: endpoint {
-                                                        remote-endpoint = <&ipu1_di0_lvds0>;
-                                                };
-                                        };
-
-                                        port@1 {
-                                                reg = <1>;
-
-                                                lvds0_mux_1: endpoint {
-                                                        remote-endpoint = <&ipu1_di1_lvds0>;
-                                                };
-                                        };
-                                };
-
-                                lvds-channel@1 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <1>;
-                                        status = "disabled";
-
-                                        port@0 {
-                                                reg = <0>;
-
-                                                lvds1_mux_0: endpoint {
-                                                        remote-endpoint = <&ipu1_di0_lvds1>;
-                                                };
-                                        };
-
-                                        port@1 {
-                                                reg = <1>;
-
-                                                lvds1_mux_1: endpoint {
-                                                        remote-endpoint = <&ipu1_di1_lvds1>;
-                                                };
-                                        };
-                                };
-                        };
-
                         dcic1: dcic@20e4000 {
                                 reg = <0x020e4000 0x4000>;
                                 interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>;
@@ -1017,6 +1031,7 @@
                         fec: ethernet@2188000 {
                                 compatible = "fsl,imx6q-fec";
                                 reg = <0x02188000 0x4000>;
+                                interrupt-names = "int0", "pps";
                                 interrupts-extended =
                                         <&intc 0 118 IRQ_TYPE_LEVEL_HIGH>,
                                         <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 60600b4cf5fe..2844ab541759 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -20,7 +20,7 @@
                 reg = <0x80000000 0x40000000>;
         };
 
-        backlight {
+        backlight_display: backlight_display {
                 compatible = "pwm-backlight";
                 pwms = <&pwm1 0 5000000>;
                 brightness-levels = <0 4 8 16 32 64 128 255>;
@@ -39,58 +39,54 @@
                 };
         };
 
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                reg_usb_otg1_vbus: regulator@0 {
-                        compatible = "regulator-fixed";
-                        reg = <0>;
-                        regulator-name = "usb_otg1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        gpio = <&gpio4 0 0>;
-                        enable-active-high;
-                        vin-supply = <&swbst_reg>;
-                };
+        reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_otg1_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio4 0 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                vin-supply = <&swbst_reg>;
+        };
 
-                reg_usb_otg2_vbus: regulator@1 {
-                        compatible = "regulator-fixed";
-                        reg = <1>;
-                        regulator-name = "usb_otg2_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        gpio = <&gpio4 2 0>;
-                        enable-active-high;
-                        vin-supply = <&swbst_reg>;
-                };
+        reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_otg2_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                vin-supply = <&swbst_reg>;
+        };
 
-                reg_aud3v: regulator@2 {
-                        compatible = "regulator-fixed";
-                        reg = <2>;
-                        regulator-name = "wm8962-supply-3v15";
-                        regulator-min-microvolt = <3150000>;
-                        regulator-max-microvolt = <3150000>;
-                        regulator-boot-on;
-                };
+        reg_aud3v: regulator-aud3v {
+                compatible = "regulator-fixed";
+                regulator-name = "wm8962-supply-3v15";
+                regulator-min-microvolt = <3150000>;
+                regulator-max-microvolt = <3150000>;
+                regulator-boot-on;
+        };
 
-                reg_aud4v: regulator@3 {
-                        compatible = "regulator-fixed";
-                        reg = <3>;
-                        regulator-name = "wm8962-supply-4v2";
-                        regulator-min-microvolt = <4325000>;
-                        regulator-max-microvolt = <4325000>;
-                        regulator-boot-on;
-                };
+        reg_aud4v: regulator-aud4v {
+                compatible = "regulator-fixed";
+                regulator-name = "wm8962-supply-4v2";
+                regulator-min-microvolt = <4325000>;
+                regulator-max-microvolt = <4325000>;
+                regulator-boot-on;
+        };
 
-                reg_lcd_3v3: regulator@4 {
-                        compatible = "regulator-fixed";
-                        reg = <4>;
-                        regulator-name = "lcd-3v3";
-                        gpio = <&gpio4 3 0>;
-                        enable-active-high;
-                };
+        reg_lcd_3v3: regulator-lcd-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "lcd-3v3";
+                gpio = <&gpio4 3 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_lcd_5v: regulator-lcd-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "lcd-5v0";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
         };
 
         sound {
@@ -108,6 +104,19 @@
                 mux-int-port = <2>;
                 mux-ext-port = <3>;
         };
+
+        panel {
+                compatible = "sii,43wvf1g";
+                backlight = <&backlight_display>;
+                dvdd-supply = <&reg_lcd_3v3>;
+                avdd-supply = <&reg_lcd_5v>;
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&display_out>;
+                        };
+                };
+        };
 };
 
 &audmux {
@@ -546,31 +555,11 @@
 &lcdif {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_lcd>;
-        lcd-supply = <&reg_lcd_3v3>;
-        display = <&display0>;
         status = "okay";
 
-        display0: display0 {
-                bits-per-pixel = <32>;
-                bus-width = <24>;
-
-                display-timings {
-                        native-mode = <&timing0>;
-                        timing0: timing0 {
-                                clock-frequency = <33500000>;
-                                hactive = <800>;
-                                vactive = <480>;
-                                hback-porch = <89>;
-                                hfront-porch = <164>;
-                                vback-porch = <23>;
-                                vfront-porch = <10>;
-                                hsync-len = <10>;
-                                vsync-len = <10>;
-                                hsync-active = <0>;
-                                vsync-active = <0>;
-                                de-active = <1>;
-                                pixelclk-active = <0>;
-                        };
+        port {
+                display_out: endpoint {
+                        remote-endpoint = <&panel_in>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 3ea1a41893c8..ae8df3cf687e 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -102,6 +102,21 @@
                 };
         };
 
+        tempmon: tempmon {
+                compatible = "fsl,imx6q-tempmon";
+                interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-parent = <&gpc>;
+                fsl,tempmon = <&anatop>;
+                fsl,tempmon-data = <&ocotp>;
+                clocks = <&clks IMX6SL_CLK_PLL3_USB_OTG>;
+        };
+
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupt-parent = <&gpc>;
+                interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -125,11 +140,6 @@
                         arm,data-latency = <4 2 3>;
                 };
 
-                pmu {
-                        compatible = "arm,cortex-a9-pmu";
-                        interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
-                };
-
                 aips1: aips-bus@2000000 {
                         compatible = "fsl,aips-bus", "simple-bus";
                         #address-cells = <1>;
@@ -517,8 +527,11 @@
                                 interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>,
                                              <0 54 IRQ_TYPE_LEVEL_HIGH>,
                                              <0 127 IRQ_TYPE_LEVEL_HIGH>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
 
-                                regulator-1p1 {
+                                regulator-1p1@20c8110 {
+                                        reg = <0x20c8110>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd1p1";
                                         regulator-min-microvolt = <800000>;
@@ -533,7 +546,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                regulator-3p0 {
+                                regulator-3p0@20c8120 {
+                                        reg = <0x20c8120>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd3p0";
                                         regulator-min-microvolt = <2800000>;
@@ -548,7 +562,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                regulator-2p5 {
+                                regulator-2p5@20c8130 {
+                                        reg = <0x20c8130>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd2p5";
                                         regulator-min-microvolt = <2100000>;
@@ -563,7 +578,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                reg_arm: regulator-vddcore {
+                                reg_arm: regulator-vddcore@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddarm";
                                         regulator-min-microvolt = <725000>;
@@ -580,7 +596,8 @@
                                         anatop-max-voltage = <1450000>;
                                 };
 
-                                reg_pu: regulator-vddpu {
+                                reg_pu: regulator-vddpu@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddpu";
                                         regulator-min-microvolt = <725000>;
@@ -597,7 +614,8 @@
                                         anatop-max-voltage = <1450000>;
                                 };
 
-                                reg_soc: regulator-vddsoc {
+                                reg_soc: regulator-vddsoc@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddsoc";
                                         regulator-min-microvolt = <725000>;
@@ -615,14 +633,6 @@
                                 };
                         };
 
-                        tempmon: tempmon {
-                                compatible = "fsl,imx6q-tempmon";
-                                interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;
-                                fsl,tempmon = <&anatop>;
-                                fsl,tempmon-data = <&ocotp>;
-                                clocks = <&clks IMX6SL_CLK_PLL3_USB_OTG>;
-                        };
-
                         usbphy1: usbphy@20c9000 {
                                 compatible = "fsl,imx6sl-usbphy", "fsl,imx23-usbphy";
                                 reg = <0x020c9000 0x1000>;
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index da815527a7f8..d35aa858f9db 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -24,7 +24,7 @@
                 reg = <0x80000000 0x40000000>;
         };
 
-        backlight {
+        backlight_display: backlight-display {
                 compatible = "pwm-backlight";
                 pwms = <&pwm3 0 5000000>;
                 brightness-levels = <0 4 8 16 32 64 128 255>;
@@ -49,86 +49,91 @@
                 };
         };
 
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
+        vcc_sd3: regulator-vcc-sd3 {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_vcc_sd3>;
+                regulator-name = "VCC_SD3";
+                regulator-min-microvolt = <3000000>;
+                regulator-max-microvolt = <3000000>;
+                gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
 
-                vcc_sd3: regulator@0 {
-                        compatible = "regulator-fixed";
-                        reg = <0>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_vcc_sd3>;
-                        regulator-name = "VCC_SD3";
-                        regulator-min-microvolt = <3000000>;
-                        regulator-max-microvolt = <3000000>;
-                        gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
+        reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_usb_otg1>;
+                regulator-name = "usb_otg1_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
 
-                reg_usb_otg1_vbus: regulator@1 {
-                        compatible = "regulator-fixed";
-                        reg = <1>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_usb_otg1>;
-                        regulator-name = "usb_otg1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
+        reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_usb_otg2>;
+                regulator-name = "usb_otg2_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
 
-                reg_usb_otg2_vbus: regulator@2 {
-                        compatible = "regulator-fixed";
-                        reg = <2>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_usb_otg2>;
-                        regulator-name = "usb_otg2_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
-
-                reg_psu_5v: regulator@3 {
-                        compatible = "regulator-fixed";
-                        reg = <3>;
-                        regulator-name = "PSU-5V0";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                };
-
-                reg_lcd_3v3: regulator@4 {
-                        compatible = "regulator-fixed";
-                        reg = <4>;
-                        regulator-name = "lcd-3v3";
-                        gpio = <&gpio3 27 0>;
-                        enable-active-high;
-                };
-
-                reg_peri_3v3: regulator@5 {
-                        compatible = "regulator-fixed";
-                        reg = <5>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_peri_3v3>;
-                        regulator-name = "peri_3v3";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                        regulator-always-on;
-                };
-
-                reg_enet_3v3: regulator@6 {
-                        compatible = "regulator-fixed";
-                        reg = <6>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_enet_3v3>;
-                        regulator-name = "enet_3v3";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
-                };
+        reg_psu_5v: regulator-psu-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "PSU-5V0";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+        };
+
+        reg_lcd_3v3: regulator-lcd-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "lcd-3v3";
+                gpio = <&gpio3 27 0>;
+                enable-active-high;
+        };
+
+        reg_peri_3v3: regulator-peri-3v3 {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_peri_3v3>;
+                regulator-name = "peri_3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                regulator-always-on;
+        };
+
+        reg_enet_3v3: regulator-enet-3v3 {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_enet_3v3>;
+                regulator-name = "enet_3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
+        };
+
+        reg_pcie_gpio: regulator-pcie-gpio {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_pcie_reg>;
+                regulator-name = "MPCIE_3V3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_lcd_5v: regulator-lcd-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "lcd-5v0";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
         };
 
         sound {
@@ -146,6 +151,19 @@
                 mux-int-port = <2>;
                 mux-ext-port = <6>;
         };
+
+        panel {
+                compatible = "sii,43wvf1g";
+                backlight = <&backlight_display>;
+                dvdd-supply = <&reg_lcd_3v3>;
+                avdd-supply = <&reg_lcd_5v>;
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&display_out>;
+                        };
+                };
+        };
 };
 
 &audmux {
@@ -212,34 +230,22 @@
         };
 };
 
+&pcie {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pcie>;
+        reset-gpio = <&gpio2 0 GPIO_ACTIVE_LOW>;
+        vpcie-supply = <&reg_pcie_gpio>;
+        status = "okay";
+};
+
 &lcdif1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_lcd>;
-        lcd-supply = <&reg_lcd_3v3>;
-        display = <&display0>;
         status = "okay";
 
-        display0: display0 {
-                bits-per-pixel = <16>;
-                bus-width = <24>;
-
-                display-timings {
-                        native-mode = <&timing0>;
-                        timing0: timing0 {
-                                clock-frequency = <33500000>;
-                                hactive = <800>;
-                                vactive = <480>;
-                                hback-porch = <89>;
-                                hfront-porch = <164>;
-                                vback-porch = <23>;
-                                vfront-porch = <10>;
-                                hsync-len = <10>;
-                                vsync-len = <10>;
-                                hsync-active = <0>;
-                                vsync-active = <0>;
-                                de-active = <1>;
-                                pixelclk-active = <0>;
-                        };
+        port {
+                display_out: endpoint {
+                        remote-endpoint = <&panel_in>;
                 };
         };
 };
@@ -453,6 +459,18 @@
                         >;
                 };
 
+                pinctrl_pcie: pciegrp {
+                        fsl,pins = <
+                                MX6SX_PAD_ENET1_COL__GPIO2_IO_0 0x10b0
+                        >;
+                };
+
+                pinctrl_pcie_reg: pciereggrp {
+                        fsl,pins = <
+                                MX6SX_PAD_ENET1_CRS__GPIO2_IO_1 0x10b0
+                        >;
+                };
+
                 pinctrl_peri_3v3: peri3v3grp {
                         fsl,pins = <
                                 MX6SX_PAD_QSPI1A_DATA0__GPIO4_IO_16     0x80000000
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 5b03ba3beda9..fd7879342d0d 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -141,6 +141,22 @@
                 };
         };
 
+        tempmon: tempmon {
+                compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
+                interrupt-parent = <&gpc>;
+                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+                fsl,tempmon = <&anatop>;
+                nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
+                nvmem-cell-names = "calib", "temp_grade";
+                clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
+        };
+
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupt-parent = <&gpc>;
+                interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -148,11 +164,6 @@
                 interrupt-parent = <&gpc>;
                 ranges;
 
-                pmu {
-                        compatible = "arm,cortex-a9-pmu";
-                        interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
-                };
-
                 ocram: sram@900000 {
                         compatible = "mmio-sram";
                         reg = <0x00900000 0x20000>;
@@ -574,8 +585,11 @@
                                 interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
                                              <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
                                              <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
 
-                                regulator-1p1 {
+                                regulator-1p1@20c8110 {
+                                        reg = <0x20c8110>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd1p1";
                                         regulator-min-microvolt = <800000>;
@@ -590,7 +604,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                regulator-3p0 {
+                                regulator-3p0@20c8120 {
+                                        reg = <0x20c8120>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd3p0";
                                         regulator-min-microvolt = <2800000>;
@@ -605,7 +620,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                regulator-2p5 {
+                                regulator-2p5@20c8130 {
+                                        reg = <0x20c8130>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd2p5";
                                         regulator-min-microvolt = <2100000>;
@@ -620,7 +636,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                reg_arm: regulator-vddcore {
+                                reg_arm: regulator-vddcore@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddarm";
                                         regulator-min-microvolt = <725000>;
@@ -637,7 +654,8 @@
                                         anatop-max-voltage = <1450000>;
                                 };
 
-                                reg_pcie: regulator-vddpcie {
+                                reg_pcie: regulator-vddpcie@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddpcie";
                                         regulator-min-microvolt = <725000>;
@@ -653,7 +671,8 @@
                                         anatop-max-voltage = <1450000>;
                                 };
 
-                                reg_soc: regulator-vddsoc {
+                                reg_soc: regulator-vddsoc@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddsoc";
                                         regulator-min-microvolt = <725000>;
@@ -671,15 +690,6 @@
                                 };
                         };
 
-                        tempmon: tempmon {
-                                compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
-                                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
-                                fsl,tempmon = <&anatop>;
-                                nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
-                                nvmem-cell-names = "calib", "temp_grade";
-                                clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
-                        };
-
                         usbphy1: usbphy@20c9000 {
                                 compatible = "fsl,imx6sx-usbphy", "fsl,imx23-usbphy";
                                 reg = <0x020c9000 0x1000>;
@@ -750,6 +760,19 @@
                                 #interrupt-cells = <3>;
                                 interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
                                 interrupt-parent = <&intc>;
+                                clocks = <&clks IMX6SX_CLK_IPG>;
+                                clock-names = "ipg";
+
+                                pgc {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        pd_pci: power-domain@3 {
+                                                reg = <3>;
+                                                #power-domain-cells = <0>;
+                                                power-supply = <&reg_pcie>;
+                                        };
+                                };
                         };
 
                         iomuxc: iomuxc@20e0000 {
@@ -862,6 +885,7 @@
                         fec1: ethernet@2188000 {
                                 compatible = "fsl,imx6sx-fec", "fsl,imx6q-fec";
                                 reg = <0x02188000 0x4000>;
+                                interrupt-names = "int0", "pps";
                                 interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
                                              <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6SX_CLK_ENET>,
@@ -971,6 +995,7 @@
                         fec2: ethernet@21b4000 {
                                 compatible = "fsl,imx6sx-fec", "fsl,imx6q-fec";
                                 reg = <0x021b4000 0x4000>;
+                                interrupt-names = "int0", "pps";
                                 interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
                                              <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6SX_CLK_ENET>,
@@ -1138,7 +1163,7 @@
                         reg = <0x02200000 0x100000>;
                         ranges;
 
-                        spba-bus@2200000 {
+                        spba-bus@2240000 {
                                 compatible = "fsl,spba-bus", "simple-bus";
                                 #address-cells = <1>;
                                 #size-cells = <1>;
@@ -1304,25 +1329,29 @@
 
                 pcie: pcie@8ffc000 {
                         compatible = "fsl,imx6sx-pcie", "snps,dw-pcie";
-                        reg = <0x08ffc000 0x4000>; /* DBI */
+                        reg = <0x08ffc000 0x04000>, <0x08f00000 0x80000>;
+                        reg-names = "dbi", "config";
                         #address-cells = <3>;
                         #size-cells = <2>;
                         device_type = "pci";
-                                  /* configuration space */
-                        ranges = <0x00000800 0 0x08f00000 0x08f00000 0 0x00080000
-                                  /* downstream I/O */
-                                  0x81000000 0 0          0x08f80000 0 0x00010000
-                                  /* non-prefetchable memory */
-                                  0x82000000 0 0x08000000 0x08000000 0 0x00f00000>;
                         bus-range = <0x00 0xff>;
+                        ranges = <0x81000000 0 0          0x08f80000 0 0x00010000 /* downstream I/O */
+                                  0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */
                         num-lanes = <1>;
                         interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clks IMX6SX_CLK_PCIE_REF_125M>,
-                                 <&clks IMX6SX_CLK_PCIE_AXI>,
+                        interrupt-names = "msi";
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0x7>;
+                        interrupt-map = <0 0 0 1 &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                        <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                        <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                        <0 0 0 4 &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clks IMX6SX_CLK_PCIE_AXI>,
                                  <&clks IMX6SX_CLK_LVDS1_OUT>,
+                                 <&clks IMX6SX_CLK_PCIE_REF_125M>,
                                  <&clks IMX6SX_CLK_DISPLAY_AXI>;
-                        clock-names = "pcie_ref_125m", "pcie_axi",
-                                      "lvds_gate", "display_axi";
+                        clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_inbound_axi";
+                        power-domains = <&pd_pci>;
                         status = "disabled";
                 };
         };
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index e5d3ef88be60..18fdb088ba1e 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -30,19 +30,14 @@
                 status = "okay";
         };
 
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
 
-                reg_sd1_vmmc: sd1_regulator {
-                        compatible = "regulator-fixed";
-                        regulator-name = "VSD_3V3";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
+        reg_sd1_vmmc: regulator-sd1-vmmc {
+                compatible = "regulator-fixed";
+                regulator-name = "VSD_3V3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
         };
 
         sound {
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index d5181f85ca9c..1b14e4d39c26 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -136,6 +136,23 @@
                 clock-output-names = "ipp_di1";
         };
 
+        tempmon: tempmon {
+                compatible = "fsl,imx6ul-tempmon", "fsl,imx6sx-tempmon";
+                interrupt-parent = <&gpc>;
+                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+                fsl,tempmon = <&anatop>;
+                nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
+                nvmem-cell-names = "calib", "temp_grade";
+                clocks = <&clks IMX6UL_CLK_PLL3_USB_OTG>;
+        };
+
+        pmu {
+                compatible = "arm,cortex-a7-pmu";
+                interrupt-parent = <&gpc>;
+                interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -143,12 +160,6 @@
                 interrupt-parent = <&gpc>;
                 ranges;
 
-                pmu {
-                        compatible = "arm,cortex-a7-pmu";
-                        interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
-                        status = "disabled";
-                };
-
                 ocram: sram@900000 {
                         compatible = "mmio-sram";
                         reg = <0x00900000 0x20000>;
@@ -476,6 +487,7 @@
                         fec2: ethernet@20b4000 {
                                 compatible = "fsl,imx6ul-fec", "fsl,imx6q-fec";
                                 reg = <0x020b4000 0x4000>;
+                                interrupt-names = "int0", "pps";
                                 interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
                                              <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6UL_CLK_ENET>,
@@ -530,8 +542,11 @@
                                 interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
                                              <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
                                              <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
 
-                                reg_3p0: regulator-3p0 {
+                                reg_3p0: regulator-3p0@20c8110 {
+                                        reg = <0x20c8110>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd3p0";
                                         regulator-min-microvolt = <2625000>;
@@ -545,7 +560,8 @@
                                         anatop-enable-bit = <0>;
                                 };
 
-                                reg_arm: regulator-vddcore {
+                                reg_arm: regulator-vddcore@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "cpu";
                                         regulator-min-microvolt = <725000>;
@@ -562,7 +578,8 @@
                                         anatop-max-voltage = <1450000>;
                                 };
 
-                                reg_soc: regulator-vddsoc {
+                                reg_soc: regulator-vddsoc@20c8140 {
+                                        reg = <0x20c8140>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vddsoc";
                                         regulator-min-microvolt = <725000>;
@@ -598,15 +615,6 @@
                                 fsl,anatop = <&anatop>;
                         };
 
-                        tempmon: tempmon {
-                                compatible = "fsl,imx6ul-tempmon", "fsl,imx6sx-tempmon";
-                                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
-                                fsl,tempmon = <&anatop>;
-                                nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
-                                nvmem-cell-names = "calib", "temp_grade";
-                                clocks = <&clks IMX6UL_CLK_PLL3_USB_OTG>;
-                        };
-
                         snvs: snvs@20cc000 {
                                 compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
                                 reg = <0x020cc000 0x4000>;
@@ -635,6 +643,10 @@
                                         linux,keycode = <KEY_POWER>;
                                         wakeup-source;
                                 };
+
+                                snvs_lpgpr: snvs-lpgpr {
+                                        compatible = "fsl,imx6ul-snvs-lpgpr";
+                                };
                         };
 
                         epit1: epit@20d0000 {
@@ -784,6 +796,7 @@
                         fec1: ethernet@2188000 {
                                 compatible = "fsl,imx6ul-fec", "fsl,imx6q-fec";
                                 reg = <0x02188000 0x4000>;
+                                interrupt-names = "int0", "pps";
                                 interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
                                              <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6UL_CLK_ENET>,
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 18bebd6d8d47..3f2746169181 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -45,6 +45,13 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        /* fixed crystal dedicated to mpc258x */
+        clk16m: clk16m {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <16000000>;
+        };
+
         panel: panel {
                 compatible = "edt,et057090dhu";
                 backlight = <&bl>;
@@ -70,6 +77,17 @@
                 regulator-min-microvolt = <5000000>;
                 regulator-max-microvolt = <5000000>;
         };
+
+        reg_usbh_vbus: regulator-usbh-vbus {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_usbh_reg>;
+                regulator-name = "VCC_USB[1-4]";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;
+                vin-supply = <&reg_5v0>;
+        };
 };
 
 &bl {
@@ -88,6 +106,24 @@
         status = "okay";
 };
 
+&ecspi3 {
+        status = "okay";
+
+        mcp2515: can@0 {
+                compatible = "microchip,mcp2515";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_can_int>;
+                reg = <0>;
+                clocks = <&clk16m>;
+                interrupt-parent = <&gpio5>;
+                interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
+                spi-max-frequency = <10000000>;
+                vdd-supply = <&reg_3v3>;
+                xceiver-supply = <&reg_5v0>;
+                status = "okay";
+        };
+};
+
 &fec1 {
         status = "okay";
 };
@@ -97,7 +133,7 @@
 
         /* M41T0M6 real time clock on carrier board */
         rtc: m41t0m6@68 {
-                compatible = "st,m41t00";
+                compatible = "st,m41t0";
                 reg = <0x68>;
         };
 };
@@ -147,5 +183,6 @@
 &usdhc1 {
         keep-power-in-suspend;
         wakeup-source;
+        vmmc-supply = <&reg_3v3>;
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index bb5bf94f1a32..895fbde4d433 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -43,7 +43,10 @@
 / {
         bl: backlight {
                 compatible = "pwm-backlight";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_gpio_bl_on>;
                 pwms = <&pwm1 0 5000000 0>;
+                enable-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
         };
 
         reg_module_3v3: regulator-module-3v3 {
@@ -86,7 +89,13 @@
 };
 
 &cpu0 {
-        arm-supply = <&reg_DCDC2>;
+        cpu-supply = <&reg_DCDC2>;
+};
+
+&ecspi3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>;
+        cs-gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>;
 };
 
 &fec1 {
@@ -112,7 +121,6 @@
         fsl,use-minimum-ecc;
         nand-on-flash-bbt;
         nand-ecc-mode = "hw";
-        status = "okay";
 };
 
 &i2c1 {
@@ -299,6 +307,22 @@
         no-1-8-v;
         cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
         disable-wp;
+        vqmmc-supply = <&reg_LDO2>;
+};
+
+&usdhc3 {
+        pinctrl-names = "default", "state_100mhz", "state_200mhz";
+        pinctrl-0 = <&pinctrl_usdhc3>;
+        pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+        pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+        assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>;
+        assigned-clock-rates = <400000000>;
+        bus-width = <8>;
+        fsl,tuning-step = <2>;
+        max-frequency = <100000000>;
+        vmmc-supply = <&reg_module_3v3>;
+        vqmmc-supply = <&reg_DCDC3>;
+        non-removable;
 };
 
 &iomuxc {
@@ -307,17 +331,16 @@
 
         pinctrl_gpio1: gpio1-grp {
                 fsl,pins = <
-                        MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3     0x14 /* SODIMM 55 */
-                        MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2     0x14 /* SODIMM 63 */
-                        MX7D_PAD_SD1_RESET_B__GPIO5_IO2         0X14 /* SODIMM 73 */
-                        MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16       0X14 /* SODIMM 77 */
+                        MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3     0x74 /* SODIMM 55 */
+                        MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2     0x74 /* SODIMM 63 */
+                        MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16       0x14 /* SODIMM 77 */
                         MX7D_PAD_EPDC_DATA09__GPIO2_IO9         0x14 /* SODIMM 89 */
-                        MX7D_PAD_EPDC_DATA08__GPIO2_IO8         0x14 /* SODIMM 91 */
+                        MX7D_PAD_EPDC_DATA08__GPIO2_IO8         0x74 /* SODIMM 91 */
                         MX7D_PAD_LCD_RESET__GPIO3_IO4           0x14 /* SODIMM 93 */
                         MX7D_PAD_EPDC_DATA13__GPIO2_IO13        0x14 /* SODIMM 95 */
                         MX7D_PAD_ENET1_RGMII_TXC__GPIO7_IO11    0x14 /* SODIMM 99 */
-                        MX7D_PAD_EPDC_DATA10__GPIO2_IO10        0x14 /* SODIMM 105 */
-                        MX7D_PAD_EPDC_DATA15__GPIO2_IO15        0x14 /* SODIMM 107 */
+                        MX7D_PAD_EPDC_DATA10__GPIO2_IO10        0x74 /* SODIMM 105 */
+                        MX7D_PAD_EPDC_DATA15__GPIO2_IO15        0x74 /* SODIMM 107 */
                         MX7D_PAD_EPDC_DATA00__GPIO2_IO0         0x14 /* SODIMM 111 */
                         MX7D_PAD_EPDC_DATA01__GPIO2_IO1         0x14 /* SODIMM 113 */
                         MX7D_PAD_EPDC_DATA02__GPIO2_IO2         0x14 /* SODIMM 115 */
@@ -329,11 +352,12 @@
                         MX7D_PAD_EPDC_SDCE2__GPIO2_IO22         0x14 /* SODIMM 127 */
                         MX7D_PAD_UART3_RTS_B__GPIO4_IO6         0x14 /* SODIMM 131 */
                         MX7D_PAD_EPDC_GDRL__GPIO2_IO26          0x14 /* SODIMM 133 */
+                        MX7D_PAD_SAI1_RX_DATA__GPIO6_IO12       0x14 /* SODIMM 169 */
                         MX7D_PAD_SAI1_RX_BCLK__GPIO6_IO17       0x14 /* SODIMM 24 */
                         MX7D_PAD_SD2_DATA2__GPIO5_IO16          0x14 /* SODIMM 100 */
                         MX7D_PAD_SD2_DATA3__GPIO5_IO17          0x14 /* SODIMM 102 */
                         MX7D_PAD_EPDC_GDSP__GPIO2_IO27          0x14 /* SODIMM 104 */
-                        MX7D_PAD_EPDC_BDR0__GPIO2_IO28          0x14 /* SODIMM 106 */
+                        MX7D_PAD_EPDC_BDR0__GPIO2_IO28          0x74 /* SODIMM 106 */
                         MX7D_PAD_EPDC_BDR1__GPIO2_IO29          0x14 /* SODIMM 110 */
                         MX7D_PAD_EPDC_PWR_COM__GPIO2_IO30       0x14 /* SODIMM 112 */
                         MX7D_PAD_EPDC_SDCLK__GPIO2_IO16         0x14 /* SODIMM 114 */
@@ -357,8 +381,7 @@
         pinctrl_gpio2: gpio2-grp { /* On X22 Camera interface */
                 fsl,pins = <
                         MX7D_PAD_ECSPI2_SS0__GPIO4_IO23         0x14 /* SODIMM 65 */
-                        MX7D_PAD_SD1_CD_B__GPIO5_IO0            0x14 /* SODIMM 69 */
-                        MX7D_PAD_SD1_WP__GPIO5_IO1              0x14 /* SODIMM 71 */
+                        MX7D_PAD_SD1_CD_B__GPIO5_IO0            0x74 /* SODIMM 69 */
                         MX7D_PAD_I2C4_SDA__GPIO4_IO15           0x14 /* SODIMM 75 */
                         MX7D_PAD_ECSPI1_MISO__GPIO4_IO18        0x14 /* SODIMM 79 */
                         MX7D_PAD_I2C3_SCL__GPIO4_IO12           0x14 /* SODIMM 81 */
@@ -378,8 +401,8 @@
                         MX7D_PAD_LCD_DATA19__GPIO3_IO24         0x14 /* SODIMM 138 */
                         MX7D_PAD_LCD_DATA20__GPIO3_IO25         0x14 /* SODIMM 140 */
                         MX7D_PAD_LCD_DATA21__GPIO3_IO26         0x14 /* SODIMM 142 */
-                        MX7D_PAD_LCD_DATA22__GPIO3_IO27         0x14 /* SODIMM 146 */
-                        MX7D_PAD_LCD_DATA23__GPIO3_IO28         0x14 /* SODIMM 148 */
+                        MX7D_PAD_LCD_DATA22__GPIO3_IO27         0x74 /* SODIMM 144 */
+                        MX7D_PAD_LCD_DATA23__GPIO3_IO28         0x74 /* SODIMM 146 */
                 >;
         };
 
@@ -396,6 +419,12 @@
                 >;
         };
 
+        pinctrl_can_int: can-int-grp {
+                fsl,pins = <
+                        MX7D_PAD_SD1_RESET_B__GPIO5_IO2         0X14 /* SODIMM 73 */
+                >;
+        };
+
         pinctrl_enet1: enet1grp {
                 fsl,pins = <
                         MX7D_PAD_ENET1_CRS__GPIO7_IO14                  0x14
@@ -434,12 +463,17 @@
                 >;
         };
 
+        pinctrl_gpio_bl_on: gpio-bl-on {
+                fsl,pins = <
+                        MX7D_PAD_SD1_WP__GPIO5_IO1              0x14 /* SODIMM 71 */
+                >;
+        };
+
         pinctrl_gpmi_nand: gpmi-nand-grp {
                 fsl,pins = <
                         MX7D_PAD_SD3_CLK__NAND_CLE              0x71
                         MX7D_PAD_SD3_CMD__NAND_ALE              0x71
                         MX7D_PAD_SAI1_TX_BCLK__NAND_CE0_B       0x71
-                        MX7D_PAD_SAI1_RX_DATA__NAND_CE1_B       0x71
                         MX7D_PAD_SAI1_TX_DATA__NAND_READY_B     0x74
                         MX7D_PAD_SD3_STROBE__NAND_RE_B          0x71
                         MX7D_PAD_SD3_RESET_B__NAND_WE_B         0x71
@@ -507,6 +541,7 @@
         pinctrl_pwm1: pwm1-grp {
                 fsl,pins = <
                         MX7D_PAD_GPIO1_IO08__PWM1_OUT           0x79
+                        MX7D_PAD_ECSPI2_MOSI__GPIO4_IO21        0x4
                 >;
         };
 
@@ -525,6 +560,7 @@
         pinctrl_pwm4: pwm4-grp {
                 fsl,pins = <
                         MX7D_PAD_GPIO1_IO11__PWM4_OUT           0x79
+                        MX7D_PAD_ECSPI2_SCLK__GPIO4_IO20        0x4
                 >;
         };
 
@@ -559,7 +595,7 @@
                 >;
         };
 
-        pinctrl_usbotg2_reg: gpio-usbotg2-vbus {
+        pinctrl_usbh_reg: gpio-usbh-vbus {
                 fsl,pins = <
                         MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 /* SODIMM 129 USBH PEN */
                 >;
@@ -576,6 +612,54 @@
                 >;
         };
 
+        pinctrl_usdhc3: usdhc3grp {
+                fsl,pins = <
+                        MX7D_PAD_SD3_CMD__SD3_CMD               0x59
+                        MX7D_PAD_SD3_CLK__SD3_CLK               0x19
+                        MX7D_PAD_SD3_DATA0__SD3_DATA0           0x59
+                        MX7D_PAD_SD3_DATA1__SD3_DATA1           0x59
+                        MX7D_PAD_SD3_DATA2__SD3_DATA2           0x59
+                        MX7D_PAD_SD3_DATA3__SD3_DATA3           0x59
+                        MX7D_PAD_SD3_DATA4__SD3_DATA4           0x59
+                        MX7D_PAD_SD3_DATA5__SD3_DATA5           0x59
+                        MX7D_PAD_SD3_DATA6__SD3_DATA6           0x59
+                        MX7D_PAD_SD3_DATA7__SD3_DATA7           0x59
+                        MX7D_PAD_SD3_STROBE__SD3_STROBE         0x19
+                >;
+        };
+
+        pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
+                fsl,pins = <
+                        MX7D_PAD_SD3_CMD__SD3_CMD               0x5a
+                        MX7D_PAD_SD3_CLK__SD3_CLK               0x1a
+                        MX7D_PAD_SD3_DATA0__SD3_DATA0           0x5a
+                        MX7D_PAD_SD3_DATA1__SD3_DATA1           0x5a
+                        MX7D_PAD_SD3_DATA2__SD3_DATA2           0x5a
+                        MX7D_PAD_SD3_DATA3__SD3_DATA3           0x5a
+                        MX7D_PAD_SD3_DATA4__SD3_DATA4           0x5a
+                        MX7D_PAD_SD3_DATA5__SD3_DATA5           0x5a
+                        MX7D_PAD_SD3_DATA6__SD3_DATA6           0x5a
+                        MX7D_PAD_SD3_DATA7__SD3_DATA7           0x5a
+                        MX7D_PAD_SD3_STROBE__SD3_STROBE         0x1a
+                >;
+        };
+
+        pinctrl_usdhc3_200mhz: usdhc3grp_200mhz {
+                fsl,pins = <
+                        MX7D_PAD_SD3_CMD__SD3_CMD               0x5b
+                        MX7D_PAD_SD3_CLK__SD3_CLK               0x1b
+                        MX7D_PAD_SD3_DATA0__SD3_DATA0           0x5b
+                        MX7D_PAD_SD3_DATA1__SD3_DATA1           0x5b
+                        MX7D_PAD_SD3_DATA2__SD3_DATA2           0x5b
+                        MX7D_PAD_SD3_DATA3__SD3_DATA3           0x5b
+                        MX7D_PAD_SD3_DATA4__SD3_DATA4           0x5b
+                        MX7D_PAD_SD3_DATA5__SD3_DATA5           0x5b
+                        MX7D_PAD_SD3_DATA6__SD3_DATA6           0x5b
+                        MX7D_PAD_SD3_DATA7__SD3_DATA7           0x5b
+                        MX7D_PAD_SD3_STROBE__SD3_STROBE         0x1b
+                >;
+        };
+
         pinctrl_sai1: sai1-grp {
                 fsl,pins = <
                         MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK     0x1f
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
new file mode 100644
index 000000000000..8ee73c870b12
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2017 Toradex AG
+ */
+
+/dts-v1/;
+#include "imx7d-colibri-emmc.dtsi"
+#include "imx7-colibri-eval-v3.dtsi"
+
+/ {
+        model = "Toradex Colibri iMX7D 1GB (eMMC) on Colibri Evaluation Board V3";
+        compatible = "toradex,colibri-imx7d-emmc-eval-v3",
+                     "toradex,colibri-imx7d-emmc", "fsl,imx7d";
+};
+
+&usbotg2 {
+        vbus-supply = <&reg_usbh_vbus>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
new file mode 100644
index 000000000000..9b63b9c89e4b
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2017 Toradex AG
+ */
+
+#include "imx7d.dtsi"
+#include "imx7-colibri.dtsi"
+
+/ {
+        memory {
+                reg = <0x80000000 0x40000000>;
+        };
+};
+
+&usbotg2 {
+        dr_mode = "host";
+};
+
+&usdhc3 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
index a608a14d8c85..136e11ab4893 100644
--- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
@@ -48,20 +48,9 @@
         model = "Toradex Colibri iMX7D on Colibri Evaluation Board V3";
         compatible = "toradex,colibri-imx7d-eval-v3", "toradex,colibri-imx7d",
                      "fsl,imx7d";
-
-        reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
-                compatible = "regulator-fixed";
-                pinctrl-names = "default";
-                pinctrl-0 = <&pinctrl_usbotg2_reg>;
-                regulator-name = "VCC_USB[1-4]";
-                regulator-min-microvolt = <5000000>;
-                regulator-max-microvolt = <5000000>;
-                gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;
-                vin-supply = <&reg_5v0>;
-        };
 };
 
 &usbotg2 {
-        vbus-supply = <&reg_usb_otg2_vbus>;
+        vbus-supply = <&reg_usbh_vbus>;
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi b/arch/arm/boot/dts/imx7d-colibri.dtsi
index 3c2cb502b388..6f2bb70c1fbd 100644
--- a/arch/arm/boot/dts/imx7d-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri.dtsi
@@ -49,6 +49,10 @@
         };
 };
 
+&gpmi {
+        status = "okay";
+};
+
 &usbotg2 {
         dr_mode = "host";
 };
diff --git a/arch/arm/boot/dts/imx7d-pico-pi.dts b/arch/arm/boot/dts/imx7d-pico-pi.dts
new file mode 100644
index 000000000000..ee02d931cf49
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-pico-pi.dts
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2017 NXP
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "imx7d-pico.dtsi"
+
+/ {
+        sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "imx7-sgtl5000";
+                simple-audio-card,format = "i2s";
+                simple-audio-card,bitclock-master = <&dailink_master>;
+                simple-audio-card,frame-master = <&dailink_master>;
+                simple-audio-card,cpu {
+                        sound-dai = <&sai1>;
+                };
+
+                dailink_master: simple-audio-card,codec {
+                        sound-dai = <&codec>;
+                        clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+                };
+        };
+};
+
+&fec1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet1>;
+        assigned-clocks = <&clks IMX7D_ENET1_TIME_ROOT_SRC>,
+                          <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
+        assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
+        assigned-clock-rates = <0>, <100000000>;
+        phy-mode = "rgmii";
+        phy-handle = <&ethphy0>;
+        fsl,magic-packet;
+        status = "okay";
+
+        mdio {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ethphy0: ethernet-phy@1 {
+                        compatible = "ethernet-phy-ieee802.3-c22";
+                        reg = <1>;
+                        status = "okay";
+                };
+        };
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "okay";
+
+        codec: sgtl5000@a {
+                #sound-dai-cells = <0>;
+                reg = <0x0a>;
+                compatible = "fsl,sgtl5000";
+                clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+                VDDA-supply = <&reg_2p5v>;
+                VDDIO-supply = <&reg_vref_1v8>;
+        };
+};
+
+
+&sai1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_sai1>;
+        assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>,
+                          <&clks IMX7D_SAI1_ROOT_CLK>;
+        assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
+        assigned-clock-rates = <0>, <24576000>;
+        status = "okay";
+};
+
+&uart5 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart5>;
+        assigned-clocks = <&clks IMX7D_UART5_ROOT_SRC>;
+        assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
+        status = "okay";
+};
+
+&usbotg1 {
+        vbus-supply = <&reg_usb_otg1_vbus>;
+        status = "okay";
+};
+
+&usbotg2 {
+        vbus-supply = <&reg_usb_otg2_vbus>;
+        dr_mode = "host";
+        status = "okay";
+};
+
+&iomuxc {
+        pinctrl_enet1: enet1grp {
+                fsl,pins = <
+                        MX7D_PAD_SD2_CD_B__ENET1_MDIO                   0x3
+                        MX7D_PAD_SD2_WP__ENET1_MDC                      0x3
+                        MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC       0x1
+                        MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0       0x1
+                        MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1       0x1
+                        MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2       0x1
+                        MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3       0x1
+                        MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL 0x1
+                        MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC       0x1
+                        MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0       0x1
+                        MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1       0x1
+                        MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2       0x1
+                        MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3       0x1
+                        MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x1
+                >;
+        };
+
+        pinctrl_i2c1: i2c1grp {
+                fsl,pins = <
+                        MX7D_PAD_UART1_TX_DATA__I2C1_SDA        0x4000007f
+                        MX7D_PAD_UART1_RX_DATA__I2C1_SCL        0x4000007f
+                >;
+        };
+
+        pinctrl_sai1: sai1grp {
+                fsl,pins = <
+                        MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK     0x1f
+                        MX7D_PAD_ENET1_CRS__SAI1_TX_SYNC        0x1f
+                        MX7D_PAD_ENET1_COL__SAI1_TX_DATA0       0x30
+                        MX7D_PAD_ENET1_TX_CLK__SAI1_RX_DATA0    0x1f
+                >;
+        };
+
+        pinctrl_uart5: uart5grp {
+                fsl,pins = <
+                        MX7D_PAD_I2C4_SDA__UART5_DCE_TX         0x79
+                        MX7D_PAD_I2C4_SCL__UART5_DCE_RX         0x79
+                >;
+        };
+
+        pinctrl_usbotg1_pwr: usbotg_pwr {
+                fsl,pins = <
+                        MX7D_PAD_UART3_TX_DATA__GPIO4_IO5       0x14
+                >;
+        };
+};
diff --git a/arch/arm/boot/dts/imx7d-pico.dts b/arch/arm/boot/dts/imx7d-pico.dtsi
index 508328b2a6bf..e307462a48ec 100644
--- a/arch/arm/boot/dts/imx7d-pico.dts
+++ b/arch/arm/boot/dts/imx7d-pico.dtsi
@@ -100,62 +100,6 @@
                 regulator-min-microvolt = <1800000>;
                 regulator-max-microvolt = <1800000>;
         };
-
-        sound {
-                compatible = "simple-audio-card";
-                simple-audio-card,name = "imx7-sgtl5000";
-                simple-audio-card,format = "i2s";
-                simple-audio-card,bitclock-master = <&dailink_master>;
-                simple-audio-card,frame-master = <&dailink_master>;
-                simple-audio-card,cpu {
-                        sound-dai = <&sai1>;
-                };
-
-                dailink_master: simple-audio-card,codec {
-                        sound-dai = <&codec>;
-                        clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
-                };
-        };
-};
-
-&fec1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_enet1>;
-        assigned-clocks = <&clks IMX7D_ENET1_TIME_ROOT_SRC>,
-                          <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
-        assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
-        assigned-clock-rates = <0>, <100000000>;
-        phy-mode = "rgmii";
-        phy-handle = <&ethphy0>;
-        fsl,magic-packet;
-        status = "okay";
-
-        mdio {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                ethphy0: ethernet-phy@1 {
-                        compatible = "ethernet-phy-ieee802.3-c22";
-                        reg = <1>;
-                        status = "okay";
-                };
-        };
-};
-
-&i2c1 {
-        clock-frequency = <100000>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_i2c1>;
-        status = "okay";
-
-        codec: sgtl5000@a {
-                #sound-dai-cells = <0>;
-                reg = <0x0a>;
-                compatible = "fsl,sgtl5000";
-                clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
-                VDDA-supply = <&reg_2p5v>;
-                VDDIO-supply = <&reg_vref_1v8>;
-        };
 };
 
 &i2c4 {
@@ -253,35 +197,6 @@
         };
 };
 
-&sai1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_sai1>;
-        assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>,
-                          <&clks IMX7D_SAI1_ROOT_CLK>;
-        assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
-        assigned-clock-rates = <0>, <24576000>;
-        status = "okay";
-};
-
-&uart5 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_uart5>;
-        assigned-clocks = <&clks IMX7D_UART5_ROOT_SRC>;
-        assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
-        status = "okay";
-};
-
-&usbotg1 {
-        vbus-supply = <&reg_usb_otg1_vbus>;
-        status = "okay";
-};
-
-&usbotg2 {
-        vbus-supply = <&reg_usb_otg2_vbus>;
-        dr_mode = "host";
-        status = "okay";
-};
-
 &usdhc2 { /* Wifi SDIO */
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_usdhc2>;
@@ -315,32 +230,6 @@
 };
 
 &iomuxc {
-        pinctrl_enet1: enet1grp {
-                fsl,pins = <
-                        MX7D_PAD_SD2_CD_B__ENET1_MDIO                   0x3
-                        MX7D_PAD_SD2_WP__ENET1_MDC                      0x3
-                        MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC       0x1
-                        MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0       0x1
-                        MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1       0x1
-                        MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2       0x1
-                        MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3       0x1
-                        MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL 0x1
-                        MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC       0x1
-                        MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0       0x1
-                        MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1       0x1
-                        MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2       0x1
-                        MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3       0x1
-                        MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x1
-                >;
-        };
-
-        pinctrl_i2c1: i2c1grp {
-                fsl,pins = <
-                        MX7D_PAD_UART1_TX_DATA__I2C1_SDA        0x4000007f
-                        MX7D_PAD_UART1_RX_DATA__I2C1_SCL        0x4000007f
-                >;
-        };
-
         pinctrl_i2c4: i2c4grp {
                 fsl,pins = <
                         MX7D_PAD_SAI1_RX_BCLK__I2C4_SDA         0x4000007f
@@ -354,28 +243,6 @@
                 >;
         };
 
-        pinctrl_sai1: sai1grp {
-                fsl,pins = <
-                        MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK     0x1f
-                        MX7D_PAD_ENET1_CRS__SAI1_TX_SYNC        0x1f
-                        MX7D_PAD_ENET1_COL__SAI1_TX_DATA0       0x30
-                        MX7D_PAD_ENET1_TX_CLK__SAI1_RX_DATA0    0x1f
-                >;
-        };
-
-        pinctrl_uart5: uart5grp {
-                fsl,pins = <
-                        MX7D_PAD_I2C4_SDA__UART5_DCE_TX         0x79
-                        MX7D_PAD_I2C4_SCL__UART5_DCE_RX         0x79
-                >;
-        };
-
-        pinctrl_usbotg1_pwr: usbotg_pwr {
-                fsl,pins = <
-                        MX7D_PAD_UART3_TX_DATA__GPIO4_IO5       0x14
-                >;
-        };
-
         pinctrl_usdhc2: usdhc2grp {
                 fsl,pins = <
                         MX7D_PAD_SD2_CMD__SD2_CMD               0x59
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index 4d308d17f040..200714e3feea 100644
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -63,6 +63,13 @@
                 };
         };
 
+        usbphynop2: usbphynop2 {
+                compatible = "usb-nop-xceiv";
+                clocks = <&clks IMX7D_USB_PHY2_CLK>;
+                clock-names = "main_clk";
+                #phy-cells = <0>;
+        };
+
         soc {
                 etm@3007d000 {
                         compatible = "arm,coresight-etm3x", "arm,primecell";
@@ -105,18 +112,14 @@
                 reg = <0x30b20200 0x200>;
         };
 
-        usbphynop2: usbphynop2 {
-                compatible = "usb-nop-xceiv";
-                clocks = <&clks IMX7D_USB_PHY2_CLK>;
-                clock-names = "main_clk";
-        };
-
         fec2: ethernet@30bf0000 {
                 compatible = "fsl,imx7d-fec", "fsl,imx6sx-fec";
                 reg = <0x30bf0000 0x10000>;
-                interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
+                interrupt-names = "int0", "int1", "int2", "pps";
+                interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
+                        <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
                         <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
-                        <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
+                        <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&clks IMX7D_ENET_AXI_ROOT_CLK>,
                         <&clks IMX7D_ENET_AXI_ROOT_CLK>,
                         <&clks IMX7D_ENET2_TIME_ROOT_CLK>,
@@ -129,7 +132,7 @@
                 status = "disabled";
         };
 
-        pcie: pcie@0x33800000 {
+        pcie: pcie@33800000 {
                 compatible = "fsl,imx7d-pcie", "snps,dw-pcie";
                 reg = <0x33800000 0x4000>,
                       <0x4ff00000 0x80000>;
@@ -137,6 +140,7 @@
                 #address-cells = <3>;
                 #size-cells = <2>;
                 device_type = "pci";
+                bus-range = <0x00 0xff>;
                 ranges = <0x81000000 0 0          0x4ff80000 0 0x00010000   /* downstream I/O */
                           0x82000000 0 0x40000000 0x40000000 0 0x0ff00000>; /* non-prefetchable memory */
                 num-lanes = <1>;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 82ad26e766eb..9aa2bb998552 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -116,6 +116,66 @@
                 clock-output-names = "osc";
         };
 
+        usbphynop1: usbphynop1 {
+                compatible = "usb-nop-xceiv";
+                clocks = <&clks IMX7D_USB_PHY1_CLK>;
+                clock-names = "main_clk";
+                #phy-cells = <0>;
+        };
+
+        usbphynop3: usbphynop3 {
+                compatible = "usb-nop-xceiv";
+                clocks = <&clks IMX7D_USB_HSIC_ROOT_CLK>;
+                clock-names = "main_clk";
+                #phy-cells = <0>;
+        };
+
+
+        replicator {
+                /*
+                 * non-configurable replicators don't show up on the
+                 * AMBA bus.  As such no need to add "arm,primecell"
+                 */
+                compatible = "arm,coresight-replicator";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                                /* replicator output ports */
+                        port@0 {
+                                reg = <0>;
+                                replicator_out_port0: endpoint {
+                                        remote-endpoint = <&tpiu_in_port>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+                                replicator_out_port1: endpoint {
+                                        remote-endpoint = <&etr_in_port>;
+                                };
+                        };
+
+                        /* replicator input port */
+                        port@2 {
+                                reg = <0>;
+                                replicator_in_port0: endpoint {
+                                        slave-mode;
+                                        remote-endpoint = <&etf_out_port>;
+                                };
+                        };
+                };
+        };
+
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupt-parent = <&intc>;
+                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                             <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                             <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                             <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -260,43 +320,6 @@
                         };
                 };
 
-                replicator {
-                        /*
-                         * non-configurable replicators don't show up on the
-                         * AMBA bus.  As such no need to add "arm,primecell"
-                         */
-                        compatible = "arm,coresight-replicator";
-
-                        ports {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-
-                                /* replicator output ports */
-                                port@0 {
-                                        reg = <0>;
-                                        replicator_out_port0: endpoint {
-                                                remote-endpoint = <&tpiu_in_port>;
-                                        };
-                                };
-
-                                port@1 {
-                                        reg = <1>;
-                                        replicator_out_port1: endpoint {
-                                                remote-endpoint = <&etr_in_port>;
-                                        };
-                                };
-
-                                /* replicator input port */
-                                port@2 {
-                                        reg = <0>;
-                                        replicator_in_port0: endpoint {
-                                                slave-mode;
-                                                remote-endpoint = <&etf_out_port>;
-                                        };
-                                };
-                        };
-                };
-
                 intc: interrupt-controller@31001000 {
                         compatible = "arm,cortex-a7-gic";
                         interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
@@ -309,15 +332,6 @@
                               <0x31006000 0x2000>;
                 };
 
-                timer {
-                        compatible = "arm,armv7-timer";
-                        interrupt-parent = <&intc>;
-                        interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
-                };
-
                 aips1: aips-bus@30000000 {
                         compatible = "fsl,aips-bus", "simple-bus";
                         #address-cells = <1>;
@@ -508,8 +522,11 @@
                                 reg = <0x30360000 0x10000>;
                                 interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
                                         <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
 
-                                reg_1p0d: regulator-vdd1p0d {
+                                reg_1p0d: regulator-vdd1p0d@30360210 {
+                                        reg = <0x30360210>;
                                         compatible = "fsl,anatop-regulator";
                                         regulator-name = "vdd1p0d";
                                         regulator-min-microvolt = <800000>;
@@ -583,9 +600,9 @@
                                         #address-cells = <1>;
                                         #size-cells = <0>;
 
-                                        pgc_pcie_phy: pgc-power-domain@IMX7_POWER_DOMAIN_PCIE_PHY {
+                                        pgc_pcie_phy: pgc-power-domain@1 {
                                                 #power-domain-cells = <0>;
-                                                reg = <IMX7_POWER_DOMAIN_PCIE_PHY>;
+                                                reg = <1>;
                                                 power-supply = <&reg_1p0d>;
                                         };
                                 };
@@ -945,18 +962,6 @@
                                 reg = <0x30b30200 0x200>;
                         };
 
-                        usbphynop1: usbphynop1 {
-                                compatible = "usb-nop-xceiv";
-                                clocks = <&clks IMX7D_USB_PHY1_CLK>;
-                                clock-names = "main_clk";
-                        };
-
-                        usbphynop3: usbphynop3 {
-                                compatible = "usb-nop-xceiv";
-                                clocks = <&clks IMX7D_USB_HSIC_ROOT_CLK>;
-                                clock-names = "main_clk";
-                        };
-
                         usdhc1: usdhc@30b40000 {
                                 compatible = "fsl,imx7d-usdhc", "fsl,imx6sl-usdhc";
                                 reg = <0x30b40000 0x10000>;
@@ -1007,9 +1012,11 @@
                         fec1: ethernet@30be0000 {
                                 compatible = "fsl,imx7d-fec", "fsl,imx6sx-fec";
                                 reg = <0x30be0000 0x10000>;
-                                interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
+                                interrupt-names = "int0", "int1", "int2", "pps";
+                                interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                        <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
                                         <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,
-                                        <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
+                                        <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX7D_ENET_AXI_ROOT_CLK>,
                                         <&clks IMX7D_ENET_AXI_ROOT_CLK>,
                                         <&clks IMX7D_ENET1_TIME_ROOT_CLK>,
diff --git a/arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts b/arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts
new file mode 100644
index 000000000000..d01f64b252b1
--- /dev/null
+++ b/arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2017 Moxa Inc. - https://www.moxa.com/
+ *
+ * Author: Harry YJ Jhou (周亞諄) <harryyj.jhou@moxa.com>
+ *         Jimmy Chen (陳永達)    <jimmy.chen@moxa.com>
+ *         SZ Lin (林上智)        <sz.lin@moxa.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include "ls1021a.dtsi"
+
+/ {
+        model = "Moxa UC-8410A";
+
+        aliases {
+                enet0_rgmii_phy = &rgmii_phy0;
+                enet1_rgmii_phy = &rgmii_phy1;
+                enet2_rgmii_phy = &rgmii_phy2;
+        };
+
+        sys_mclk: clock-mclk {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <24576000>;
+        };
+
+        reg_3p3v: regulator-3p3v {
+                  compatible = "regulator-fixed";
+                  regulator-name = "3P3V";
+                  regulator-min-microvolt = <3300000>;
+                  regulator-max-microvolt = <3300000>;
+                  regulator-always-on;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                cel-pwr {
+                        label = "UC8410A:CEL-PWR";
+                        gpios = <&gpio3 27 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                };
+
+                cel-reset {
+                        label = "UC8410A:CEL-RESET";
+                        gpios = <&gpio3 28 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                };
+
+                str-led {
+                        label = "UC8410A:RED:PROG";
+                        gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "mmc0";
+                };
+
+                sw-ready {
+                        label = "UC8410A:GREEN:SWRDY";
+                        gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                };
+
+                beeper {
+                        label = "UC8410A:BEEP";
+                        gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                prog-led0 {
+                        label = "UC8410A:GREEN:PROG2";
+                        gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                prog-led1 {
+                        label = "UC8410A:GREEN:PROG1";
+                        gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                prog-led2 {
+                        label = "UC8410A:GREEN:PROG0";
+                        gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                wifi-signal0 {
+                        label = "UC8410A:GREEN:CEL2";
+                        gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                wifi-signal1 {
+                        label = "UC8410A:GREEN:CEL1";
+                        gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                wifi-signal2 {
+                        label = "UC8410A:GREEN:CEL0";
+                        gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                cpu-diag-red {
+                        label = "UC8410A:RED:DIA";
+                        gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                cpu-diag-green {
+                        label = "UC8410A:GREEN:DIA";
+                        gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                cpu-diag-yellow {
+                        label = "UC8410A:YELLOW:DIA";
+                        gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                pushbtn-key {
+                        label = "push button key";
+                        gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
+                        linux,code = <BTN_MISC>;
+                        default-state = "on";
+                };
+        };
+};
+
+&enet0 {
+        phy-handle = <&rgmii_phy0>;
+        phy-connection-type = "rgmii-id";
+        status = "okay";
+};
+
+&enet1 {
+        phy-handle = <&rgmii_phy1>;
+        phy-connection-type = "rgmii-id";
+        status = "okay";
+};
+
+&enet2 {
+        phy-handle = <&rgmii_phy2>;
+        phy-connection-type = "rgmii-id";
+        status = "okay";
+};
+
+&i2c0 {
+        clock-frequency = <100000>;
+        status = "okay";
+
+        tpm@20 {
+                compatible = "infineon,slb9635tt";
+                reg = <0x20>;
+        };
+
+        rtc@68 {
+                compatible = "dallas,ds1374";
+                reg = <0x68>;
+        };
+};
+
+&lpuart0 {
+        status = "okay";
+};
+
+&mdio0 {
+        rgmii_phy0: ethernet-phy@0 {
+                compatible = "marvell,88e1118";
+                reg = <0x0>;
+                marvell,reg-init =
+                        <3 0x11 0 0x4415>, /* Reg 3,17 */
+                        <3 0x10 0 0x77>; /* Reg 3,16 */
+        };
+
+        rgmii_phy1: ethernet-phy@1 {
+                compatible = "marvell,88e1118";
+                reg = <0x1>;
+                marvell,reg-init =
+                        <3 0x11 0 0x4415>, /* Reg 3,17 */
+                        <3 0x10 0 0x77>; /* Reg 3,16 */
+        };
+
+        rgmii_phy2: ethernet-phy@2 {
+                compatible = "marvell,88e1118";
+                reg = <0x2>;
+                marvell,reg-init =
+                        <3 0x11 0 0x4415>, /* Reg 3,17 */
+                        <3 0x10 0 0x77>; /* Reg 3,16 */
+        };
+};
+
+&qspi {
+        bus-num = <0>;
+        fsl,spi-num-chipselects = <2>;
+        fsl,spi-flash-chipselects = <0>;
+        fsl,qspi-has-second-chip;
+        status = "okay";
+
+        flash: flash@0 {
+                compatible = "spansion,s25fl064l", "spansion,s25fl164k";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+
+                partitions@0 {
+                        label = "U-Boot";
+                        reg = <0x0 0x180000>;
+                };
+
+                partitions@180000 {
+                        label = "U-Boot Env";
+                        reg = <0x180000 0x680000>;
+                };
+        };
+};
+
+&sata {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
index 940875316d0f..bf15dc27ca53 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -215,7 +215,7 @@
                                 reg = <0x2a>;
                                 VDDA-supply = <&reg_3p3v>;
                                 VDDIO-supply = <&reg_3p3v>;
-                                clocks = <&sys_mclk 1>;
+                                clocks = <&sys_mclk>;
                         };
                 };
         };
@@ -239,6 +239,11 @@
                 device-width = <1>;
         };
 
+        nand@2,0 {
+                compatible = "fsl,ifc-nand";
+                reg = <0x2 0x0 0x10000>;
+        };
+
         fpga: board-control@3,0 {
                 #address-cells = <1>;
                 #size-cells = <1>;
diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts
index a8b148ad1dd2..b186c370ad54 100644
--- a/arch/arm/boot/dts/ls1021a-twr.dts
+++ b/arch/arm/boot/dts/ls1021a-twr.dts
@@ -187,7 +187,7 @@
                 reg = <0x0a>;
                 VDDA-supply = <&reg_3p3v>;
                 VDDIO-supply = <&reg_3p3v>;
-                clocks = <&sys_mclk 1>;
+                clocks = <&sys_mclk>;
         };
 };
 
@@ -228,6 +228,10 @@
         };
 };
 
+&esdhc {
+        status = "okay";
+};
+
 &sai1 {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 9319e1f0f1d8..c5edfa9a68a6 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -106,6 +106,14 @@
                 compatible = "arm,cortex-a7-pmu";
                 interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
                              <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-affinity = <&cpu0>, <&cpu1>;
+        };
+
+        reboot {
+                compatible = "syscon-reboot";
+                regmap = <&dcfg>;
+                offset = <0xb0>;
+                mask = <0x02>;
         };
 
         soc {
@@ -154,8 +162,22 @@
                         big-endian;
                 };
 
+                qspi: quadspi@1550000 {
+                        compatible = "fsl,ls1021a-qspi";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x0 0x1550000 0x0 0x10000>,
+                              <0x0 0x40000000 0x0 0x40000000>;
+                        reg-names = "QuadSPI", "QuadSPI-memory";
+                        interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
+                        clock-names = "qspi_en", "qspi";
+                        clocks = <&clockgen 4 1>, <&clockgen 4 1>;
+                        big-endian;
+                        status = "disabled";
+                };
+
                 esdhc: esdhc@1560000 {
-                        compatible = "fsl,esdhc";
+                        compatible = "fsl,ls1021a-esdhc", "fsl,esdhc";
                         reg = <0x0 0x1560000 0x0 0x10000>;
                         interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
                         clock-frequency = <0>;
@@ -575,7 +597,7 @@
                         fsl,tclk-period = <5>;
                         fsl,tmr-prsc    = <2>;
                         fsl,tmr-add     = <0xaaaaaaab>;
-                        fsl,tmr-fiper1  = <999999990>;
+                        fsl,tmr-fiper1  = <999999995>;
                         fsl,tmr-fiper2  = <99990>;
                         fsl,max-adj     = <499999999>;
                 };
@@ -668,7 +690,7 @@
                         };
                 };
 
-                usb@8600000 {
+                usb2: usb@8600000 {
                         compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr";
                         reg = <0x0 0x8600000 0x0 0x1000>;
                         interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>;
@@ -676,7 +698,7 @@
                         phy_type = "ulpi";
                 };
 
-                usb3@3100000 {
+                usb3: usb3@3100000 {
                         compatible = "snps,dwc3";
                         reg = <0x0 0x3100000 0x0 0x10000>;
                         interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
index 091b738041a0..d8b2972527eb 100644
--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
@@ -140,7 +140,7 @@
 
         /* M41T0M6 real time clock on carrier board */
         rtc: m41t0m6@68 {
-                compatible = "st,m41t00";
+                compatible = "st,m41t0";
                 reg = <0x68>;
         };
 };
diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi
index 3d9896171bfc..348bcd30c0f7 100644
--- a/arch/arm/boot/dts/vf500.dtsi
+++ b/arch/arm/boot/dts/vf500.dtsi
@@ -58,7 +58,7 @@
         soc {
                 aips-bus@40000000 {
 
-                        intc: interrupt-controller@40002000 {
+                        intc: interrupt-controller@40003000 {
                                 compatible = "arm,cortex-a9-gic";
                                 #interrupt-cells = <3>;
                                 interrupt-controller;
diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
index acdf12ad0622..782b69a3acdf 100644
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
@@ -255,16 +255,19 @@
                                         port@0 {
                                                 reg = <0>;
                                                 label = "lan6";
+                                                phy-handle = <&switch2phy0>;
                                         };
 
                                         port@1 {
                                                 reg = <1>;
                                                 label = "lan7";
+                                                phy-handle = <&switch2phy1>;
                                         };
 
                                         port@2 {
                                                 reg = <2>;
                                                 label = "lan8";
+                                                phy-handle = <&switch2phy2>;
                                         };
 
                                         port@3 {
@@ -304,6 +307,20 @@
                                                 };
                                         };
                                 };
+                                mdio {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        switch2phy0: phy@0 {
+                                                reg = <0>;
+                                        };
+                                        switch2phy1: phy@1 {
+                                                reg = <1>;
+                                        };
+                                        switch2phy2: phy@2 {
+                                                reg = <2>;
+                                        };
+                                };
                         };
                 };
 
@@ -371,7 +388,8 @@
                 reg = <0x22>;
                 gpio-controller;
                 #gpio-cells = <2>;
-                interrupt-parent = <&gpio2>;
+                interrupt-controller;
+                interrupt-parent = <&gpio3>;
                 interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
         };
 };
diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
index 4b8edc8982cf..c6f134c78303 100644
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
@@ -73,7 +73,7 @@
                                 #size-cells = <0>;
                                 reg = <0>;
                                 dsa,member = <0 0>;
-                                eeprom-length = <512>;
+                                eeprom-length = <65536>;
                                 interrupt-parent = <&gpio0>;
                                 interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
                                 interrupt-controller;
@@ -170,7 +170,7 @@
                                 #size-cells = <0>;
                                 reg = <0>;
                                 dsa,member = <0 1>;
-                                eeprom-length = <512>;
+                                eeprom-length = <65536>;
                                 interrupt-parent = <&gpio0>;
                                 interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
                                 interrupt-controller;
diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi
index 6b58d3a97992..aadd36db0092 100644
--- a/arch/arm/boot/dts/vf610-zii-dev.dtsi
+++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi
@@ -96,6 +96,10 @@
         status = "okay";
 };
 
+&edma1 {
+        status = "okay";
+};
+
 &esdhc1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_esdhc1>;
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 5d654b5b4ce6..c3f09b737924 100644
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -84,6 +84,11 @@
                 mask = <0x1000>;
         };
 
+        iio-hwmon {
+                compatible = "iio-hwmon";
+                io-channels = <&adc0 16>, <&adc1 16>;
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -762,10 +767,5 @@
                                 status = "disabled";
                         };
                 };
-
-                iio-hwmon {
-                        compatible = "iio-hwmon";
-                        io-channels = <&adc0 16>, <&adc1 16>;
-                };
         };
 };