Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree updates from Arnd Bergmann:
 "This is the usual set of changes for device trees, with over 700
  non-merged changesets. There is an ongoing set of dtc warning fixes
  and the usual bugfixes, cleanups and added device support.

  The most interesting bit as usual is support for new machines listed
  below:

   - The Allwinner H6 makes its debut with the Pine-H64 board, and we
     get two new machines based on its older siblings: the H5 based
     OrangePi Zero+ and the A64 based Teres-I Laptop from Olimex. On the
     32-bit side, we add The Olimex som204 based on Allwinner A20, and
     the Banana Pi M2 Zero development board (based on H2).

   - NVIDIA adds support for Tegra194 aka "Xavier", plus their p2972
     development board and p2888 CPU module.

   - The Nuvoton npcm750 is a BMC that was newly added, for now we only
     support running on the evaluation board.

   - STmicroelectronics stm32 gains support for the stm32mp157c and two
     evaluation boards.

   - The Toradex Colibri board family grows a few members based on the
     i.MX6ULL variant.

   - The Advantec DMS-BA16 is a Qseven module using the NXP i.MX6 family
     of chips.

   - The Phytec phyBOARD Mira is a family of industrial boards based on
     i.MX6. For now, four models get added.

   - TI am335x based PDU-001 is an industrial embedded machine used for
     traffic monitoring

   - The Aspeed platform now supports running on the BMC on the Qualcomm
     Centriq 2400 server

   - Samsung Exynos4 based Galaxy S3 is a family of mobile phones
     Qualcomm msm8974 based Galaxy S5 is a rather different phone made
     by the same company.

   - The Xilinx Zynq and ZynqMP platforms now gained a lot of dts file
     for the various boards made by Xilinx themselves, as well as the
     Digilent Zybo Z7.

   - The ARM Versatile family now supports the "IB2" interface board.

   - The Renesas H2 based "Stout" and the H3 based Salvator-X are more
     evaluation boards named after a kind of beer, as most of them are.
     The r8a77980 (V3H) based "Condor" apparently doesn't follow that
     tradition. ;-)

   - ROC-RK3328-CC is a simple developement board from the Libre
     Computer Project, based on the Rockchips RK3328 SoC

   - Haiku is another development board plus Qseven module based on
     Rockchips RK3368 and made by Theobroma Systems"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (701 commits)
  arm: dts: modify Nuvoton NPCM7xx device tree structure
  arm: dts: modify Makefile NPCM750 configuration name
  arm: dts: modify clock binding in NPCM750 device tree
  arm: dts: modify timer register size in NPCM750 device tree
  arm: dts: modify UART compatible name in NPCM750 device tree
  arm: dts: add watchdog device to NPCM750 device tree
  arm64: dts: uniphier: add ethernet node for PXs3
  ARM: dts: uniphier: add pinctrl groups of ethernet for second instance
  arm: dts: kirkwood*.dts: use SPDX-License-Identifier for board using GPL-2.0+
  arm: dts: kirkwood*.dts: use SPDX-License-Identifier for boards using GPL-2.0+/MIT
  arm: dts: kirkwood*.dts: use SPDX-License-Identifier for boards using GPL-2.0
  arm: dts: armada-385-turris-omnia: use SPDX-License-Identifier
  arm: dts: armada-385-db-ap: use SPDX-License-Identifier
  arm: dts: armada-388-rd: use SPDX-License-Identifier
  arm: dts: armada-xp-db-xc3-24g4xg: use SPDX-License-Identifier
  arm: dts: armada-xp-db-dxbc2: use SPDX-License-Identifier
  arm: dts: armada-370-db: use SPDX-License-Identifier
  arm: dts: armada-*.dts: use SPDX-License-Identifier for most of the Armada based board
  arm: dts: armada-xp-98dx: use SPDX-License-Identifier for prestara 98d SoCs
  arm: dts: armada-*.dtsi: use SPDX-License-Identifier for most of the Armada SoCs
  ...

879 files changed, 39377 insertions, 20094 deletions

diff --git a/Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm750-smp b/Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm750-smp
new file mode 100644
index 000000000000..8e043301e28e
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/cpu-enable-method/nuvoton,npcm750-smp
@@ -0,0 +1,42 @@
+=========================================================
+Secondary CPU enable-method "nuvoton,npcm750-smp" binding
+=========================================================
+
+To apply to all CPUs, a single "nuvoton,npcm750-smp" enable method should be
+defined in the "cpus" node.
+
+Enable method name:     "nuvoton,npcm750-smp"
+Compatible machines:    "nuvoton,npcm750"
+Compatible CPUs:        "arm,cortex-a9"
+Related properties:     (none)
+
+Note:
+This enable method needs valid nodes compatible with "arm,cortex-a9-scu" and
+"nuvoton,npcm750-gcr".
+
+Example:
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                enable-method = "nuvoton,npcm750-smp";
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        clocks = <&clk NPCM7XX_CLK_CPU>;
+                        clock-names = "clk_cpu";
+                        reg = <0>;
+                        next-level-cache = <&L2>;
+                };
+
+                cpu@1 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        clocks = <&clk NPCM7XX_CLK_CPU>;
+                        clock-names = "clk_cpu";
+                        reg = <1>;
+                        next-level-cache = <&L2>;
+                };
+        };
+
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt
index f4a777039f03..8b0328ff951d 100644
--- a/Documentation/devicetree/bindings/arm/cpus.txt
+++ b/Documentation/devicetree/bindings/arm/cpus.txt
@@ -185,6 +185,7 @@ described below.
                             "nvidia,tegra186-denver"
                             "qcom,krait"
                             "qcom,kryo"
+                            "qcom,kryo385"
                             "qcom,scorpion"
         - enable-method
                 Value type: <stringlist>
diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt
index 91d517849483..7d21ab37c19c 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek.txt
@@ -50,6 +50,15 @@ Supported boards:
 - Reference board variant 1 for MT7622:
     Required root node properties:
       - compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";
+- Reference board for MT7623a with eMMC:
+    Required root node properties:
+      - compatible = "mediatek,mt7623a-rfb-emmc", "mediatek,mt7623";
+- Reference board for MT7623a with NAND:
+    Required root node properties:
+      - compatible = "mediatek,mt7623a-rfb-nand", "mediatek,mt7623";
+- Reference board for MT7623n with eMMC:
+    Required root node properties:
+      - compatible = "mediatek,mt7623n-rfb-emmc", "mediatek,mt7623";
 - Reference  board for MT7623n with NAND:
     Required root node properties:
       - compatible = "mediatek,mt7623n-rfb-nand", "mediatek,mt7623";
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
index 6cc7840ff37a..8f5335b480ac 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,ethsys.txt
@@ -9,6 +9,7 @@ Required Properties:
         - "mediatek,mt2701-ethsys", "syscon"
         - "mediatek,mt7622-ethsys", "syscon"
 - #clock-cells: Must be 1
+- #reset-cells: Must be 1
 
 The ethsys controller uses the common clk binding from
 Documentation/devicetree/bindings/clock/clock-bindings.txt
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pciesys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pciesys.txt
index d5d5f1227665..7fe5dc6097a6 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,pciesys.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,pciesys.txt
@@ -8,6 +8,7 @@ Required Properties:
 - compatible: Should be:
         - "mediatek,mt7622-pciesys", "syscon"
 - #clock-cells: Must be 1
+- #reset-cells: Must be 1
 
 The PCIESYS controller uses the common clk binding from
 Documentation/devicetree/bindings/clock/clock-bindings.txt
@@ -19,4 +20,5 @@ pciesys: pciesys@1a100800 {
         compatible = "mediatek,mt7622-pciesys", "syscon";
         reg = <0 0x1a100800 0 0x1000>;
         #clock-cells = <1>;
+        #reset-cells = <1>;
 };
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,ssusbsys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,ssusbsys.txt
index 00760019da00..b8184da2508c 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,ssusbsys.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,ssusbsys.txt
@@ -8,6 +8,7 @@ Required Properties:
 - compatible: Should be:
         - "mediatek,mt7622-ssusbsys", "syscon"
 - #clock-cells: Must be 1
+- #reset-cells: Must be 1
 
 The SSUSBSYS controller uses the common clk binding from
 Documentation/devicetree/bindings/clock/clock-bindings.txt
@@ -19,4 +20,5 @@ ssusbsys: ssusbsys@1a000000 {
         compatible = "mediatek,mt7622-ssusbsys", "syscon";
         reg = <0 0x1a000000 0 0x1000>;
         #clock-cells = <1>;
+        #reset-cells = <1>;
 };
diff --git a/Documentation/devicetree/bindings/arm/npcm/npcm.txt b/Documentation/devicetree/bindings/arm/npcm/npcm.txt
new file mode 100644
index 000000000000..2d87d9ecea85
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/npcm/npcm.txt
@@ -0,0 +1,6 @@
+NPCM Platforms Device Tree Bindings
+-----------------------------------
+NPCM750 SoC
+Required root node properties:
+        - compatible = "nuvoton,npcm750";
+
diff --git a/Documentation/devicetree/bindings/arm/omap/ctrl.txt b/Documentation/devicetree/bindings/arm/omap/ctrl.txt
index ce8dabf8c0f9..f35b77920786 100644
--- a/Documentation/devicetree/bindings/arm/omap/ctrl.txt
+++ b/Documentation/devicetree/bindings/arm/omap/ctrl.txt
@@ -25,6 +25,7 @@ Required properties:
                 "ti,omap4-scm-padconf-wkup"
                 "ti,omap5-scm-core"
                 "ti,omap5-scm-padconf-core"
+                "ti,omap5-scm-wkup-pad-conf"
                 "ti,dra7-scm-core"
 - reg:          Contains Control Module register address range
                 (base address and length)
diff --git a/Documentation/devicetree/bindings/arm/qcom.txt b/Documentation/devicetree/bindings/arm/qcom.txt
index 0ed4d39d7fe1..ee532e705d6c 100644
--- a/Documentation/devicetree/bindings/arm/qcom.txt
+++ b/Documentation/devicetree/bindings/arm/qcom.txt
@@ -26,6 +26,7 @@ The 'SoC' element must be one of the following strings:
         msm8996
         mdm9615
         ipq8074
+        sdm845
 
 The 'board' element must be one of the following strings:
 
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index 326d24bca1a9..1c1d62d03c4f 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -50,6 +50,10 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
 
+- Firefly roc-rk3328-cc board:
+    Required root node properties:
+      - compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";
+
 - ChipSPARK PopMetal-RK3288 board:
     Required root node properties:
       - compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";
@@ -181,10 +185,18 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
 
+- Rockchip RK3399 Sapphire board standalone:
+    Required root node properties:
+      - compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
+
 - Rockchip RK3399 Sapphire Excavator board:
     Required root node properties:
       - compatible = "rockchip,rk3399-sapphire-excavator", "rockchip,rk3399";
 
+- Theobroma Systems RK3368-uQ7 Haikou Baseboard:
+    Required root node properties:
+      - compatible = "tsd,rk3368-uq7-haikou", "rockchip,rk3368";
+
 - Theobroma Systems RK3399-Q7 Haikou Baseboard:
     Required root node properties:
       - compatible = "tsd,rk3399-q7-haikou", "rockchip,rk3399";
diff --git a/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt b/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
index 469ac98ecf8f..14510b215480 100644
--- a/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
@@ -9,7 +9,11 @@ Required root node properties:
         - "samsung,smdkv310"    - for Exynos4210-based Samsung SMDKV310 eval board.
         - "samsung,trats"       - for Exynos4210-based Tizen Reference board.
         - "samsung,universal_c210" - for Exynos4210-based Samsung board.
+        - "samsung,i9300"          - for Exynos4412-based Samsung GT-I9300 board.
+        - "samsung,i9305"          - for Exynos4412-based Samsung GT-I9305 board.
+        - "samsung,midas"       - for Exynos4412-based Samsung Midas board.
         - "samsung,smdk4412",   - for Exynos4412-based Samsung SMDK4412 eval board.
+        - "samsung,n710x"          - for Exynos4412-based Samsung GT-N7100/GT-N7105 board.
         - "samsung,trats2"      - for Exynos4412-based Tizen Reference board.
         - "samsung,smdk5250"    - for Exynos5250-based Samsung SMDK5250 eval board.
         - "samsung,xyref5260"   - for Exynos5260-based Samsung board.
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 5c3af7ef0761..d3d1df97834f 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -39,8 +39,12 @@ SoCs:
     compatible = "renesas,r8a7795"
   - R-Car M3-W (R8A77960)
     compatible = "renesas,r8a7796"
+  - R-Car M3-N (R8A77965)
+    compatible = "renesas,r8a77965"
   - R-Car V3M (R8A77970)
     compatible = "renesas,r8a77970"
+  - R-Car V3H (R8A77980)
+    compatible = "renesas,r8a77980"
   - R-Car D3 (R8A77995)
     compatible = "renesas,r8a77995"
 
@@ -52,11 +56,13 @@ Boards:
   - APE6-EVM
     compatible = "renesas,ape6evm", "renesas,r8a73a4"
   - Atmark Techno Armadillo-800 EVA
-    compatible = "renesas,armadillo800eva"
+    compatible = "renesas,armadillo800eva", "renesas,r8a7740"
   - Blanche (RTP0RC7792SEB00010S)
     compatible = "renesas,blanche", "renesas,r8a7792"
   - BOCK-W
     compatible = "renesas,bockw", "renesas,r8a7778"
+  - Condor (RTP0RC77980SEB0010SS/RTP0RC77980SEB0010SA01)
+    compatible = "renesas,condor", "renesas,r8a77980"
   - Draak (RTP0RC77995SEB0010S)
     compatible = "renesas,draak", "renesas,r8a77995"
   - Eagle (RTP0RC77970SEB0010S)
@@ -102,19 +108,25 @@ Boards:
     compatible = "renesas,salvator-x", "renesas,r8a7795"
   - Salvator-X (RTP0RC7796SIPB0011S)
     compatible = "renesas,salvator-x", "renesas,r8a7796"
+  - Salvator-X (RTP0RC7796SIPB0011S (M3N))
+    compatible = "renesas,salvator-x", "renesas,r8a77965"
   - Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)
     compatible = "renesas,salvator-xs", "renesas,r8a7795"
   - Salvator-XS (Salvator-X 2nd version, RTP0RC7796SIPB0012S)
     compatible = "renesas,salvator-xs", "renesas,r8a7796"
+  - Salvator-XS (Salvator-X 2nd version, RTP0RC77965SIPB012S)
+    compatible = "renesas,salvator-xs", "renesas,r8a77965"
   - SILK (RTP0RC7794LCB00011S)
     compatible = "renesas,silk", "renesas,r8a7794"
   - SK-RZG1E (YR8A77450S000BE)
     compatible = "renesas,sk-rzg1e", "renesas,r8a7745"
   - SK-RZG1M (YR8A77430S000BE)
     compatible = "renesas,sk-rzg1m", "renesas,r8a7743"
-  - V3MSK
+  - Stout (ADAS Starterkit, Y-R-CAR-ADAS-SKH2-BOARD)
+    compatible = "renesas,stout", "renesas,r8a7790"
+  - V3MSK (Y-ASK-RCAR-V3M-WS10)
     compatible = "renesas,v3msk", "renesas,r8a77970"
-  - Wheat
+  - Wheat (RTP0RC7792ASKB0000JE)
     compatible = "renesas,wheat", "renesas,r8a7792"
 
 
diff --git a/Documentation/devicetree/bindings/arm/stm32.txt b/Documentation/devicetree/bindings/arm/stm32.txt
index 05762b08a7bb..6808ed9ddfd5 100644
--- a/Documentation/devicetree/bindings/arm/stm32.txt
+++ b/Documentation/devicetree/bindings/arm/stm32.txt
@@ -7,3 +7,4 @@ using one of the following compatible strings:
   st,stm32f469
   st,stm32f746
   st,stm32h743
+  st,stm32mp157
diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt
index 7f1411bbabf7..32f62bb7006d 100644
--- a/Documentation/devicetree/bindings/arm/tegra.txt
+++ b/Documentation/devicetree/bindings/arm/tegra.txt
@@ -9,6 +9,12 @@ following compatible values:
 
   nvidia,tegra20
   nvidia,tegra30
+  nvidia,tegra114
+  nvidia,tegra124
+  nvidia,tegra132
+  nvidia,tegra210
+  nvidia,tegra186
+  nvidia,tegra194
 
 Boards
 -------------------------------------------
@@ -26,8 +32,18 @@ board-specific compatible values:
   nvidia,cardhu
   nvidia,cardhu-a02
   nvidia,cardhu-a04
+  nvidia,dalmore
   nvidia,harmony
+  nvidia,jetson-tk1
+  nvidia,norrin
+  nvidia,p2371-0000
+  nvidia,p2371-2180
+  nvidia,p2571
+  nvidia,p2771-0000
+  nvidia,p2972-0000
+  nvidia,roth
   nvidia,seaboard
+  nvidia,tn7
   nvidia,ventana
   toradex,apalis_t30
   toradex,apalis_t30-eval
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt
index 078a58b0302f..5a3bf7c5a7a0 100644
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt
@@ -3,6 +3,7 @@ NVIDIA Tegra Power Management Controller (PMC)
 Required properties:
 - compatible: Should contain one of the following:
   - "nvidia,tegra186-pmc": for Tegra186
+  - "nvidia,tegra194-pmc": for Tegra194
 - reg: Must contain an (offset, length) pair of the register set for each
   entry in reg-names.
 - reg-names: Must include the following entries:
@@ -10,6 +11,7 @@ Required properties:
   - "wake"
   - "aotag"
   - "scratch"
+  - "misc" (Only for Tegra194)
 
 Optional properties:
 - nvidia,invert-interrupt: If present, inverts the PMU interrupt signal.
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index 1f7995357888..b9043bc35c14 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -5,3 +5,59 @@ shall have the following properties.
 
 Required root node properties:
     - compatible = "xlnx,zynq-7000";
+
+Additional compatible strings:
+
+- Xilinx internal board cc108
+  "xlnx,zynq-cc108"
+
+- Xilinx internal board zc770 with different FMC cards
+  "xlnx,zynq-zc770-xm010"
+  "xlnx,zynq-zc770-xm011"
+  "xlnx,zynq-zc770-xm012"
+  "xlnx,zynq-zc770-xm013"
+
+- Digilent Zybo Z7 board
+  "digilent,zynq-zybo-z7"
+
+---------------------------------------------------------------
+
+Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings
+
+Boards with ZynqMP SOC based on an ARM Cortex A53 processor
+shall have the following properties.
+
+Required root node properties:
+    - compatible = "xlnx,zynqmp";
+
+
+Additional compatible strings:
+
+- Xilinx internal board zc1232
+  "xlnx,zynqmp-zc1232-revA", "xlnx,zynqmp-zc1232"
+
+- Xilinx internal board zc1254
+  "xlnx,zynqmp-zc1254-revA", "xlnx,zynqmp-zc1254"
+
+- Xilinx internal board zc1275
+  "xlnx,zynqmp-zc1275-revA", "xlnx,zynqmp-zc1275"
+
+- Xilinx internal board zc1751
+  "xlnx,zynqmp-zc1751"
+
+- Xilinx 96boards compatible board zcu100
+  "xlnx,zynqmp-zcu100-revC", "xlnx,zynqmp-zcu100"
+
+- Xilinx evaluation board zcu102
+  "xlnx,zynqmp-zcu102-revA", "xlnx,zynqmp-zcu102"
+  "xlnx,zynqmp-zcu102-revB", "xlnx,zynqmp-zcu102"
+  "xlnx,zynqmp-zcu102-rev1.0", "xlnx,zynqmp-zcu102"
+
+- Xilinx evaluation board zcu104
+  "xlnx,zynqmp-zcu104-revA", "xlnx,zynqmp-zcu104"
+
+- Xilinx evaluation board zcu106
+  "xlnx,zynqmp-zcu106-revA", "xlnx,zynqmp-zcu106"
+
+- Xilinx evaluation board zcu111
+  "xlnx,zynqmp-zcu111-revA", "xlnx,zynqmp-zcu111"
diff --git a/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt b/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt
index 3e21eb822811..c1e70621799b 100644
--- a/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt
+++ b/Documentation/devicetree/bindings/bus/nvidia,tegra20-gmi.txt
@@ -73,7 +73,7 @@ Example with two SJA1000 CAN controllers connected to the GMI bus. We wrap the
 controllers with a simple-bus node since they are all connected to the same
 chip-select (CS4), in this example external address decoding is provided:
 
-gmi@70090000 {
+gmi@70009000 {
         compatible = "nvidia,tegra20-gmi";
         reg = <0x70009000 0x1000>;
         #address-cells = <2>;
@@ -84,7 +84,6 @@ gmi@70090000 {
         reset-names = "gmi";
         ranges = <4 0 0xd0000000 0xfffffff>;
 
-
         bus@4,0 {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -109,7 +108,7 @@ gmi@70090000 {
 Example with one SJA1000 CAN controller connected to the GMI bus
 on CS4:
 
-gmi@70090000 {
+gmi@70009000 {
         compatible = "nvidia,tegra20-gmi";
         reg = <0x70009000 0x1000>;
         #address-cells = <2>;
@@ -120,7 +119,6 @@ gmi@70090000 {
         reset-names = "gmi";
         ranges = <4 0 0xd0000000 0xfffffff>;
 
-
         can@4,0 {
                 reg = <4 0 0x100>;
                 nvidia,snor-mux-mode;
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index 76aec8a3724d..3c1f3a229eab 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -415,12 +415,27 @@ Secure Non-Volatile Storage (SNVS) Low Power (LP) RTC Node
         value type: <u32>
         Definition: LP register offset. default it is 0x34.
 
+   - clocks
+      Usage: optional, required if SNVS LP RTC requires explicit
+          enablement of clocks
+      Value type: <prop_encoded-array>
+      Definition:  a clock specifier describing the clock required for
+          enabling and disabling SNVS LP RTC.
+
+   - clock-names
+      Usage: optional, required if SNVS LP RTC requires explicit
+          enablement of clocks
+      Value type: <string>
+      Definition: clock name string should be "snvs-rtc".
+
 EXAMPLE
         sec_mon_rtc_lp@1 {
                 compatible = "fsl,sec-v4.0-mon-rtc-lp";
                 interrupts = <93 2>;
                 regmap = <&snvs>;
                 offset = <0x34>;
+                clocks = <&clks IMX7D_SNVS_CLK>;
+                clock-names = "snvs-rtc";
         };
 
 =====================================================================
@@ -543,6 +558,8 @@ FULL EXAMPLE
                         regmap = <&sec_mon>;
                         offset = <0x34>;
                         interrupts = <93 2>;
+                        clocks = <&clks IMX7D_SNVS_CLK>;
+                        clock-names = "snvs-rtc";
                 };
 
                 snvs-pwrkey@020cc000 {
diff --git a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
index baf9b34d20bf..b6a8cc0978cd 100644
--- a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
+++ b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
@@ -74,8 +74,8 @@ Example:
 
 bcm2835_i2s: i2s@7e203000 {
         compatible = "brcm,bcm2835-i2s";
-        reg = < 0x7e203000 0x20>,
-              < 0x7e101098 0x02>;
+        reg = < 0x7e203000 0x24>;
+        clocks = <&clocks BCM2835_CLOCK_PCM>;
 
         dmas = <&dma 2>,
                <&dma 3>;
diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
index ad876548ab5d..c1f65d1dac1d 100644
--- a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
@@ -10,6 +10,7 @@ Required properties:
     * And, optionally, one of the vendor specific compatible:
       + allwinner,sun4i-a10-mali
       + allwinner,sun7i-a20-mali
+      + allwinner,sun8i-h3-mali
       + allwinner,sun50i-h5-mali
       + amlogic,meson-gxbb-mali
       + amlogic,meson-gxl-mali
diff --git a/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt b/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
index 621b41c79faa..44d71469c914 100644
--- a/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
+++ b/Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
@@ -3,7 +3,9 @@
 EMIF - External Memory Interface - is an SDRAM controller used in
 TI SoCs. EMIF supports, based on the IP revision, one or more of
 DDR2/DDR3/LPDDR2 protocols. This binding describes a given instance
-of the EMIF IP and memory parts attached to it.
+of the EMIF IP and memory parts attached to it. Certain revisions
+of the EMIF controller also contain optional ECC support, which
+corrects one bit errors and detects two bit errors.
 
 Required properties:
 - compatible    : Should be of the form "ti,emif-<ip-rev>" where <ip-rev>
@@ -11,6 +13,8 @@ Required properties:
   compatible should be one of the following:
              "ti,emif-am3352"
              "ti,emif-am4372"
+             "ti,emif-dra7xx"
+             "ti,emif-keystone"
 
 - phy-type      : <u32> indicating the DDR phy type. Following are the
   allowed values
@@ -22,6 +26,7 @@ Required properties:
 - ti,hwmods     : For TI hwmods processing and omap device creation
   the value shall be "emif<n>" where <n> is the number of the EMIF
   instance with base 1.
+- interrupts    : interrupt used by the controller
 
 Required only for "ti,emif-am3352" and "ti,emif-am4372":
 - sram                  : Phandles for generic sram driver nodes,
@@ -71,3 +76,9 @@ emif: emif@4c000000 {
         sram = <&pm_sram_code
                 &pm_sram_data>;
 };
+
+emif1: emif@4c000000 {
+        compatible = "ti,emif-dra7xx";
+        reg = <0x4c000000 0x200>;
+        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+};
diff --git a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt
index a9aa79fb90ed..1aa6f2674af5 100644
--- a/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt
+++ b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt
@@ -21,7 +21,9 @@ Required properties :
    - timer: The timeout clock (clk_m). Present if phy_type == utmi.
    - utmi-pads: The clock needed to access the UTMI pad control registers.
      Present if phy_type == utmi.
-   - ulpi-link: The clock Tegra provides to the ULPI PHY (cdev2).
+   - ulpi-link: The clock Tegra provides to the ULPI PHY (usually pad DAP_MCLK2
+     with pad group aka "nvidia,pins" cdev2 and pin mux option config aka
+     "nvidia,function" pllp_out4).
      Present if phy_type == ulpi, and ULPI link mode is in use.
  - resets : Must contain an entry for each entry in reset-names.
    See ../reset/reset.txt for details.
diff --git a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
index 2c46f30b62c5..9a06e1fdbc42 100644
--- a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
@@ -11,6 +11,7 @@ Required properies:
    "st,stm32f429-pinctrl"
    "st,stm32f469-pinctrl"
    "st,stm32f746-pinctrl"
+   "st,stm32f769-pinctrl"
    "st,stm32h743-pinctrl"
    "st,stm32mp157-pinctrl"
    "st,stm32mp157-z-pinctrl"
diff --git a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
index 65783de0aedf..7bb0362828ec 100644
--- a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt
@@ -2,9 +2,8 @@
 
 Required properties:
 - compatible: "brcm,bcm2835-i2s"
-- reg: A list of base address and size entries:
-        * The first entry should cover the PCM registers
-        * The second entry should cover the PCM clock registers
+- reg: Should contain PCM registers location and length.
+- clocks: the (PCM) clock to use
 - dmas: List of DMA controller phandle and DMA request line ordered pairs.
 - dma-names: Identifier string for each DMA request line in the dmas property.
   These strings correspond 1:1 with the ordered pairs in dmas.
@@ -16,8 +15,8 @@ Example:
 
 bcm2835_i2s: i2s@7e203000 {
         compatible = "brcm,bcm2835-i2s";
-        reg = <0x7e203000 0x20>,
-              <0x7e101098 0x02>;
+        reg = <0x7e203000 0x24>;
+        clocks = <&clocks BCM2835_CLOCK_PCM>;
 
         dmas = <&dma 2>,
                <&dma 3>;
diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
index 62dd5baad70e..04fc368d828f 100644
--- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
@@ -2,8 +2,10 @@ Allwinner SoCs Watchdog timer
 
 Required properties:
 
-- compatible : should be either "allwinner,sun4i-a10-wdt" or
-               "allwinner,sun6i-a31-wdt"
+- compatible : should be one of
+        "allwinner,sun4i-a10-wdt"
+        "allwinner,sun6i-a31-wdt"
+        "allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"
 - reg : Specifies base physical address and size of the registers.
 
 Example:
diff --git a/MAINTAINERS b/MAINTAINERS
index d8aec0877e33..8fa200fddd16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1869,7 +1869,6 @@ Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/
 S:      Maintained
 F:      arch/arm/boot/dts/s3c*
 F:      arch/arm/boot/dts/s5p*
-F:      arch/arm/boot/dts/samsung*
 F:      arch/arm/boot/dts/exynos*
 F:      arch/arm64/boot/dts/exynos/
 F:      arch/arm/plat-samsung/
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ade7a38543dc..7e2424957809 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -163,7 +163,10 @@ dtb-$(CONFIG_ARCH_EXYNOS4) += \
         exynos4210-smdkv310.dtb \
         exynos4210-trats.dtb \
         exynos4210-universal_c210.dtb \
+        exynos4412-i9300.dtb \
+        exynos4412-i9305.dtb \
         exynos4412-itop-elite.dtb \
+        exynos4412-n710x.dtb \
         exynos4412-odroidu3.dtb \
         exynos4412-odroidx.dtb \
         exynos4412-odroidx2.dtb \
@@ -304,6 +307,8 @@ dtb-$(CONFIG_ARCH_LPC18XX) += \
 dtb-$(CONFIG_ARCH_LPC32XX) += \
         lpc3250-ea3250.dtb \
         lpc3250-phy3250.dtb
+dtb-$(CONFIG_ARCH_NPCM7XX) += \
+        nuvoton-npcm750-evb.dtb
 dtb-$(CONFIG_MACH_MESON6) += \
         meson6-atv1200.dtb
 dtb-$(CONFIG_MACH_MESON8) += \
@@ -396,6 +401,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6dl-icore-rqs.dtb \
         imx6dl-nit6xlite.dtb \
         imx6dl-nitrogen6x.dtb \
+        imx6dl-phytec-mira-rdk-nand.dtb \
         imx6dl-phytec-pbab01.dtb \
         imx6dl-rex-basic.dtb \
         imx6dl-riotboard.dtb \
@@ -435,6 +441,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6q-dfi-fs700-m60.dtb \
         imx6q-display5-tianma-tm070-1280x768.dtb \
         imx6q-dmo-edmqmx6.dtb \
+        imx6q-dms-ba16.dtb \
         imx6q-evi.dtb \
         imx6q-gk802.dtb \
         imx6q-gw51xx.dtb \
@@ -465,6 +472,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6q-nitrogen6_max.dtb \
         imx6q-nitrogen6_som2.dtb \
         imx6q-novena.dtb \
+        imx6q-phytec-mira-rdk-emmc.dtb \
+        imx6q-phytec-mira-rdk-nand.dtb \
         imx6q-phytec-pbab01.dtb \
         imx6q-pistachio.dtb \
         imx6q-rex-pro.dtb \
@@ -494,6 +503,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
         imx6q-zii-rdu2.dtb \
         imx6qp-nitrogen6_max.dtb \
         imx6qp-nitrogen6_som2.dtb \
+        imx6qp-phytec-mira-rdk-nand.dtb \
         imx6qp-sabreauto.dtb \
         imx6qp-sabresd.dtb \
         imx6qp-tx6qp-8037.dtb \
@@ -526,7 +536,9 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
         imx6ul-tx6ul-0010.dtb \
         imx6ul-tx6ul-0011.dtb \
         imx6ul-tx6ul-mainboard.dtb \
-        imx6ull-14x14-evk.dtb
+        imx6ull-14x14-evk.dtb \
+        imx6ull-colibri-eval-v3.dtb \
+        imx6ull-colibri-wifi-eval-v3.dtb
 dtb-$(CONFIG_SOC_IMX7D) += \
         imx7d-cl-som-imx7.dtb \
         imx7d-colibri-emmc-eval-v3.dtb \
@@ -673,6 +685,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
         am335x-lxm.dtb \
         am335x-moxa-uc-8100-me-t.dtb \
         am335x-nano.dtb \
+        am335x-pdu001.dtb \
         am335x-pepper.dtb \
         am335x-phycore-rdk.dtb \
         am335x-shc.dtb \
@@ -752,6 +765,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
         qcom-msm8960-cdp.dtb \
         qcom-msm8974-fairphone-fp2.dtb \
         qcom-msm8974-lge-nexus5-hammerhead.dtb \
+        qcom-msm8974-samsung-klte.dtb \
         qcom-msm8974-sony-xperia-castor.dtb \
         qcom-msm8974-sony-xperia-honami.dtb \
         qcom-mdm9615-wp8548-mangoh-green.dtb
@@ -784,6 +798,7 @@ dtb-$(CONFIG_ARCH_RENESAS) += \
         r8a7778-bockw.dtb \
         r8a7779-marzen.dtb \
         r8a7790-lager.dtb \
+        r8a7790-stout.dtb \
         r8a7791-koelsch.dtb \
         r8a7791-porter.dtb \
         r8a7792-blanche.dtb \
@@ -863,7 +878,7 @@ dtb-$(CONFIG_ARCH_STI) += \
         stih410-b2120.dtb \
         stih410-b2260.dtb \
         stih418-b2199.dtb
-dtb-$(CONFIG_ARCH_STM32)+= \
+dtb-$(CONFIG_ARCH_STM32) += \
         stm32f429-disco.dtb \
         stm32f469-disco.dtb \
         stm32f746-disco.dtb \
@@ -871,7 +886,9 @@ dtb-$(CONFIG_ARCH_STM32)+= \
         stm32429i-eval.dtb \
         stm32746g-eval.dtb \
         stm32h743i-eval.dtb \
-        stm32h743i-disco.dtb
+        stm32h743i-disco.dtb \
+        stm32mp157c-ed1.dtb \
+        stm32mp157c-ev1.dtb
 dtb-$(CONFIG_MACH_SUN4I) += \
         sun4i-a10-a1000.dtb \
         sun4i-a10-ba10-tvbox.dtb \
@@ -942,6 +959,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
         sun7i-a20-m3.dtb \
         sun7i-a20-mk808c.dtb \
         sun7i-a20-olimex-som-evb.dtb \
+        sun7i-a20-olimex-som204-evb.dtb \
+        sun7i-a20-olimex-som204-evb-emmc.dtb \
         sun7i-a20-olinuxino-lime.dtb \
         sun7i-a20-olinuxino-lime2.dtb \
         sun7i-a20-olinuxino-lime2-emmc.dtb \
@@ -974,6 +993,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
         sun8i-a83t-cubietruck-plus.dtb \
         sun8i-a83t-tbs-a711.dtb \
         sun8i-h2-plus-orangepi-r1.dtb \
+        sun8i-h2-plus-bananapi-m2-zero.dtb \
         sun8i-h2-plus-orangepi-zero.dtb \
         sun8i-h3-bananapi-m2-plus.dtb \
         sun8i-h3-beelink-x2.dtb \
@@ -1022,6 +1042,7 @@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \
         tegra114-tn7.dtb
 dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \
         tegra124-apalis-eval.dtb \
+        tegra124-apalis-v1.2-eval.dtb \
         tegra124-jetson-tk1.dtb \
         tegra124-nyan-big.dtb \
         tegra124-nyan-blaze.dtb \
@@ -1047,6 +1068,7 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
         uniphier-sld8-ref.dtb
 dtb-$(CONFIG_ARCH_VERSATILE) += \
         versatile-ab.dtb \
+        versatile-ab-ib2.dtb \
         versatile-pb.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += \
         vexpress-v2p-ca5s.dtb \
@@ -1062,12 +1084,18 @@ dtb-$(CONFIG_ARCH_VT8500) += \
         wm8750-apc8750.dtb \
         wm8850-w70v2.dtb
 dtb-$(CONFIG_ARCH_ZYNQ) += \
+        zynq-cc108.dtb \
         zynq-microzed.dtb \
         zynq-parallella.dtb \
         zynq-zc702.dtb \
         zynq-zc706.dtb \
+        zynq-zc770-xm010.dtb \
+        zynq-zc770-xm011.dtb \
+        zynq-zc770-xm012.dtb \
+        zynq-zc770-xm013.dtb \
         zynq-zed.dtb \
-        zynq-zybo.dtb
+        zynq-zybo.dtb \
+        zynq-zybo-z7.dtb
 dtb-$(CONFIG_MACH_ARMADA_370) += \
         armada-370-db.dtb \
         armada-370-dlink-dns327l.dtb \
@@ -1129,6 +1157,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
 dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
 dtb-$(CONFIG_ARCH_ASPEED) += \
         aspeed-ast2500-evb.dtb \
+        aspeed-bmc-arm-centriq2400-rep.dtb \
         aspeed-bmc-opp-palmetto.dtb \
         aspeed-bmc-opp-romulus.dtb \
         aspeed-bmc-opp-witherspoon.dtb \
diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
index 3f2480d05a3b..58baee158e64 100644
--- a/arch/arm/boot/dts/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
@@ -342,7 +342,7 @@
         };
 
         baseboard_eeprom: baseboard_eeprom@50 {
-                compatible = "at,24c256";
+                compatible = "atmel,24c256";
                 reg = <0x50>;
 
                 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/am335x-pdu001.dts b/arch/arm/boot/dts/am335x-pdu001.dts
new file mode 100644
index 000000000000..1ad530a39a95
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-pdu001.dts
@@ -0,0 +1,595 @@
+/*
+ * pdu001.dts
+ *
+ * EETS GmbH PDU001 board device tree file
+ *
+ * Copyright (C) 2018 EETS GmbH - http://www.eets.ch/
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * SPDX-License-Identifier:  GPL-2.0+
+ */
+
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/leds/leds-pca9532.h>
+
+/ {
+        model = "EETS,PDU001";
+        compatible = "ti,am33xx";
+
+        chosen {
+                stdout-path = &uart3;
+        };
+
+        cpus {
+                cpu@0 {
+                        cpu0-supply = <&vdd1_reg>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x80000000 0x10000000>; /* 256 MB */
+        };
+
+        vbat: fixedregulator@0 {
+                compatible = "regulator-fixed";
+                regulator-name = "vbat";
+                regulator-min-microvolt = <3600000>;
+                regulator-max-microvolt = <3600000>;
+                regulator-boot-on;
+        };
+
+        lis3_reg: fixedregulator@1 {
+                compatible = "regulator-fixed";
+                regulator-name = "lis3_reg";
+                regulator-boot-on;
+        };
+
+        panel {
+                compatible = "ti,tilcdc,panel";
+                status = "okay";
+                pinctrl-names = "default";
+                pinctrl-0 = <&lcd_pins_s0>;
+                panel-info {
+                        ac-bias           = <255>;
+                        ac-bias-intrpt    = <0>;
+                        dma-burst-sz      = <16>;
+                        bpp               = <16>;
+                        fdd               = <0x80>;
+                        sync-edge         = <0>;
+                        sync-ctrl         = <1>;
+                        raster-order      = <0>;
+                        fifo-th           = <0>;
+                };
+
+                display-timings {
+                        240x320p16 {
+                                clock-frequency = <6500000>;
+                                hactive = <240>;
+                                vactive = <320>;
+                                hfront-porch = <6>;
+                                hback-porch = <6>;
+                                hsync-len = <1>;
+                                vback-porch = <6>;
+                                vfront-porch = <6>;
+                                vsync-len = <1>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                pixelclk-active = <1>;
+                                de-active = <0>;
+                        };
+                };
+        };
+};
+
+&am33xx_pinmux {
+        pinctrl-names = "default";
+        pinctrl-0 = <&clkout2_pin>;
+
+        i2c0_pins: pinmux_i2c0_pins {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0)       /* i2c0_sda.i2c0_sda */
+                        AM33XX_IOPAD(0x98c, PIN_INPUT_PULLUP | MUX_MODE0)       /* i2c0_scl.i2c0_scl */
+                >;
+        };
+
+        i2c1_pins: pinmux_i2c1_pins {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE2)       /* spi0_d1.i2c1_sda */
+                        AM33XX_IOPAD(0x95c, PIN_INPUT_PULLUP | MUX_MODE2)       /* spi0_cs0.i2c1_scl */
+                >;
+        };
+
+        i2c2_pins: pinmux_i2c2_pins {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE2)       /* spi0_clk.i2c2_sda */
+                        AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE2)       /* spi0_d0.i2c2_scl */
+                >;
+        };
+
+        spi1_pins: pinmux_spi1_pins {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x990, PIN_OUTPUT | MUX_MODE3)             /* mcasp0_aclkx.spi1_sclk */
+                        AM33XX_IOPAD(0x994, PIN_OUTPUT | MUX_MODE3)             /* mcasp0_fsx.spi1_d0 */
+                        AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE3)     /* mcasp0_axr0.spi1_d1 */
+                        AM33XX_IOPAD(0x99C, PIN_OUTPUT | MUX_MODE3)             /* mcasp0_ahclkr.spi1_cs0 */
+                >;
+        };
+
+        uart0_pins: pinmux_uart0_pins {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x96C, PIN_OUTPUT | MUX_MODE7)             /* uart0_rtsn.gpio1_9 */
+                        AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)       /* uart0_rxd.uart0_rxd */
+                        AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)    /* uart0_txd.uart0_txd */
+                >;
+        };
+
+        uart1_pins: pinmux_uart1_pins {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x980, PIN_INPUT_PULLUP | MUX_MODE0)       /* uart1_rxd.uart1_rxd */
+                        AM33XX_IOPAD(0x984, PIN_OUTPUT_PULLDOWN | MUX_MODE0)    /* uart1_txd.uart1_txd */
+                >;
+        };
+
+        uart3_pins: pinmux_uart3_pins {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP | MUX_MODE1)       /* spi0_cs1.uart3_rxd */
+                        AM33XX_IOPAD(0x964, PIN_OUTPUT_PULLDOWN | MUX_MODE1)    /* ecap0_in_pwm0_out.uart3_txd */
+                >;
+        };
+
+        clkout2_pin: pinmux_clkout2_pin {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3)    /* xdma_event_intr1.clkout2 */
+                >;
+        };
+
+        cpsw_default: cpsw_default {
+                pinctrl-single,pins = <
+                        /* Port 1 (emac0) */
+                        AM33XX_IOPAD(0x908, PIN_INPUT | MUX_MODE0)              /* mii1_col.mii1_col */
+                        AM33XX_IOPAD(0x90C, PIN_INPUT | MUX_MODE0)              /* mii1_crs.mii1_crs */
+                        AM33XX_IOPAD(0x910, PIN_INPUT | MUX_MODE0)              /* mii1_rxer.mii1_rxer */
+                        AM33XX_IOPAD(0x914, PIN_OUTPUT | MUX_MODE0)             /* mii1_txen.mii1_txen */
+                        AM33XX_IOPAD(0x918, PIN_INPUT | MUX_MODE0)              /* mii1_rxdv.mii1_rxdv */
+                        AM33XX_IOPAD(0x91c, PIN_OUTPUT | MUX_MODE0)             /* mii1_txd3.mii1_txd3 */
+                        AM33XX_IOPAD(0x920, PIN_OUTPUT | MUX_MODE0)             /* mii1_txd2.mii1_txd2 */
+                        AM33XX_IOPAD(0x924, PIN_OUTPUT | MUX_MODE0)             /* mii1_txd1.mii1_txd1 */
+                        AM33XX_IOPAD(0x928, PIN_OUTPUT | MUX_MODE0)             /* mii1_txd0.mii1_txd0 */
+                        AM33XX_IOPAD(0x92c, PIN_INPUT | MUX_MODE0)              /* mii1_txclk.mii1_txclk */
+                        AM33XX_IOPAD(0x930, PIN_INPUT | MUX_MODE0)              /* mii1_rxclk.mii1_rxclk */
+                        AM33XX_IOPAD(0x934, PIN_INPUT | MUX_MODE0)              /* mii1_rxd3.mii1_rxd3 */
+                        AM33XX_IOPAD(0x938, PIN_INPUT | MUX_MODE0)              /* mii1_rxd2.mii1_rxd2 */
+                        AM33XX_IOPAD(0x93c, PIN_INPUT | MUX_MODE0)              /* mii1_rxd1.mii1_rxd1 */
+                        AM33XX_IOPAD(0x940, PIN_INPUT | MUX_MODE0)              /* mii1_rxd0.mii1_rxd0 */
+
+                        /* Port 2 (emac1) */
+                        AM33XX_IOPAD(0x840, PIN_OUTPUT | MUX_MODE1)             /* mii2_txen.gpmc_a0 */
+                        AM33XX_IOPAD(0x844, PIN_INPUT | MUX_MODE1)              /* mii2_rxdv.gpmc_a1 */
+                        AM33XX_IOPAD(0x848, PIN_OUTPUT | MUX_MODE1)             /* mii2_txd3.gpmc_a2 */
+                        AM33XX_IOPAD(0x84c, PIN_OUTPUT | MUX_MODE1)             /* mii2_txd2.gpmc_a3 */
+                        AM33XX_IOPAD(0x850, PIN_OUTPUT | MUX_MODE1)             /* mii2_txd1.gpmc_a4 */
+                        AM33XX_IOPAD(0x854, PIN_OUTPUT | MUX_MODE1)             /* mii2_txd0.gpmc_a5 */
+                        AM33XX_IOPAD(0x858, PIN_INPUT | MUX_MODE1)              /* mii2_txclk.gpmc_a6 */
+                        AM33XX_IOPAD(0x85c, PIN_INPUT | MUX_MODE1)              /* mii2_rxclk.gpmc_a7 */
+                        AM33XX_IOPAD(0x860, PIN_INPUT | MUX_MODE1)              /* mii2_rxd3.gpmc_a8 */
+                        AM33XX_IOPAD(0x864, PIN_INPUT | MUX_MODE1)              /* mii2_rxd2.gpmc_a9 */
+                        AM33XX_IOPAD(0x868, PIN_INPUT | MUX_MODE1)              /* mii2_rxd1.gpmc_a10 */
+                        AM33XX_IOPAD(0x86C, PIN_INPUT | MUX_MODE1)              /* mii2_rxd0.gpmc_a11 */
+                        AM33XX_IOPAD(0x870, PIN_INPUT | MUX_MODE1)              /* mii2_crs.gpmc_wait0 */
+                        AM33XX_IOPAD(0x874, PIN_INPUT | MUX_MODE1)              /* mii2_rxer.gpmc_wpn */
+                        AM33XX_IOPAD(0x878, PIN_INPUT | MUX_MODE1)              /* mii2_col.gpmc_ben1 */
+                >;
+        };
+
+        davinci_mdio_default: davinci_mdio_default {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)       /* mdio_data.mdio_data */
+                        AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0)                      /* mdio_clk.mdio_clk */
+                >;
+        };
+
+        mmc1_pins: pinmux_mmc1_pins {
+                /* eMMC */
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_dat3 */
+                        AM33XX_IOPAD(0x8f4, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_dat2 */
+                        AM33XX_IOPAD(0x8f8, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_dat1 */
+                        AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_dat0 */
+                        AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_clk */
+                        AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0)       /* mmc0_cmd */
+                >;
+        };
+
+        mmc2_pins: pinmux_mmc2_pins {
+                /* SD cardcage */
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE1)       /* gpmc_ad3.mmc1_dat3 */
+                        AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE1)       /* gpmc_ad2.mmc1_dat2 */
+                        AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE1)       /* gpmc_ad1.mmc1_dat1 */
+                        AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE1)       /* gpmc_ad0.mmc1_dat0 */
+                        AM33XX_IOPAD(0x880, PIN_INPUT_PULLUP | MUX_MODE2)       /* gpmc_csn1.mmc1_clk */
+                        AM33XX_IOPAD(0x884, PIN_INPUT_PULLUP | MUX_MODE2)       /* gpmc_csn2.mmc1_cmd */
+                        /* card change signal for frontpanel SD cardcage */
+                        AM33XX_IOPAD(0x890, PIN_INPUT | MUX_MODE7)              /* gpmc_advn_ale.gpio2_2 */
+                >;
+        };
+
+        lcd_pins_s0: lcd_pins_s0 {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0)             /* lcd_data0.lcd_data0 */
+                        AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0)             /* lcd_data1.lcd_data1 */
+                        AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0)             /* lcd_data2.lcd_data2 */
+                        AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0)             /* lcd_data3.lcd_data3 */
+                        AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0)             /* lcd_data4.lcd_data4 */
+                        AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0)             /* lcd_data5.lcd_data5 */
+                        AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0)             /* lcd_data6.lcd_data6 */
+                        AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0)             /* lcd_data7.lcd_data7 */
+                        AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0)             /* lcd_data8.lcd_data8 */
+                        AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0)             /* lcd_data9.lcd_data9 */
+                        AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0)             /* lcd_data10.lcd_data10 */
+                        AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0)             /* lcd_data11.lcd_data11 */
+                        AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0)             /* lcd_data12.lcd_data12 */
+                        AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0)             /* lcd_data13.lcd_data13 */
+                        AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0)             /* lcd_data14.lcd_data14 */
+                        AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0)             /* lcd_data15.lcd_data15 */
+                        AM33XX_IOPAD(0x8e0, PIN_OUTPUT | MUX_MODE0)             /* lcd_vsync.lcd_vsync */
+                        AM33XX_IOPAD(0x8e4, PIN_OUTPUT | MUX_MODE0)             /* lcd_hsync.lcd_hsync */
+                        AM33XX_IOPAD(0x8e8, PIN_OUTPUT | MUX_MODE0)             /* lcd_pclk.lcd_pclk */
+                        AM33XX_IOPAD(0x8ec, PIN_OUTPUT | MUX_MODE0)             /* lcd_ac_bias_en.lcd_ac_bias_en */
+                >;
+        };
+
+        dcan0_pins: pinmux_dcan0_pins {
+                pinctrl-single,pins = <
+                        AM33XX_IOPAD(0x978, PIN_OUTPUT | MUX_MODE2)             /* uart1_ctsn.d_can0_tx */
+                        AM33XX_IOPAD(0x97c, PIN_INPUT_PULLDOWN | MUX_MODE2)     /* uart1_rtsn.d_can0_rx */
+                >;
+        };
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_pins>;
+
+        rts-gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+        rs485-rts-active-high;
+        rs485-rts-delay = <0 0>;
+        linux,rs485-enabled-at-boot-time;
+
+        status = "okay";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_pins>;
+
+        status = "okay";
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart3_pins>;
+
+        status = "okay";
+};
+
+&i2c0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_pins>;
+
+        status = "okay";
+        clock-frequency = <400000>;
+
+        tps: tps@2d {
+                reg = <0x2d>;
+        };
+
+        m2_eeprom: m2_eeprom@50 {
+                compatible = "atmel,24c256";
+                reg = <0x50>;
+                status = "okay";
+        };
+};
+
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_pins>;
+
+        status = "okay";
+        clock-frequency = <100000>;
+
+        board_24aa025e48: board_24aa025e48@50 {
+                compatible = "atmel,24c02";
+                reg = <0x50>;
+        };
+
+        backplane_24aa025e48: backplane_24aa025e48@53 {
+                compatible = "atmel,24c02";
+                reg = <0x53>;
+        };
+
+        pca9532: pca9532@60 {
+                compatible = "nxp,pca9532";
+                reg = <0x60>;
+                psc0 = <0x97>;
+                pwm0 = <0x80>;
+                psc1 = <0x97>;
+                pwm1 = <0x10>;
+
+                run.red@0 {
+                        type = <PCA9532_TYPE_LED>;
+                };
+                run.green@1 {
+                        type = <PCA9532_TYPE_LED>;
+                        default-state = "on";
+                };
+                s2.red@2 {
+                        type = <PCA9532_TYPE_LED>;
+                };
+                s2.green@3 {
+                        type = <PCA9532_TYPE_LED>;
+                };
+                s1.yellow@4 {
+                        type = <PCA9532_TYPE_LED>;
+                };
+                s1.green@5 {
+                        type = <PCA9532_TYPE_LED>;
+                };
+        };
+
+        pca9530: pca9530@61 {
+                compatible = "nxp,pca9530";
+                reg = <0x61>;
+
+                tft-panel@0 {
+                        type = <PCA9532_TYPE_LED>;
+                        linux,default-trigger = "backlight";
+                        default-state = "on";
+                };
+        };
+
+        mcp79400: mcp79400@6f {
+                compatible = "microchip,mcp7940x";
+                reg = <0x6f>;
+        };
+};
+
+&i2c2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c2_pins>;
+
+        status = "okay";
+        clock-frequency = <100000>;
+};
+
+&spi1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spi1_pins>;
+        ti,pindir-d0-out-d1-in;
+        status = "okay";
+
+        cfaf240320a032t {
+                compatible = "orisetech,otm3225a";
+                reg = <0>;
+                spi-max-frequency = <1000000>;
+                // SPI mode 3
+                spi-cpol;
+                spi-cpha;
+                status = "okay";
+        };
+};
+
+&usb {
+        status = "okay";
+};
+
+&usb_ctrl_mod {
+        status = "okay";
+};
+
+&usb0_phy {
+        status = "okay";
+};
+
+&usb1_phy {
+        status = "okay";
+};
+
+&usb0 {
+        status = "okay";
+};
+
+&usb1 {
+        status = "okay";
+};
+
+&cppi41dma  {
+        status = "okay";
+};
+
+/*
+ * Disable soc's rtc as we have no VBAT for it. This makes the board
+ * rtc (Microchip MCP79400) the default rtc device 'rtc0'.
+ */
+&rtc {
+        status = "disabled";
+};
+
+&lcdc {
+        status = "okay";
+};
+
+&elm {
+        status = "okay";
+};
+
+#include "tps65910.dtsi"
+
+&tps {
+        vcc1-supply = <&vbat>;
+        vcc2-supply = <&vbat>;
+        vcc3-supply = <&vbat>;
+        vcc4-supply = <&vbat>;
+        vcc5-supply = <&vbat>;
+        vcc6-supply = <&vbat>;
+        vcc7-supply = <&vbat>;
+        vccio-supply = <&vbat>;
+
+        regulators {
+                vrtc_reg: regulator@0 {
+                        regulator-name = "ldo_vrtc";
+                        regulator-always-on;
+                };
+
+                vio_reg: regulator@1 {
+                        regulator-name = "buck_vdd_ddr";
+                        regulator-always-on;
+                };
+
+                vdd1_reg: regulator@2 {
+                        /* VDD_MPU voltage limits */
+                        regulator-name = "buck_vdd_mpu";
+                        regulator-min-microvolt = <912500>;
+                        regulator-max-microvolt = <1312500>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                vdd2_reg: regulator@3 {
+                        /* VDD_CORE voltage limits */
+                        regulator-name = "buck_vdd_core";
+                        regulator-min-microvolt = <912500>;
+                        regulator-max-microvolt = <1150000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                vdd3_reg: regulator@4 {
+                        regulator-name = "boost_res";
+                        regulator-always-on;
+                };
+
+                vdig1_reg: regulator@5 {
+                        regulator-name = "ldo_vdig1";
+                        regulator-always-on;
+                };
+
+                vdig2_reg: regulator@6 {
+                        regulator-name = "ldo_vdig2";
+                        regulator-always-on;
+                };
+
+                vpll_reg: regulator@7 {
+                        regulator-name = "ldo_vpll";
+                        regulator-always-on;
+                };
+
+                vdac_reg: regulator@8 {
+                        regulator-name = "ldo_vdac";
+                        regulator-always-on;
+                };
+
+                vaux1_reg: regulator@9 {
+                        regulator-name = "ldo_vaux1";
+                        regulator-always-on;
+                };
+
+                vaux2_reg: regulator@10 {
+                        regulator-name = "ldo_vaux2";
+                        regulator-always-on;
+                };
+
+                vaux33_reg: regulator@11 {
+                        regulator-name = "ldo_vaux33";
+                        regulator-always-on;
+                };
+
+                vmmc_reg: regulator@12 {
+                        regulator-name = "ldo_vmmc";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                vbb_reg: regulator@13 {
+                        regulator-name = "bat_vbb";
+                };
+        };
+};
+
+&mac {
+        pinctrl-names = "default";
+        pinctrl-0 = <&cpsw_default>;
+        dual_emac;                      /* no switch, two distinct MACs */
+        status = "okay";
+};
+
+&davinci_mdio {
+        pinctrl-names = "default";
+        pinctrl-0 = <&davinci_mdio_default>;
+        status = "okay";
+};
+
+&cpsw_emac0 {
+        phy_id = <&davinci_mdio>, <0>;
+        phy-mode = "mii";
+        dual_emac_res_vlan = <1>;
+};
+
+&cpsw_emac1 {
+        phy_id = <&davinci_mdio>, <1>;
+        phy-mode = "mii";
+        dual_emac_res_vlan = <2>;
+};
+
+&tscadc {
+        status = "okay";
+        tsc {
+                ti,wires = <4>;
+                ti,x-plate-resistance = <200>;
+                ti,coordinate-readouts = <5>;
+                ti,wire-config = <0x01 0x10 0x22 0x33>;
+                ti,charge-delay = <0x400>;
+        };
+
+        adc {
+                ti,adc-channels = <4 5 6 7>;
+        };
+};
+
+&mmc1 {
+        status = "okay";
+        vmmc-supply = <&vmmc_reg>;
+        bus-width = <4>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc1_pins>;
+        non-removable;
+};
+
+&mmc2 {
+        status = "okay";
+        vmmc-supply = <&vmmc_reg>;
+        bus-width = <4>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc2_pins>;
+        cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
+};
+
+&sham {
+        status = "okay";
+};
+
+&aes {
+        status = "okay";
+};
+
+&dcan0 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&dcan0_pins>;
+};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 628c77b0b386..9cd62bc2ca35 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -147,6 +147,8 @@
                 mpu {
                         compatible = "ti,omap3-mpu";
                         ti,hwmods = "mpu";
+                        pm-sram = <&pm_sram_code
+                                   &pm_sram_data>;
                 };
         };
 
@@ -905,6 +907,21 @@
                 ocmcram: ocmcram@40300000 {
                         compatible = "mmio-sram";
                         reg = <0x40300000 0x10000>; /* 64k */
+                        ranges = <0x0 0x40300000 0x10000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+
+                        pm_sram_code: pm-sram-code@0 {
+                                compatible = "ti,sram";
+                                reg = <0x0 0x1000>;
+                                protect-exec;
+                        };
+
+                        pm_sram_data: pm-sram-data@1000 {
+                                compatible = "ti,sram";
+                                reg = <0x1000 0x1000>;
+                                pool;
+                        };
                 };
 
                 elm: elm@48080000 {
@@ -945,6 +962,10 @@
                         compatible = "ti,emif-am3352";
                         reg = <0x4c000000 0x1000000>;
                         ti,hwmods = "emif";
+                        interrupts = <101>;
+                        sram = <&pm_sram_code
+                                &pm_sram_data>;
+                        ti,no-idle;
                 };
 
                 gpmc: gpmc@50000000 {
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 964f3ef79728..f0cbd86312dc 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -92,6 +92,16 @@
                 };
         };
 
+        soc {
+                compatible = "ti,omap-infra";
+                mpu {
+                        compatible = "ti,omap4-mpu";
+                        ti,hwmods = "mpu";
+                        pm-sram = <&pm_sram_code
+                                   &pm_sram_data>;
+                };
+        };
+
         gic: interrupt-controller@48241000 {
                 compatible = "arm,cortex-a9-gic";
                 interrupt-controller;
@@ -143,6 +153,7 @@
                 #size-cells = <1>;
                 ranges;
                 ti,hwmods = "l3_main";
+                ti,no-idle;
                 reg = <0x44000000 0x400000
                        0x44800000 0x400000>;
                 interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
@@ -237,6 +248,10 @@
                         compatible = "ti,emif-am4372";
                         reg = <0x4c000000 0x1000000>;
                         ti,hwmods = "emif";
+                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                        ti,no-idle;
+                        sram = <&pm_sram_code
+                                &pm_sram_data>;
                 };
 
                 edma: edma@49000000 {
@@ -1141,6 +1156,21 @@
                 ocmcram: ocmcram@40300000 {
                         compatible = "mmio-sram";
                         reg = <0x40300000 0x40000>; /* 256k */
+                        ranges = <0x0 0x40300000 0x40000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+
+                        pm_sram_code: pm-sram-code@0 {
+                                compatible = "ti,sram";
+                                reg = <0x0 0x1000>;
+                                protect-exec;
+                        };
+
+                        pm_sram_data: pm-sram-data@1000 {
+                                compatible = "ti,sram";
+                                reg = <0x1000 0x1000>;
+                                pool;
+                        };
                 };
 
                 dcan0: can@481cc000 {
diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index c3b1a3fb5a2e..8fe95cd7232a 100644
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -805,7 +805,7 @@
 };
 
 &usb1 {
-        dr_mode = "peripheral";
+        dr_mode = "otg";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 3fa3b226995d..4118802b7fea 100644
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -600,7 +600,7 @@
 };
 
 &usb1 {
-        dr_mode = "peripheral";
+        dr_mode = "otg";
         status = "okay";
         pinctrl-names = "default";
         pinctrl-0 = <&usb1_pins>;
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 00c3d1de384f..a66941885c11 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -856,7 +856,7 @@
 };
 
 &usb1 {
-        dr_mode = "peripheral";
+        dr_mode = "otg";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 6d3c83743156..a2555140babc 100644
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -10,8 +10,8 @@
 #include "dra72x.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "am57xx-idk-common.dtsi"
 #include "dra72x-mmc-iodelay.dtsi"
+#include "am57xx-idk-common.dtsi"
 
 / {
         model = "TI AM5718 IDK";
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index 9ab0af5017df..3a02ed720957 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -9,9 +9,8 @@
 /dts-v1/;
 
 #include "dra74x.dtsi"
-#include "am572x-idk-common.dtsi"
-#include "am57xx-idk-common.dtsi"
 #include "dra74x-mmc-iodelay.dtsi"
+#include "am572x-idk-common.dtsi"
 
 / {
         model = "TI AM5728 IDK";
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index ab60035bc50c..6204a266212a 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -442,6 +442,7 @@
         pinctrl-0 = <&mmc2_pins_default>;
 
         vmmc-supply = <&vdd_3v3>;
+        vqmmc-supply = <&vdd_3v3>;
         bus-width = <8>;
         ti,non-removable;
         cap-mmc-dual-data-rate;
diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 97aa8e6a56da..43cdf523a8a0 100644
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -115,6 +115,17 @@
                         DRA7XX_CORE_IOPAD(0x37d4, MUX_MODE15 | PULL_UP) /* dcan1_rx.off */
                 >;
         };
+
+        mmc1_pins_default: mmc1_pins_default {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mmc1_clk.clk */
+                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */
+                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */
+                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */
+                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */
+                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */
+                >;
+        };
 };
 
 &i2c1 {
@@ -410,6 +421,7 @@
 &mmc2 {
         status = "okay";
         vmmc-supply = <&v3_3d>;
+        vqmmc-supply = <&v3_3d>;
         bus-width = <8>;
         ti,non-removable;
         max-frequency = <96000000>;
diff --git a/arch/arm/boot/dts/animeo_ip.dts b/arch/arm/boot/dts/animeo_ip.dts
index b67a75179784..d7c841932701 100644
--- a/arch/arm/boot/dts/animeo_ip.dts
+++ b/arch/arm/boot/dts/animeo_ip.dts
@@ -24,7 +24,7 @@
         };
 
         chosen {
-                linux,stdout-path = &usart2;
+                stdout-path = &usart2;
         };
 
         memory {
diff --git a/arch/arm/boot/dts/arm-realview-eb.dtsi b/arch/arm/boot/dts/arm-realview-eb.dtsi
index e2e9599596e2..a917cf8825ca 100644
--- a/arch/arm/boot/dts/arm-realview-eb.dtsi
+++ b/arch/arm/boot/dts/arm-realview-eb.dtsi
@@ -143,6 +143,43 @@
                 port1-otg;
         };
 
+        bridge {
+                compatible = "ti,ths8134a", "ti,ths8134";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
+                                vga_bridge_in: endpoint {
+                                        remote-endpoint = <&clcd_pads>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                vga_bridge_out: endpoint {
+                                        remote-endpoint = <&vga_con_in>;
+                                };
+                        };
+                };
+        };
+
+        vga {
+                compatible = "vga-connector";
+
+                port {
+                        vga_con_in: endpoint {
+                                remote-endpoint = <&vga_bridge_out>;
+                        };
+                };
+        };
+
         /* These peripherals are inside the FPGA */
         fpga {
                 #address-cells = <1>;
@@ -409,36 +446,15 @@
                         interrupt-names = "combined";
                         clocks = <&oscclk0>, <&pclk>;
                         clock-names = "clcdclk", "apb_pclk";
+                        /* 1024x768 16bpp @65MHz works fine */
+                        max-memory-bandwidth = <95000000>;
 
                         port {
                                 clcd_pads: endpoint {
-                                        remote-endpoint = <&clcd_panel>;
+                                        remote-endpoint = <&vga_bridge_in>;
                                         arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
                                 };
                         };
-
-                        panel {
-                                compatible = "panel-dpi";
-
-                                port {
-                                        clcd_panel: endpoint {
-                                                remote-endpoint = <&clcd_pads>;
-                                        };
-                                };
-
-                                /* Standard 640x480 VGA timings */
-                                panel-timing {
-                                        clock-frequency = <25175000>;
-                                        hactive = <640>;
-                                        hback-porch = <48>;
-                                        hfront-porch = <16>;
-                                        hsync-len = <96>;
-                                        vactive = <480>;
-                                        vback-porch = <33>;
-                                        vfront-porch = <10>;
-                                        vsync-len = <2>;
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts
index c789564f2803..f935b72d3d96 100644
--- a/arch/arm/boot/dts/arm-realview-pb1176.dts
+++ b/arch/arm/boot/dts/arm-realview-pb1176.dts
@@ -161,6 +161,43 @@
                 port1-otg;
         };
 
+        bridge {
+                compatible = "ti,ths8134a", "ti,ths8134";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
+                                vga_bridge_in: endpoint {
+                                        remote-endpoint = <&clcd_pads>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                vga_bridge_out: endpoint {
+                                        remote-endpoint = <&vga_con_in>;
+                                };
+                        };
+                };
+        };
+
+        vga {
+                compatible = "vga-connector";
+
+                port {
+                        vga_con_in: endpoint {
+                                remote-endpoint = <&vga_bridge_out>;
+                        };
+                };
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -403,36 +440,15 @@
                         interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&oscclk0>, <&pclk>;
                         clock-names = "clcdclk", "apb_pclk";
+                        /* 1024x768 16bpp @65MHz works fine */
+                        max-memory-bandwidth = <95000000>;
 
                         port {
                                 clcd_pads: endpoint {
-                                        remote-endpoint = <&clcd_panel>;
+                                        remote-endpoint = <&vga_bridge_in>;
                                         arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
                                 };
                         };
-
-                        panel {
-                                compatible = "panel-dpi";
-
-                                port {
-                                        clcd_panel: endpoint {
-                                                remote-endpoint = <&clcd_pads>;
-                                        };
-                                };
-
-                                /* Standard 640x480 VGA timings */
-                                panel-timing {
-                                        clock-frequency = <25175000>;
-                                        hactive = <640>;
-                                        hback-porch = <48>;
-                                        hfront-porch = <16>;
-                                        hsync-len = <96>;
-                                        vactive = <480>;
-                                        vback-porch = <33>;
-                                        vfront-porch = <10>;
-                                        vsync-len = <2>;
-                                };
-                        };
                 };
         };
 
@@ -564,7 +580,5 @@
                         clocks = <&pclk>;
                         clock-names = "apb_pclk";
                 };
-
-
         };
 };
diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts
index 3944765ac4b0..36203288de42 100644
--- a/arch/arm/boot/dts/arm-realview-pb11mp.dts
+++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts
@@ -242,6 +242,49 @@
                 bank-width = <4>;
         };
 
+        bridge {
+                compatible = "ti,ths8134a", "ti,ths8134";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
+                                vga_bridge_in: endpoint {
+                                        remote-endpoint = <&clcd_pads>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                vga_bridge_out: endpoint {
+                                        remote-endpoint = <&vga_con_in>;
+                                };
+                        };
+                };
+        };
+
+        vga {
+                /*
+                 * This DDC I2C is connected directly to the DVI portions
+                 * of the connector, so it's not really working when the
+                 * monitor is connected to the VGA connector.
+                 */
+                compatible = "vga-connector";
+                ddc-i2c-bus = <&i2c1>;
+
+                port {
+                        vga_con_in: endpoint {
+                                remote-endpoint = <&vga_bridge_out>;
+                        };
+                };
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -575,6 +618,13 @@
                         clock-names = "apb_pclk";
                 };
 
+                i2c1: i2c@10016000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "arm,versatile-i2c";
+                        reg = <0x10016000 0x1000>;
+                };
+
                 rtc: rtc@10017000 {
                         compatible = "arm,pl031", "arm,primecell";
                         reg = <0x10017000 0x1000>;
@@ -609,37 +659,15 @@
                         interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&oscclk4>, <&pclk>;
                         clock-names = "clcdclk", "apb_pclk";
-                        max-memory-bandwidth = <130000000>; /* 16bpp @ 63.5MHz */
+                        /* 1024x768 16bpp @65MHz works fine */
+                        max-memory-bandwidth = <95000000>;
 
                         port {
                                 clcd_pads: endpoint {
-                                        remote-endpoint = <&clcd_panel>;
+                                        remote-endpoint = <&vga_bridge_in>;
                                         arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
                                 };
                         };
-
-                        panel {
-                                compatible = "panel-dpi";
-
-                                port {
-                                        clcd_panel: endpoint {
-                                                remote-endpoint = <&clcd_pads>;
-                                        };
-                                };
-
-                                /* Standard 640x480 VGA timings */
-                                panel-timing {
-                                        clock-frequency = <25175000>;
-                                        hactive = <640>;
-                                        hback-porch = <48>;
-                                        hfront-porch = <16>;
-                                        hsync-len = <96>;
-                                        vactive = <480>;
-                                        vback-porch = <33>;
-                                        vfront-porch = <10>;
-                                        vsync-len = <2>;
-                                };
-                        };
                 };
 
                 /*
diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi
index aeb49c4bd773..10868ba3277f 100644
--- a/arch/arm/boot/dts/arm-realview-pbx.dtsi
+++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi
@@ -34,7 +34,8 @@
                 serial1 = &serial1;
                 serial2 = &serial2;
                 serial3 = &serial3;
-                i2c0 = &i2c;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
         };
 
         memory {
@@ -158,6 +159,49 @@
                 port1-otg;
         };
 
+        bridge {
+                compatible = "ti,ths8134a", "ti,ths8134";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
+                                vga_bridge_in: endpoint {
+                                        remote-endpoint = <&clcd_pads>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                vga_bridge_out: endpoint {
+                                        remote-endpoint = <&vga_con_in>;
+                                };
+                        };
+                };
+        };
+
+        vga {
+                /*
+                 * This DDC I2C is connected directly to the DVI portions
+                 * of the connector, so it's not really working when the
+                 * monitor is connected to the VGA connector.
+                 */
+                compatible = "vga-connector";
+                ddc-i2c-bus = <&i2c1>;
+
+                port {
+                        vga_con_in: endpoint {
+                                remote-endpoint = <&vga_bridge_out>;
+                        };
+                };
+        };
+
         soc: soc@0 {
                 compatible = "arm,realview-pbx-soc", "simple-bus";
                 #address-cells = <1>;
@@ -285,7 +329,7 @@
                                                <&timclk>;
                 };
 
-                i2c: i2c@10002000 {
+                i2c0: i2c@10002000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
                         compatible = "arm,versatile-i2c";
@@ -396,7 +440,12 @@
                         clock-names = "apb_pclk";
                 };
 
-                /* DVI serial bus control is at 10016000 */
+                i2c1: i2c@10016000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "arm,versatile-i2c";
+                        reg = <0x10016000 0x1000>;
+                };
 
                 rtc: rtc@10017000 {
                         compatible = "arm,pl031", "arm,primecell";
@@ -506,36 +555,15 @@
                         interrupt-names = "combined";
                         clocks = <&oscclk4>, <&pclk>;
                         clock-names = "clcdclk", "apb_pclk";
+                        /* 1024x768 16bpp @65MHz works fine */
+                        max-memory-bandwidth = <95000000>;
 
                         port {
                                 clcd_pads: endpoint {
-                                        remote-endpoint = <&clcd_panel>;
+                                        remote-endpoint = <&vga_bridge_in>;
                                         arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
                                 };
                         };
-
-                        panel {
-                                compatible = "panel-dpi";
-
-                                port {
-                                        clcd_panel: endpoint {
-                                                remote-endpoint = <&clcd_pads>;
-                                        };
-                                };
-
-                                /* Standard 640x480 VGA timings */
-                                panel-timing {
-                                        clock-frequency = <25175000>;
-                                        hactive = <640>;
-                                        hback-porch = <48>;
-                                        hfront-porch = <16>;
-                                        hsync-len = <96>;
-                                        vactive = <480>;
-                                        vback-porch = <33>;
-                                        vfront-porch = <10>;
-                                        vsync-len = <2>;
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index c4eef7323367..afe46097a403 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada 370 evaluation board
  * (DB-88F6710-BP-DDR3)
@@ -8,44 +9,6 @@
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
- *
  * Note: this Device Tree assumes that the bootloader has remapped the
  * internal registers to 0xf1000000 (instead of the default
  * 0xd0000000). The 0xf1000000 is the default used by the recent,
diff --git a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
index db7f3aa38670..8e46f63cbaa1 100644
--- a/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
+++ b/arch/arm/boot/dts/armada-370-dlink-dns327l.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for D-Link DNS-327L
  *
  * Copyright (C) 2015, Andrew Andrianov <andrew@ncrmnt.org>
- *
- * 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.
  */
 
 /* Remaining unsolved:
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 702f58c9642d..996f31b00729 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Globalscale Mirabox
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index b1a96e95e921..56634803e16b 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for NETGEAR ReadyNAS 102
  *
  * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- *
- * 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.
  */
 
 /dts-v1/;
@@ -103,7 +66,7 @@
 
                                 status = "okay";
 
-                                isl12057: isl12057@68 {
+                                isl12057: rtc@68 {
                                         compatible = "isil,isl12057";
                                         reg = <0x68>;
                                         wakeup-source;
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index d67e7aa42b54..16d0307f786a 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for NETGEAR ReadyNAS 104
  *
  * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- *
- * 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.
  */
 
 /dts-v1/;
@@ -105,7 +68,7 @@
 
                                 status = "okay";
 
-                                isl12057: isl12057@68 {
+                                isl12057: rtc@68 {
                                         compatible = "isil,isl12057";
                                         reg = <0x68>;
                                         wakeup-source;
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index c28afb242393..cc2f774eb267 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada 370 Reference Design board
  * (RD-88F6710-A1)
@@ -6,44 +7,6 @@
  *
  *  Copyright (C) 2013 Florian Fainelli <florian@openwrt.org>
  *
- * 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.
- *
  * Note: this Device Tree assumes that the bootloader has remapped the
  * internal registers to 0xf1000000 (instead of the default
  * 0xd0000000). The 0xf1000000 is the default used by the recent,
diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts b/arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
index fef0110a8d8a..8dd242e668e6 100644
--- a/arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Seagate NAS 2-Bay (Armada 370 SoC).
  *
  * Copyright (C) 2015 Seagate
  *
  * Author: Vincent Donnefort <vdonnefort@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
index eb6af53b4954..3cf70c72c5ca 100644
--- a/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Seagate NAS 4-Bay (Armada 370 SoC).
  *
  * Copyright (C) 2015 Seagate
  *
  * Author: Vincent Donnefort <vdonnefort@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
index e9a5b952afc0..a5206db0ebbd 100644
--- a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree common file for the Seagate NAS 2 and 4-bay (Armada 370 SoC).
  *
  * Copyright (C) 2015 Seagate
  *
  * Author: Vincent Donnefort <vdonnefort@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dts b/arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dts
index 3c91f9821c89..5ee572dc9242 100644
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dts
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dts
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Seagate Personal Cloud NAS 2-Bay (Armada 370 SoC).
  *
  * Copyright (C) 2015 Seagate
  *
  * Author: Simon Guinot <simon.guinot@sequanux.org>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dts b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dts
index aad39e97af43..578b54b39c8f 100644
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dts
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dts
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Seagate Personal Cloud NAS (Armada 370 SoC).
  *
  * Copyright (C) 2015 Seagate
  *
  * Author: Simon Guinot <simon.guinot@sequanux.org>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index d079a89ee5a2..a624b2371fb6 100644
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree common file for the Seagate Personal Cloud NAS 1 and 2-Bay
  * (Armada 370 SoC).
@@ -5,10 +6,6 @@
  * Copyright (C) 2015 Seagate
  *
  * Author: Simon Guinot <simon.guinot@sequanux.org>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
diff --git a/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
index 95040810c094..64f2ce254fb6 100644
--- a/arch/arm/boot/dts/armada-370-synology-ds213j.dts
+++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Synology DS213j
  *
  * Copyright (C) 2014, Arnaud EBALARD <arno@natisbad.org>
  *
- * 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.
- *
  * Note: this Device Tree assumes that the bootloader has remapped the
  * internal registers to 0xf1000000 (instead of the old 0xd0000000).
  * The 0xf1000000 is the default used by the recent, DT-capable, U-Boot
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 09495e87b038..11fc3271dad4 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 370 and Armada XP SoC
  *
@@ -8,44 +9,6 @@
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  * Ben Dooks <ben.dooks@codethink.co.uk>
  *
- * 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.
- *
  * This file contains the definitions that are common to the Armada
  * 370 and Armada XP SoC.
  */
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index b1cf5a26f3c2..46e6d3ed8f35 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 370 family SoC
  *
@@ -7,44 +8,6 @@
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
- *
  * Contains definitions specific to the Armada 370 SoC that are not
  * common to all Armada SoCs.
  */
diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index bcdbb8ba1d65..e4ecd7e75644 100644
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada 375 evaluation board
  * (DB-88F6720)
@@ -6,44 +7,6 @@
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index 2cb1bcd30976..53ead6f26a0e 100644
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 375 family SoC
  *
@@ -5,44 +6,6 @@
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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 <dt-bindings/interrupt-controller/arm-gic.h>
diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi
index 132596fd0860..cff1269f3fbf 100644
--- a/arch/arm/boot/dts/armada-380.dtsi
+++ b/arch/arm/boot/dts/armada-380.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 380 SoC.
  *
@@ -6,44 +7,6 @@
  * Lior Amsalem <alior@marvell.com>
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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 "armada-38x.dtsi"
diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index 678aa023335d..d294f24281a5 100644
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for Marvell Armada 385 Access Point Development board
  * (DB-88F6820-AP)
@@ -5,38 +6,6 @@
  *  Copyright (C) 2014 Marvell
  *
  * Nadav Haklai <nadavh@marvell.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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index ee669ae61011..1f30993af405 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -1,40 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree include for the Linksys WRT1200AC (Caiman)
  *
  * Copyright (C) 2015 Imre Kaloz <kaloz@openwrt.org>
- *
- *
- * 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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index 5169ca89c55a..bc34802ce6bc 100644
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -1,40 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for the Linksys WRT1900ACv2 (Cobra)
  *
  * Copyright (C) 2015 Imre Kaloz <kaloz@openwrt.org>
- *
- *
- * 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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-385-linksys-rango.dts b/arch/arm/boot/dts/armada-385-linksys-rango.dts
index da8a0f3d432b..5b745a0ccce5 100644
--- a/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -1,40 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for the Linksys WRT3200ACM (Rango)
  *
  * Copyright (C) 2016 Imre Kaloz <kaloz@openwrt.org>
- *
- *
- * 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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index 94aa35bc0bff..44f5aeb5fc33 100644
--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
@@ -1,40 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for the Linksys WRT1900ACS (Shelby)
  *
  * Copyright (C) 2015 Imre Kaloz <kaloz@openwrt.org>
- *
- *
- * 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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 434dc9aaa5e4..4a0d7360110b 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -1,40 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree include file for Armada 385 based Linksys boards
  *
  * Copyright (C) 2015 Imre Kaloz <kaloz@openwrt.org>
- *
- *
- * 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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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>
@@ -282,3 +250,8 @@
         status = "okay";
         usb-phy = <&usb3_1_phy>;
 };
+
+&rtc {
+        /* No crystal connected to the internal RTC */
+        status = "disabled";
+};
diff --git a/arch/arm/boot/dts/armada-385-synology-ds116.dts b/arch/arm/boot/dts/armada-385-synology-ds116.dts
index 0a3552ebda3b..6782ce481ac9 100644
--- a/arch/arm/boot/dts/armada-385-synology-ds116.dts
+++ b/arch/arm/boot/dts/armada-385-synology-ds116.dts
@@ -1,39 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for Synology DS116 NAS
  *
  * Copyright (C) 2017 Willy Tarreau <w@1wt.eu>
- *
- * 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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts
index 06831e1e3f80..768b6c5d2129 100644
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
@@ -1,43 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for the Turris Omnia
  *
  * Copyright (C) 2016 Uwe Kleine-König <uwe@kleine-koenig.org>
  * Copyright (C) 2016 Tomas Hlavacek <tmshlvkc@gmail.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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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.
- */
-
-/*
  * Schematic available at https://www.turris.cz/doc/_media/rtrom01-schema.pdf
  */
 
diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
index 74863aff01c6..f0022d10c715 100644
--- a/arch/arm/boot/dts/armada-385.dtsi
+++ b/arch/arm/boot/dts/armada-385.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 385 SoC.
  *
@@ -6,44 +7,6 @@
  * Lior Amsalem <alior@marvell.com>
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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 "armada-38x.dtsi"
diff --git a/arch/arm/boot/dts/armada-388-clearfog-base.dts b/arch/arm/boot/dts/armada-388-clearfog-base.dts
index 22ed07fc2979..50ed4ae5c621 100644
--- a/arch/arm/boot/dts/armada-388-clearfog-base.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog-base.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for SolidRun Clearfog Base revision A1 rev 2.0 (88F6828)
  *
@@ -7,43 +8,6 @@
  * the A1 rev 2.0 of the board, which does not represent final
  * production board.  Things will change, don't expect this file to
  * remain compatible info the future.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-388-clearfog-pro.dts b/arch/arm/boot/dts/armada-388-clearfog-pro.dts
index bd85870bbdbb..24e4b5a509be 100644
--- a/arch/arm/boot/dts/armada-388-clearfog-pro.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog-pro.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for SolidRun Clearfog Pro revision A1 rev 2.0 (88F6828)
  *
@@ -7,43 +8,6 @@
  * the A1 rev 2.0 of the board, which does not represent final
  * production board.  Things will change, don't expect this file to
  * remain compatible info the future.
- *
- * 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 "armada-388-clearfog.dts"
 
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index ee7b0089eff0..5fd0f6f61e77 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for SolidRun Clearfog Pro revision A1 rev 2.0 (88F6828)
  *
@@ -7,43 +8,6 @@
  * the A1 rev 2.0 of the board, which does not represent final
  * production board.  Things will change, don't expect this file to
  * remain compatible info the future.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi
index 68acfc968706..0d9dfdfe977e 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dtsi
+++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree include file for SolidRun Clearfog 88F6828 based boards
  *
@@ -7,43 +8,6 @@
  * the A1 rev 2.0 of the board, which does not represent final
  * production board.  Things will change, don't expect this file to
  * remain compatible info the future.
- *
- * 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 , 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 "armada-388.dtsi"
@@ -117,6 +81,16 @@
                         };
                 };
         };
+
+        sfp: sfp {
+                compatible = "sff,sfp";
+                i2c-bus = <&i2c1>;
+                los-gpio = <&expander0 12 GPIO_ACTIVE_HIGH>;
+                mod-def0-gpio = <&expander0 15 GPIO_ACTIVE_LOW>;
+                tx-disable-gpio = <&expander0 14 GPIO_ACTIVE_HIGH>;
+                tx-fault-gpio = <&expander0 13 GPIO_ACTIVE_HIGH>;
+                maximum-power-milliwatt = <2000>;
+        };
 };
 
 &eth1 {
@@ -133,18 +107,14 @@
         bm,pool-long = <3>;
         bm,pool-short = <1>;
         buffer-manager = <&bm>;
+        managed = "in-band-status";
         phy-mode = "sgmii";
+        sfp = <&sfp>;
         status = "okay";
-
-        fixed-link {
-                speed = <1000>;
-                full-duplex;
-        };
 };
 
 &i2c0 {
-        /* Is there anything on this? */
-        clock-frequency = <100000>;
+        clock-frequency = <400000>;
         pinctrl-0 = <&i2c0_pins>;
         pinctrl-names = "default";
         status = "okay";
@@ -209,43 +179,13 @@
                         output-low;
                         line-name = "m.2 devslp";
                 };
-                sfp_los {
-                        /* SFP loss of signal */
-                        gpio-hog;
-                        gpios = <12 GPIO_ACTIVE_HIGH>;
-                        input;
-                        line-name = "sfp-los";
-                };
-                sfp_tx_fault {
-                        /* SFP laser fault */
-                        gpio-hog;
-                        gpios = <13 GPIO_ACTIVE_HIGH>;
-                        input;
-                        line-name = "sfp-tx-fault";
-                };
-                sfp_tx_disable {
-                        /* SFP transmit disable */
-                        gpio-hog;
-                        gpios = <14 GPIO_ACTIVE_HIGH>;
-                        output-low;
-                        line-name = "sfp-tx-disable";
-                };
-                sfp_mod_def0 {
-                        /* SFP module present */
-                        gpio-hog;
-                        gpios = <15 GPIO_ACTIVE_LOW>;
-                        input;
-                        line-name = "sfp-mod-def0";
-                };
         };
 
-        /* The MCP3021 is 100kHz clock only */
+        /* The MCP3021 supports standard and fast modes */
         mikrobus_adc: mcp3021@4c {
                 compatible = "microchip,mcp3021";
                 reg = <0x4c>;
         };
-
-        /* Also something at 0x64 */
 };
 
 &i2c1 {
diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts
index a4ec1fa37529..05250d426dc4 100644
--- a/arch/arm/boot/dts/armada-388-db.dts
+++ b/arch/arm/boot/dts/armada-388-db.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada 388 evaluation board
  * (DB-88F6820)
@@ -5,44 +6,6 @@
  *  Copyright (C) 2014 Marvell
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts
index 51b4ee6df130..9d873257ac45 100644
--- a/arch/arm/boot/dts/armada-388-gp.dts
+++ b/arch/arm/boot/dts/armada-388-gp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for Marvell Armada 385 development board
  * (RD-88F6820-GP)
@@ -5,38 +6,6 @@
  * Copyright (C) 2014 Marvell
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-388-rd.dts b/arch/arm/boot/dts/armada-388-rd.dts
index 9cc3ca0376b9..328a4d6afd2c 100644
--- a/arch/arm/boot/dts/armada-388-rd.dts
+++ b/arch/arm/boot/dts/armada-388-rd.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada 388 Reference Design board
  * (RD-88F6820-AP)
@@ -6,44 +7,6 @@
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-388.dtsi b/arch/arm/boot/dts/armada-388.dtsi
index 1c0d151b2aaa..f3a020ff577e 100644
--- a/arch/arm/boot/dts/armada-388.dtsi
+++ b/arch/arm/boot/dts/armada-388.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 388 SoC.
  *
@@ -5,39 +6,6 @@
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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.
- *
- *
  * The main difference with the Armada 385 is that the 388 can handle two more
  * SATA ports. So we can reuse the dtsi of the Armada 385, override the pinctrl
  * property and the name of the SoC, and add the second SATA host which control
diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
index 9b508a8161f5..2d1cea131e71 100644
--- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
+++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for SolidRun Armada 38x Microsom
  *
@@ -7,43 +8,6 @@
  * the A1 rev 2.0 of the board, which does not represent final
  * production board.  Things will change, don't expect this file to
  * remain compatible info the future.
- *
- * 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/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index a6cc568f74f7..4cc09e43eea2 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 38x family of SoCs.
  *
@@ -6,44 +7,6 @@
  * Lior Amsalem <alior@marvell.com>
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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 "skeleton.dtsi"
diff --git a/arch/arm/boot/dts/armada-390-db.dts b/arch/arm/boot/dts/armada-390-db.dts
index c718a5242595..1b2362e4c831 100644
--- a/arch/arm/boot/dts/armada-390-db.dts
+++ b/arch/arm/boot/dts/armada-390-db.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada 390 Development Board
  * (DB-88F6920)
@@ -5,44 +6,6 @@
  * Copyright (C) 2016 Marvell
  *
  * Grzegorz Jaszczyk <jaz@semihalf.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-390.dtsi b/arch/arm/boot/dts/armada-390.dtsi
index 0d8a54ad007c..aa2057d4d6f8 100644
--- a/arch/arm/boot/dts/armada-390.dtsi
+++ b/arch/arm/boot/dts/armada-390.dtsi
@@ -1,47 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 390 SoC.
  *
  * Copyright (C) 2015 Marvell
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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 "armada-39x.dtsi"
diff --git a/arch/arm/boot/dts/armada-395-gp.dts b/arch/arm/boot/dts/armada-395-gp.dts
index ef491b524fd6..2a9de192b423 100644
--- a/arch/arm/boot/dts/armada-395-gp.dts
+++ b/arch/arm/boot/dts/armada-395-gp.dts
@@ -1,41 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for Marvell Armada 395 GP board
  *
  * Copyright (C) 2016 Marvell
  *
  * Grzegorz Jaszczyk <jaz@semihalf.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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-395.dtsi b/arch/arm/boot/dts/armada-395.dtsi
index bf7e4335e36a..e18a7d9cd7d4 100644
--- a/arch/arm/boot/dts/armada-395.dtsi
+++ b/arch/arm/boot/dts/armada-395.dtsi
@@ -1,47 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 395 SoC.
  *
  * Copyright (C) 2016 Marvell
  *
  * Grzegorz Jaszczyk <jaz@semihalf.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, 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 "armada-39x.dtsi"
diff --git a/arch/arm/boot/dts/armada-398-db.dts b/arch/arm/boot/dts/armada-398-db.dts
index f0e0379f7619..2337f24784f7 100644
--- a/arch/arm/boot/dts/armada-398-db.dts
+++ b/arch/arm/boot/dts/armada-398-db.dts
@@ -1,47 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 398 Development Board
  *
  * Copyright (C) 2015 Marvell
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-398.dtsi b/arch/arm/boot/dts/armada-398.dtsi
index 1f4e113fc821..c5ac89399ce1 100644
--- a/arch/arm/boot/dts/armada-398.dtsi
+++ b/arch/arm/boot/dts/armada-398.dtsi
@@ -1,47 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 398 SoC.
  *
  * Copyright (C) 2015 Marvell
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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 "armada-395.dtsi"
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index 5218bd2a248d..c1737c0a8325 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -1,47 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 39x family of SoCs.
  *
  * Copyright (C) 2015 Marvell
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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 "skeleton.dtsi"
diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
index bdd4c7a45fbf..a5da44fb35ed 100644
--- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell 98dx3236 family SoC
  *
  * Copyright (C) 2016 Allied Telesis Labs
  *
- * 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.
- *
  * Contains definitions specific to the 98dx3236 SoC that are not
  * common to all Armada XP SoCs.
  */
diff --git a/arch/arm/boot/dts/armada-xp-98dx3336.dtsi b/arch/arm/boot/dts/armada-xp-98dx3336.dtsi
index a0d81bd7312b..2f5fc67dd6dc 100644
--- a/arch/arm/boot/dts/armada-xp-98dx3336.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx3336.dtsi
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell 98dx3336 family SoC
  *
  * Copyright (C) 2016 Allied Telesis Labs
  *
- * 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.
- *
  * Contains definitions specific to the 98dx3236 SoC that are not
  * common to all Armada XP SoCs.
  */
diff --git a/arch/arm/boot/dts/armada-xp-98dx4251.dtsi b/arch/arm/boot/dts/armada-xp-98dx4251.dtsi
index bc9f824020eb..7a9e8839880b 100644
--- a/arch/arm/boot/dts/armada-xp-98dx4251.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx4251.dtsi
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell 98dx4521 family SoC
  *
  * Copyright (C) 2016 Allied Telesis Labs
  *
- * 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.
- *
  * Contains definitions specific to the 98dx4521 SoC that are not
  * common to all Armada XP SoCs.
  */
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index d0c6a01f48a6..606fd3476a59 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell RD-AXPWiFiAP.
  *
@@ -9,44 +10,6 @@
  * Copyright (C) 2013 Marvell
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
index 1b1ff17fdd9c..4c64923f1c52 100644
--- a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
+++ b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for DB-DXBC2 board
  *
@@ -5,44 +6,6 @@
  *
  * Based on armada-xp-db.dts
  *
- * 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.
- *
  * Note: this Device Tree assumes that the bootloader has remapped the
  * internal registers to 0xf1000000 (instead of the default
  * 0xd0000000). The 0xf1000000 is the default used by the recent,
diff --git a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
index 06fce35d7491..a0ebb52683f1 100644
--- a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
+++ b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for DB-XC3-24G4XG board
  *
@@ -5,44 +6,6 @@
  *
  * Based on armada-xp-db.dts
  *
- * 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.
- *
  * Note: this Device Tree assumes that the bootloader has remapped the
  * internal registers to 0xf1000000 (instead of the default
  * 0xd0000000). The 0xf1000000 is the default used by the recent,
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 065282c21789..73d3f5cb9828 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada XP evaluation board
  * (DB-78460-BP)
@@ -8,43 +9,6 @@
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
   *
  * Note: this Device Tree assumes that the bootloader has remapped the
  * internal registers to 0xf1000000 (instead of the default
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index ac9eab8ac186..c143556bbb7b 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada XP development board
  * (DB-MV784MP-GP)
@@ -8,44 +9,6 @@
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
- *
  * Note: this Device Tree assumes that the bootloader has remapped the
  * internal registers to 0xf1000000 (instead of the default
  * 0xd0000000). The 0xf1000000 is the default used by the recent,
diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index ce0afba1ce58..def62e9e835b 100644
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Lenovo Iomega ix4-300d
  *
  * Copyright (C) 2014, Benoit Masson <yahoo@perenite.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index 6d705f518254..f8b60d937818 100644
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
  * Device Tree file for the Linksys WRT1900AC (Mamba).
  *
@@ -13,38 +14,6 @@
  *     Copyright (C) 2013 Marvell
  *
  *     Thomas Petazzoni <thomas.petazzoni@free-electrons.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 licensed under the terms of the GNU General Public
- *     License version 2.  This program is licensed "as is" without
- *     any warranty of any kind, whether express or implied.
- *
- * 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/;
diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
index 977f6b3fc1f8..1395cea12759 100644
--- a/arch/arm/boot/dts/armada-xp-matrix.dts
+++ b/arch/arm/boot/dts/armada-xp-matrix.dts
@@ -1,47 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada XP Matrix board
  *
  * Copyright (C) 2013 Marvell
  *
  * Lior Amsalem <alior@marvell.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 129738f7973d..8558bf6bb54c 100644
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada XP family SoC
  *
@@ -5,44 +6,6 @@
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
- *
  * Contains definitions specific to the Armada XP MV78230 SoC that are not
  * common to all Armada XP SoCs.
  */
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index e58d597e37b9..2d85fe8ac327 100644
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada XP family SoC
  *
@@ -5,44 +6,6 @@
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
- *
  * Contains definitions specific to the Armada XP MV78260 SoC that are not
  * common to all Armada XP SoCs.
  */
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index a5c961cee7de..230a3fd36b30 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada XP family SoC
  *
@@ -5,44 +6,6 @@
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
- *
  * Contains definitions specific to the Armada XP MV78460 SoC that are not
  * common to all Armada XP SoCs.
  */
diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index 40c6fe21e720..c350b1cf5201 100644
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for NETGEAR ReadyNAS 2120
  *
  * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- *
- * 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.
  */
 
 /dts-v1/;
@@ -115,7 +78,7 @@
                                         reg = <0x4c>;
                                 };
 
-                                isl12057: isl12057@68 {
+                                isl12057: rtc@68 {
                                         compatible = "isil,isl12057";
                                         reg = <0x68>;
                                         wakeup-source;
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 66b78131a038..0efcc166dabf 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -1,47 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for OpenBlocks AX3-4 board
  *
  * Copyright (C) 2012 Marvell
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index d7228a5461c8..809e821d7399 100644
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Synology DS414
  *
  * Copyright (C) 2014, Arnaud EBALARD <arno@natisbad.org>
  *
- * 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.
- *
  * Note: this Device Tree assumes that the bootloader has remapped the
  * internal registers to 0xf1000000 (instead of the old 0xd0000000).
  * The 0xf1000000 is the default used by the recent, DT-capable, U-Boot
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index fa1e881266ac..ee15c77d3689 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada XP family SoC
  *
@@ -8,44 +9,6 @@
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  * Ben Dooks <ben.dooks@codethink.co.uk>
  *
- * 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.
- *
  * Contains definitions specific to the Armada XP SoC that are not
  * common to all Armada SoCs.
  */
diff --git a/arch/arm/boot/dts/artpec6-devboard.dts b/arch/arm/boot/dts/artpec6-devboard.dts
index 9dfe845694cf..d20d95359b28 100644
--- a/arch/arm/boot/dts/artpec6-devboard.dts
+++ b/arch/arm/boot/dts/artpec6-devboard.dts
@@ -26,7 +26,7 @@
 
         memory {
                 device_type = "memory";
-                reg = <0x0 0x10000000>;
+                reg = <0x0 0x40000000>;
         };
 };
 
@@ -59,6 +59,7 @@
         mdio {
                 #address-cells = <0x1>;
                 #size-cells = <0x0>;
+                compatible = "snps,dwmac-mdio";
                 phy1: phy@0 {
                         compatible = "ethernet-phy-ieee802.3-c22";
                         device_type = "ethernet-phy";
diff --git a/arch/arm/boot/dts/artpec6.dtsi b/arch/arm/boot/dts/artpec6.dtsi
index 2ed11773048d..3e4115c2cd75 100644
--- a/arch/arm/boot/dts/artpec6.dtsi
+++ b/arch/arm/boot/dts/artpec6.dtsi
@@ -41,6 +41,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/dma/nbpfaxi.h>
 #include <dt-bindings/clock/axis,artpec6-clkctrl.h>
 #include "skeleton.dtsi"
 
@@ -98,7 +99,7 @@
                 clock-frequency = <125000000>;
         };
 
-        clkctrl: clkctrl@0xf8000000 {
+        clkctrl: clkctrl@f8000000 {
                 #clock-cells = <1>;
                 compatible = "axis,artpec6-clkctrl";
                 reg = <0xf8000000 0x48>;
@@ -153,6 +154,10 @@
                 interrupt-affinity = <&cpu0>, <&cpu1>;
         };
 
+        /*
+         * Both pci nodes cannot be enabled at the same time,
+         * leave the unwanted node as disabled.
+         */
         pcie: pcie@f8050000 {
                 compatible = "axis,artpec6-pcie", "snps,dw-pcie";
                 reg = <0xf8050000 0x2000
@@ -180,28 +185,146 @@
                 status = "disabled";
         };
 
+        pcie_ep: pcie_ep@f8050000 {
+                compatible = "axis,artpec6-pcie-ep", "snps,dw-pcie";
+                reg = <0xf8050000 0x2000
+                       0xf8051000 0x2000
+                       0xf8040000 0x1000
+                       0xc0000000 0x20000000>;
+                reg-names = "dbi", "dbi2", "phy", "addr_space";
+                num-ib-windows = <6>;
+                num-ob-windows = <2>;
+                num-lanes = <2>;
+                axis,syscon-pcie = <&syscon>;
+                status = "disabled";
+        };
+
+        pinctrl: pinctrl@f801d000 {
+                compatible = "axis,artpec6-pinctrl";
+                reg = <0xf801d000 0x400>;
+
+                pinctrl_uart0: uart0grp {
+                        function = "uart0";
+                        groups = "uart0grp2";
+                        bias-pull-up;
+                };
+                pinctrl_uart1: uart1grp {
+                        function = "uart1";
+                        groups = "uart1grp0";
+                        bias-pull-up;
+                };
+                pinctrl_uart2: uart2grp {
+                        function = "uart2";
+                        groups = "uart2grp1";
+                        bias-pull-up;
+                };
+                pinctrl_uart3: uart3grp {
+                        function = "uart3";
+                        groups = "uart3grp0";
+                        bias-pull-up;
+                };
+        };
+
         amba@0 {
                 compatible = "simple-bus";
                 #address-cells = <0x1>;
                 #size-cells = <0x1>;
                 ranges;
-                dma-ranges = <0x80000000 0x00000000 0x40000000>;
-                dma-coherent;
+                dma-ranges;
+
+                crypto@f4264000 {
+                        compatible = "axis,artpec6-crypto";
+                        reg = <0xf4264000 0x4000>;
+                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                };
+
+                dma0: dma@f8019000 {
+                        compatible = "renesas,nbpfaxi64dmac8b16";
+                        reg = <0xf8019000 0x400>;
+                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */
+                                     <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch12",
+                                          "ch12", "ch13", "ch14", "ch15";
+                        clocks = <&clkctrl ARTPEC6_CLK_DMA_ACLK>;
+                        #dma-cells = <2>;
+                        dma-channels = <8>;
+                        dma-requests = <8>;
+                };
+                dma1: dma@f8019400 {
+                        compatible = "renesas,nbpfaxi64dmac8b16";
+                        reg = <0xf8019400 0x400>;
+                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */
+                                     <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch12",
+                                          "ch12", "ch13", "ch14", "ch15";
+                        clocks = <&clkctrl ARTPEC6_CLK_DMA_ACLK>;
+                        #dma-cells = <2>;
+                        dma-channels = <8>;
+                        dma-requests = <8>;
+                };
 
                 ethernet: ethernet@f8010000 {
-                        clock-names = "phy_ref_clk", "apb_pclk";
-                        clocks = <&eth_phy_ref_clk>,
-                                <&clkctrl ARTPEC6_CLK_ETH_ACLK>;
-                        compatible = "snps,dwc-qos-ethernet-4.10";
-                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+                        clock-names = "stmmaceth", "ptp_ref";
+                        clocks = <&clkctrl ARTPEC6_CLK_ETH_ACLK>,
+                                <&clkctrl ARTPEC6_CLK_PTP_REF>;
+                        compatible = "snps,dwmac-4.10a", "snps,dwmac";
+                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "macirq", "eth_lpi";
                         reg = <0xf8010000 0x4000>;
 
-                        snps,write-requests = <2>;
-                        snps,read-requests = <16>;
+                        snps,axi-config = <&stmmac_axi_setup>;
+                        snps,mtl-rx-config = <&mtl_rx_setup>;
+                        snps,mtl-tx-config = <&mtl_tx_setup>;
+
                         snps,txpbl = <8>;
                         snps,rxpbl = <2>;
+                        snps,aal;
+                        snps,tso;
 
                         status = "disabled";
+
+                        stmmac_axi_setup: stmmac-axi-config {
+                                snps,wr_osr_lmt = <1>;
+                                snps,rd_osr_lmt = <15>;
+                                /* If FB is disabled, the AXI master chooses
+                                 * a burst length of any value less than the
+                                 * maximum enabled burst length
+                                 * (all lesser burst length enables are redundant).
+                                 */
+                                snps,blen = <0 0 0 0 16 0 0>;
+                        };
+
+                        mtl_rx_setup: rx-queues-config {
+                                snps,rx-queues-to-use = <1>;
+                                queue0 {};
+                        };
+
+                        mtl_tx_setup: tx-queues-config {
+                                snps,tx-queues-to-use = <2>;
+                                queue0 {};
+                                queue1 {};
+                        };
                 };
 
                 uart0: serial@f8036000 {
@@ -211,6 +334,11 @@
                         clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>,
                                 <&clkctrl ARTPEC6_CLK_UART_PCLK>;
                         clock-names = "uart_clk", "apb_pclk";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_uart0>;
+                        dmas = <&dma0 4 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>,
+                               <&dma0 5 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>;
+                        dma-names = "rx", "tx";
                         status = "disabled";
                 };
                 uart1: serial@f8037000 {
@@ -220,6 +348,11 @@
                         clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>,
                                 <&clkctrl ARTPEC6_CLK_UART_PCLK>;
                         clock-names = "uart_clk", "apb_pclk";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_uart1>;
+                        dmas = <&dma0 6 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>,
+                               <&dma0 7 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>;
+                        dma-names = "rx", "tx";
                         status = "disabled";
                 };
                 uart2: serial@f8038000 {
@@ -229,6 +362,11 @@
                         clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>,
                                 <&clkctrl ARTPEC6_CLK_UART_PCLK>;
                         clock-names = "uart_clk", "apb_pclk";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_uart2>;
+                        dmas = <&dma1 0 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>,
+                               <&dma1 1 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>;
+                        dma-names = "rx", "tx";
                         status = "disabled";
                 };
                 uart3: serial@f8039000 {
@@ -238,6 +376,11 @@
                         clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>,
                                 <&clkctrl ARTPEC6_CLK_UART_PCLK>;
                         clock-names = "uart_clk", "apb_pclk";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_uart3>;
+                        dmas = <&dma1 2 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>,
+                               <&dma1 3 (NBPF_SLAVE_RQ_HIGH | NBPF_SLAVE_RQ_LEVEL)>;
+                        dma-names = "rx", "tx";
                         status = "disabled";
                 };
         };
diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
new file mode 100644
index 000000000000..df1227613d48
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: GPL-2.0+
+/dts-v1/;
+
+#include "aspeed-g5.dtsi"
+#include <dt-bindings/gpio/aspeed-gpio.h>
+
+/ {
+        model = "Qualcomm Centriq 2400  REP AST2520";
+        compatible = "qualcomm,centriq2400-rep-bmc", "aspeed,ast2500";
+
+        chosen {
+                stdout-path = &uart5;
+                bootargs = "console=ttyS4,115200 earlyprintk";
+        };
+
+        memory {
+                reg = <0x80000000 0x40000000>;
+        };
+
+        iio-hwmon {
+                compatible = "iio-hwmon";
+                io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
+                        <&adc 4>, <&adc 5>, <&adc 6>, <&adc 8>;
+        };
+
+        iio-hwmon-battery {
+                compatible = "iio-hwmon";
+                io-channels = <&adc 7>;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                uid_led {
+                        label = "UID_LED";
+                        gpios = <&gpio ASPEED_GPIO(Q, 5) GPIO_ACTIVE_LOW>;
+                };
+
+                ras_error_led {
+                        label = "RAS_ERROR_LED";
+                        gpios = <&gpio ASPEED_GPIO(F, 6) GPIO_ACTIVE_LOW>;
+                };
+
+                system_fault {
+                        label = "System_fault";
+                        gpios = <&gpio ASPEED_GPIO(A, 1) GPIO_ACTIVE_LOW>;
+                };
+        };
+};
+
+&fmc {
+        status = "okay";
+        flash@0 {
+                status = "okay";
+                m25p,fast-read;
+                label = "bmc";
+#include "openbmc-flash-layout.dtsi"
+        };
+};
+
+&spi1 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_spi1_default>;
+        flash@0 {
+                status = "okay";
+        };
+};
+
+&spi2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_spi2ck_default
+                        &pinctrl_spi2miso_default
+                        &pinctrl_spi2mosi_default
+                        &pinctrl_spi2cs0_default>;
+};
+
+&uart3 {
+        status = "okay";
+
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_txd3_default &pinctrl_rxd3_default>;
+        current-speed = <115200>;
+};
+
+&uart5 {
+        status = "okay";
+};
+
+&mac0 {
+        status = "okay";
+
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
+};
+
+&i2c0 {
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+
+        tmp421@1e {
+                compatible = "ti,tmp421";
+                reg = <0x1e>;
+        };
+        tmp421@2a {
+                compatible = "ti,tmp421";
+                reg = <0x2a>;
+        };
+        tmp421@4e {
+                compatible = "ti,tmp421";
+                reg = <0x4e>;
+        };
+        tmp421@1c {
+                compatible = "ti,tmp421";
+                reg = <0x1c>;
+        };
+};
+
+&i2c2 {
+        status = "okay";
+};
+
+&i2c3 {
+        status = "okay";
+};
+
+&i2c4 {
+        status = "okay";
+};
+
+&i2c5 {
+        status = "okay";
+};
+
+&i2c6 {
+        status = "okay";
+
+        tmp421@1d {
+                compatible = "ti,tmp421";
+                reg = <0x1d>;
+        };
+        tmp421@1f {
+                compatible = "ti,tmp421";
+                reg = <0x1f>;
+        };
+        tmp421@4d {
+                compatible = "ti,tmp421";
+                reg = <0x4d>;
+        };
+        tmp421@4f {
+                compatible = "ti,tmp421";
+                reg = <0x4f>;
+        };
+        nvt210@4c {
+                compatible = "nvt210";
+                reg = <0x4c>;
+        };
+        eeprom@50 {
+                compatible = "atmel,24c128";
+                reg = <0x50>;
+                pagesize = <128>;
+        };
+};
+
+&i2c7 {
+        status = "okay";
+};
+
+&i2c8 {
+        status = "okay";
+
+        pca9641@70 {
+                compatible = "nxp,pca9641";
+                reg = <0x70>;
+                i2c-arb {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        tmp421@1d {
+                                compatible = "tmp421";
+                                reg = <0x1d>;
+                        };
+                        adm1278@12 {
+                                compatible = "adi,adm1278";
+                                reg = <0x12>;
+                                Rsense = <500>;
+                        };
+                        eeprom@50 {
+                                compatible = "atmel,24c02";
+                                reg = <0x50>;
+                        };
+                        ds1100@58 {
+                                compatible = "ds1100";
+                                reg = <0x58>;
+                        };
+                };
+        };
+};
+
+&i2c9 {
+        status = "okay";
+};
+
+&vuart {
+        status = "okay";
+};
+
+&gfx {
+        status = "okay";
+};
+
+&pinctrl {
+        aspeed,external-nodes = <&gfx &lhc>;
+};
+
+&gpio {
+        pin_gpio_c7 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
+                output;
+                line-name = "BIOS_SPI_MUX_S";
+        };
+};
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index 4379d09a261f..c7084a819dc6 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -2,6 +2,7 @@
 /dts-v1/;
 
 #include "aspeed-g4.dtsi"
+#include <dt-bindings/gpio/aspeed-gpio.h>
 
 / {
         model = "Palmetto BMC";
@@ -26,6 +27,32 @@
                         reg = <0x5f000000 0x01000000>; /* 16M */
                 };
         };
+
+        leds {
+                compatible = "gpio-leds";
+
+                heartbeat {
+                        gpios = <&gpio ASPEED_GPIO(R, 4) GPIO_ACTIVE_LOW>;
+                };
+
+                power {
+                        gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>;
+                };
+
+                identify {
+                        gpios = <&gpio ASPEED_GPIO(A, 2) GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                checkstop {
+                        label = "checkstop";
+                        gpios = <&gpio ASPEED_GPIO(P, 5) GPIO_ACTIVE_LOW>;
+                        linux,code = <ASPEED_GPIO(P, 5)>;
+                };
+        };
 };
 
 &fmc {
@@ -40,6 +67,9 @@
 
 &spi {
         status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_spi1debug_default>;
+
         flash@0 {
                 status = "okay";
                 m25p,fast-read;
@@ -47,6 +77,29 @@
         };
 };
 
+&pinctrl {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flbusy_default &pinctrl_flwp_default
+
+                        &pinctrl_vgahs_default &pinctrl_vgavs_default
+                        &pinctrl_ddcclk_default &pinctrl_ddcdat_default>;
+};
+
+&uart1 {
+        /* Rear RS-232 connector */
+        status = "okay";
+
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_txd1_default
+                        &pinctrl_rxd1_default
+                        &pinctrl_nrts1_default
+                        &pinctrl_ndtr1_default
+                        &pinctrl_ndsr1_default
+                        &pinctrl_ncts1_default
+                        &pinctrl_ndcd1_default
+                        &pinctrl_nri1_default>;
+};
+
 &uart5 {
         status = "okay";
 };
@@ -111,3 +164,156 @@
 &vuart {
         status = "okay";
 };
+
+&ibt {
+        status = "okay";
+};
+
+&gpio {
+        pin_func_mode0 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(C, 4) GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "func_mode0";
+        };
+
+        pin_func_mode1 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(C, 5)  GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "func_mode1";
+        };
+
+        pin_func_mode2 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "func_mode2";
+        };
+
+        pin_gpio_a0 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(A, 0) GPIO_ACTIVE_HIGH>;
+                input;
+                line-name = "BMC_FAN_RESERVED_N";
+        };
+
+        pin_gpio_a1 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(A, 1) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "APSS_WDT_N";
+        };
+
+        pin_gpio_b1 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(B, 1) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "APSS_BOOT_MODE";
+        };
+
+        pin_gpio_b2 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "APSS_RESET_N";
+        };
+
+        pin_gpio_b7 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(B, 7) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "SPIVID_STBY_RESET_N";
+        };
+
+        pin_gpio_d1 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "BMC_POWER_UP";
+        };
+
+        pin_gpio_f1 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(F, 1) GPIO_ACTIVE_HIGH>;
+                input;
+                line-name = "BMC_BATTERY_TEST";
+        };
+
+        pin_gpio_f4 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(F, 4) GPIO_ACTIVE_HIGH>;
+                input;
+                line-name = "AST_HW_FAULT_N";
+        };
+
+        pin_gpio_f5 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(F, 5) GPIO_ACTIVE_HIGH>;
+                input;
+                line-name = "AST_SYS_FAULT_N";
+        };
+
+        pin_gpio_f7 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(F, 7) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "BMC_FULL_SPEED_N";
+        };
+
+        pin_gpio_g3 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(G, 3) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "BMC_FAN_ERROR_N";
+        };
+
+        pin_gpio_g4 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(G, 4) GPIO_ACTIVE_HIGH>;
+                input;
+                line-name = "BMC_WDT_RST1_P";
+        };
+
+        pin_gpio_g5 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(G, 5) GPIO_ACTIVE_HIGH>;
+                input;
+                line-name = "BMC_WDT_RST2_P";
+        };
+
+        pin_gpio_h0 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(H, 0) GPIO_ACTIVE_HIGH>;
+                input;
+                line-name = "PE_SLOT_TEST_EN_N";
+        };
+
+        pin_gpio_h1 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
+                input;
+                line-name = "BMC_RTCRST_N";
+        };
+
+        pin_gpio_h2 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "SYS_PWROK_BMC";
+        };
+
+        pin_gpio_h6 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(H, 6) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "SCM1_FSI0_DATA_EN";
+        };
+
+        pin_gpio_h7 {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "BMC_TPM_INT_N";
+        };
+};
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index 623b6ab42021..51bc6a2e9dd5 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -184,9 +184,9 @@
 &i2c12 {
         status = "okay";
 
-        max31785@52 {
-                compatible = "maxim,max31785";
-                reg = <0x52>;
+        w83773g@4c {
+                compatible = "nuvoton,w83773g";
+                reg = <0x4c>;
         };
 };
 
@@ -203,6 +203,12 @@
                 output-low;
                 line-name = "nic_func_mode1";
         };
+        seq_cont {
+                gpio-hog;
+                gpios = <ASPEED_GPIO(S, 7) GPIO_ACTIVE_HIGH>;
+                output-low;
+                line-name = "seq_cont";
+        };
 };
 
 &vuart {
@@ -257,3 +263,7 @@
                 aspeed,fan-tach-ch = /bits/ 8 <0x0e>;
         };
 };
+
+&ibt {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index 5f9049d2c4c3..7056231cbee6 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -546,3 +546,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_wdtrst1_default>;
 };
+
+&ibt {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index c881484a85cf..ebe726a0d311 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -424,3 +424,7 @@
                 aspeed,fan-tach-ch = /bits/ 8 <0x03>;
         };
 };
+
+&ibt {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index ae2b8c952e80..518d2bc7c7fc 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -167,6 +167,7 @@
                                 reg-shift = <2>;
                                 interrupts = <9>;
                                 clocks = <&syscon ASPEED_CLK_GATE_UART1CLK>;
+                                resets = <&lpc_reset 4>;
                                 no-loopback-test;
                                 status = "disabled";
                         };
@@ -238,6 +239,7 @@
                                         lpc_ctrl: lpc-ctrl@0 {
                                                 compatible = "aspeed,ast2400-lpc-ctrl";
                                                 reg = <0x0 0x80>;
+                                                clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
                                                 status = "disabled";
                                         };
 
@@ -252,6 +254,19 @@
                                                 compatible = "aspeed,ast2400-lhc";
                                                 reg = <0x20 0x24 0x48 0x8>;
                                         };
+
+                                        lpc_reset: reset-controller@18 {
+                                                compatible = "aspeed,ast2400-lpc-reset";
+                                                reg = <0x18 0x4>;
+                                                #reset-cells = <1>;
+                                        };
+
+                                        ibt: ibt@c0  {
+                                                compatible = "aspeed,ast2400-ibt-bmc";
+                                                reg = <0xc0 0x18>;
+                                                interrupts = <8>;
+                                                status = "disabled";
+                                        };
                                 };
                         };
 
@@ -261,6 +276,7 @@
                                 reg-shift = <2>;
                                 interrupts = <32>;
                                 clocks = <&syscon ASPEED_CLK_GATE_UART2CLK>;
+                                resets = <&lpc_reset 5>;
                                 no-loopback-test;
                                 status = "disabled";
                         };
@@ -271,6 +287,7 @@
                                 reg-shift = <2>;
                                 interrupts = <33>;
                                 clocks = <&syscon ASPEED_CLK_GATE_UART3CLK>;
+                                resets = <&lpc_reset 6>;
                                 no-loopback-test;
                                 status = "disabled";
                         };
@@ -281,6 +298,7 @@
                                 reg-shift = <2>;
                                 interrupts = <34>;
                                 clocks = <&syscon ASPEED_CLK_GATE_UART4CLK>;
+                                resets = <&lpc_reset 7>;
                                 no-loopback-test;
                                 status = "disabled";
                         };
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 2477ebc11d9d..f9917717dd08 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -210,6 +210,7 @@
                                 reg-shift = <2>;
                                 interrupts = <9>;
                                 clocks = <&syscon ASPEED_CLK_GATE_UART1CLK>;
+                                resets = <&lpc_reset 4>;
                                 no-loopback-test;
                                 status = "disabled";
                         };
@@ -269,7 +270,7 @@
 
                                 #address-cells = <1>;
                                 #size-cells = <1>;
-                                ranges = <0 0x1e789000 0x1000>;
+                                ranges = <0x0 0x1e789000 0x1000>;
 
                                 lpc_bmc: lpc-bmc@0 {
                                         compatible = "aspeed,ast2500-lpc-bmc";
@@ -279,16 +280,16 @@
                                 lpc_host: lpc-host@80 {
                                         compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";
                                         reg = <0x80 0x1e0>;
+                                        reg-io-width = <4>;
 
                                         #address-cells = <1>;
                                         #size-cells = <1>;
-                                        ranges = <0 0x80 0x1e0>;
-
-                                        reg-io-width = <4>;
+                                        ranges = <0x0 0x80 0x1e0>;
 
                                         lpc_ctrl: lpc-ctrl@0 {
                                                 compatible = "aspeed,ast2500-lpc-ctrl";
                                                 reg = <0x0 0x80>;
+                                                clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
                                                 status = "disabled";
                                         };
 
@@ -303,6 +304,19 @@
                                                 compatible = "aspeed,ast2500-lhc";
                                                 reg = <0x20 0x24 0x48 0x8>;
                                         };
+
+                                        lpc_reset: reset-controller@18 {
+                                                compatible = "aspeed,ast2500-lpc-reset";
+                                                reg = <0x18 0x4>;
+                                                #reset-cells = <1>;
+                                        };
+
+                                        ibt: ibt@c0 {
+                                                compatible = "aspeed,ast2500-ibt-bmc";
+                                                reg = <0xc0 0x18>;
+                                                interrupts = <8>;
+                                                status = "disabled";
+                                        };
                                 };
                         };
 
@@ -312,6 +326,7 @@
                                 reg-shift = <2>;
                                 interrupts = <32>;
                                 clocks = <&syscon ASPEED_CLK_GATE_UART2CLK>;
+                                resets = <&lpc_reset 5>;
                                 no-loopback-test;
                                 status = "disabled";
                         };
@@ -322,6 +337,7 @@
                                 reg-shift = <2>;
                                 interrupts = <33>;
                                 clocks = <&syscon ASPEED_CLK_GATE_UART3CLK>;
+                                resets = <&lpc_reset 6>;
                                 no-loopback-test;
                                 status = "disabled";
                         };
@@ -332,6 +348,7 @@
                                 reg-shift = <2>;
                                 interrupts = <34>;
                                 clocks = <&syscon ASPEED_CLK_GATE_UART4CLK>;
+                                resets = <&lpc_reset 7>;
                                 no-loopback-test;
                                 status = "disabled";
                         };
diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
index 3ea1d26e1c68..af9f38456d04 100644
--- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
+++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
@@ -109,7 +109,32 @@
 
                 port {
                         panel_input: endpoint {
-                                remote-endpoint = <&hlcdc_panel_output>;
+                                remote-endpoint = <&lvds_encoder_output>;
+                        };
+                };
+        };
+
+        lvds-encoder {
+                compatible = "lvds-encoder";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
+                                lvds_encoder_input: endpoint {
+                                        remote-endpoint = <&hlcdc_output>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                lvds_encoder_output: endpoint {
+                                        remote-endpoint = <&panel_input>;
+                                };
                         };
                 };
         };
@@ -146,7 +171,7 @@
         };
 
         eeprom@50 {
-                compatible = "nxp,24c02";
+                compatible = "nxp,se97b", "atmel,24c02";
                 reg = <0x50>;
                 pagesize = <16>;
         };
@@ -176,8 +201,8 @@
                              &pinctrl_lcd_hipow0>;
 
                 port@0 {
-                        hlcdc_panel_output: endpoint {
-                                remote-endpoint = <&panel_input>;
+                        hlcdc_output: endpoint {
+                                remote-endpoint = <&lvds_encoder_input>;
                         };
                 };
         };
@@ -216,29 +241,34 @@
                         reg = <0x0 0x40000>;
                 };
 
-                bootloader@40000 {
-                        label = "bootloader";
-                        reg = <0x40000 0x80000>;
+                barebox@40000 {
+                        label = "barebox";
+                        reg = <0x40000 0x60000>;
+                };
+
+                bareboxenv@c0000 {
+                        label = "bareboxenv";
+                        reg = <0xc0000 0x40000>;
                 };
 
-                bootloaderenv@c0000 {
-                        label = "bootloader env";
-                        reg = <0xc0000 0xc0000>;
+                bareboxenv2@100000 {
+                        label = "bareboxenv2";
+                        reg = <0x100000 0x40000>;
                 };
 
-                dtb@180000 {
-                        label = "device tree";
-                        reg = <0x180000 0x80000>;
+                oftree@180000 {
+                        label = "oftree";
+                        reg = <0x180000 0x20000>;
                 };
 
                 kernel@200000 {
                         label = "kernel";
-                        reg = <0x200000 0x600000>;
+                        reg = <0x200000 0x500000>;
                 };
 
                 rootfs@800000 {
                         label = "rootfs";
-                        reg = <0x800000 0x0f800000>;
+                        reg = <0x800000 0x1f800000>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
index e603a267bdf1..b10dccd0958f 100644
--- a/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
@@ -230,7 +230,7 @@
                                 status = "okay";
 
                                 at24@50 {
-                                        compatible = "24c02";
+                                        compatible = "atmel,24c02";
                                         reg = <0x50>;
                                         pagesize = <8>;
                                 };
diff --git a/arch/arm/boot/dts/at91-tse850-3.dts b/arch/arm/boot/dts/at91-tse850-3.dts
index 9b82cc8843e1..2fbec69d9cd6 100644
--- a/arch/arm/boot/dts/at91-tse850-3.dts
+++ b/arch/arm/boot/dts/at91-tse850-3.dts
@@ -234,6 +234,7 @@
                 compatible = "ti,pcm5142";
 
                 reg = <0x4c>;
+                #sound-dai-cells = <0>;
 
                 AVDD-supply = <&reg_3v3>;
                 DVDD-supply = <&reg_3v3>;
@@ -246,7 +247,7 @@
         };
 
         eeprom@50 {
-                compatible = "nxp,24c02", "atmel,24c02";
+                compatible = "nxp,se97b", "atmel,24c02";
                 reg = <0x50>;
                 pagesize = <16>;
         };
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index ba61893a02a0..2ad69a7fbc00 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -493,8 +493,8 @@
                                 uart0 {
                                         pinctrl_uart0: uart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA17 periph A */
-                                                         AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA18 periph A */
+                                                        <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_uart0_cts: uart0_cts-0 {
@@ -511,8 +511,8 @@
                                 uart1 {
                                         pinctrl_uart1: uart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB20 periph A with pullup */
-                                                         AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB21 periph A */
+                                                        <AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_uart1_rts: uart1_rts-0 {
@@ -545,8 +545,8 @@
                                 uart2 {
                                         pinctrl_uart2: uart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PA22 periph A */
-                                                         AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PA23 periph A with pullup */
+                                                        <AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                                         AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_NONE>;
                                         };
 
                                         pinctrl_uart2_rts: uart2_rts-0 {
@@ -563,8 +563,8 @@
                                 uart3 {
                                         pinctrl_uart3: uart3-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */
-                                                         AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PA6 periph B */
+                                                        <AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE
+                                                         AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_uart3_rts: uart3_rts-0 {
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 655f06cd716a..9118e29b6d6a 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -434,8 +434,8 @@
                                 usart0 {
                                         pinctrl_usart0: usart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB4 periph A */
-                                                         AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB5 periph A */
+                                                        <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart0_rts: usart0_rts-0 {
@@ -468,8 +468,8 @@
                                 usart1 {
                                         pinctrl_usart1: usart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */
-                                                         AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB7 periph A */
+                                                        <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart1_rts: usart1_rts-0 {
@@ -486,8 +486,8 @@
                                 usart2 {
                                         pinctrl_usart2: usart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB8 periph A with pullup */
-                                                         AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB9 periph A */
+                                                        <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart2_rts: usart2_rts-0 {
@@ -504,8 +504,8 @@
                                 usart3 {
                                         pinctrl_usart3: usart3-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB10 periph A with pullup */
-                                                         AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
+                                                        <AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart3_rts: usart3_rts-0 {
@@ -522,16 +522,16 @@
                                 uart0 {
                                         pinctrl_uart0: uart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PA31 periph B with pullup */
-                                                         AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
+                                                        <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE
+                                                         AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
                                         };
                                 };
 
                                 uart1 {
                                         pinctrl_uart1: uart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB12 periph A with pullup */
-                                                         AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */
+                                                        <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
                                 };
 
diff --git a/arch/arm/boot/dts/at91sam9260ek.dts b/arch/arm/boot/dts/at91sam9260ek.dts
index e16c706d91ef..d2b865f60293 100644
--- a/arch/arm/boot/dts/at91sam9260ek.dts
+++ b/arch/arm/boot/dts/at91sam9260ek.dts
@@ -201,7 +201,7 @@
                 status = "okay";
 
                 24c512@50 {
-                        compatible = "24c512";
+                        compatible = "atmel,24c512";
                         reg = <0x50>;
                 };
         };
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index ddfc63b8fd4e..53c63d0a418a 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -328,8 +328,8 @@
                                 usart0 {
                                         pinctrl_usart0: usart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
-                                                        <AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+                                                        <AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                        <AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart0_rts: usart0_rts-0 {
@@ -346,8 +346,8 @@
                                 usart1 {
                                         pinctrl_usart1: usart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
-                                                        <AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+                                                        <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                        <AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart1_rts: usart1_rts-0 {
@@ -364,8 +364,8 @@
                                 usart2 {
                                         pinctrl_usart2: usart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
-                                                        <AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+                                                        <AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                        <AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart2_rts: usart2_rts-0 {
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index f2405671e3bd..87fb0660ab5d 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -437,8 +437,8 @@
                                 usart0 {
                                         pinctrl_usart0: usart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PA26 periph A with pullup */
-                                                         AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */
+                                                        <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart0_rts: usart0_rts-0 {
@@ -455,8 +455,8 @@
                                 usart1 {
                                         pinctrl_usart1: usart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD0 periph A with pullup */
-                                                         AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PD1 periph A */
+                                                        <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart1_rts: usart1_rts-0 {
@@ -473,8 +473,8 @@
                                 usart2 {
                                         pinctrl_usart2: usart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD2 periph A with pullup */
-                                                         AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PD3 periph A */
+                                                        <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart2_rts: usart2_rts-0 {
diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index e9a7c70830a8..727096f24f7c 100644
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -250,7 +250,7 @@
                 status = "okay";
 
                 24c512@50 {
-                        compatible = "24c512";
+                        compatible = "atmel,24c512";
                         reg = <0x50>;
                         pagesize = <128>;
                 };
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 50561b7b7939..71df3adfc7ca 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -211,7 +211,7 @@
                 status = "okay";
 
                 24c512@50 {
-                        compatible = "24c512";
+                        compatible = "atmel,24c512";
                         reg = <0x50>;
                 };
 
diff --git a/arch/arm/boot/dts/at91sam9g25.dtsi b/arch/arm/boot/dts/at91sam9g25.dtsi
index a7da0dd0c98f..0898213f3bb2 100644
--- a/arch/arm/boot/dts/at91sam9g25.dtsi
+++ b/arch/arm/boot/dts/at91sam9g25.dtsi
@@ -21,7 +21,7 @@
                                 atmel,mux-mask = <
                                       /*    A         B          C     */
                                        0xffffffff 0xffe0399f 0xc000001c  /* pioA */
-                                       0x0007ffff 0x8000fe3f 0x00000000  /* pioB */
+                                       0x0007ffff 0x00047e3f 0x00000000  /* pioB */
                                        0x80000000 0x07c0ffff 0xb83fffff  /* pioC */
                                        0x003fffff 0x003f8000 0x00000000  /* pioD */
                                       >;
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 3a30eec7f508..1ee25a475be8 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -555,8 +555,8 @@
                                 usart0 {
                                         pinctrl_usart0: usart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* PB19 periph A with pullup */
-                                                         AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
+                                                        <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart0_rts: usart0_rts-0 {
@@ -573,8 +573,8 @@
                                 uart1 {
                                         pinctrl_usart1: usart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB4 periph A with pullup */
-                                                         AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB5 periph A */
+                                                        <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart1_rts: usart1_rts-0 {
@@ -591,8 +591,8 @@
                                 usart2 {
                                         pinctrl_usart2: usart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */
-                                                         AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB7 periph A */
+                                                        <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart2_rts: usart2_rts-0 {
@@ -609,8 +609,8 @@
                                 usart3 {
                                         pinctrl_usart3: usart3-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB9 periph A with pullup */
-                                                         AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PB8 periph A */
+                                                        <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart3_rts: usart3_rts-0 {
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 4b62f4f963f6..37cb81f457b5 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -641,8 +641,8 @@
                                 uart1 {
                                         pinctrl_uart1: uart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_PULL_UP        /* PC17 periph C with pullup */
-                                                         AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC16 periph C */
+                                                        <AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_NONE
+                                                         AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>;
                                         };
                                 };
 
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 3cae687dccbd..bd001cca25a4 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -1,7 +1,8 @@
 /*
  * at91sam9rl.dtsi - Device Tree Include file for AT91SAM9RL family SoC
  *
- *  Copyright (C) 2014 Alexandre Belloni <alexandre.belloni@free-electrons.com>
+ *  Copyright (C) 2014 Microchip
+ *  Alexandre Belloni <alexandre.belloni@free-electrons.com>
  *
  * Licensed under GPLv2 or later.
  */
@@ -719,8 +720,8 @@
                                 usart1 {
                                         pinctrl_usart1: usart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
-                                                        <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+                                                        <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                        <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart1_rts: usart1_rts-0 {
@@ -742,8 +743,8 @@
                                 usart2 {
                                         pinctrl_usart2: usart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
-                                                        <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+                                                        <AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                        <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart2_rts: usart2_rts-0 {
@@ -765,8 +766,8 @@
                                 usart3 {
                                         pinctrl_usart3: usart3-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
-                                                        <AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+                                                        <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE>,
+                                                        <AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart3_rts: usart3_rts-0 {
diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index 4bde9f245e61..27d8a1f44233 100644
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -1,7 +1,8 @@
 /*
  * at91sam9rlek.dts - Device Tree file for Atmel at91sam9rl reference board
  *
- *  Copyright (C) 2014  Alexandre Belloni <alexandre.belloni@free-electrons.com>
+ *  Copyright (C) 2014 Microchip
+ *  Alexandre Belloni <alexandre.belloni@free-electrons.com>
  *
  * Licensed under GPLv2 only
  */
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index fee4fe51a97e..a3c3c3128148 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -520,8 +520,8 @@
                                 usart0 {
                                         pinctrl_usart0: usart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA0 periph A with pullup */
-                                                         AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA1 periph A */
+                                                        <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart0_rts: usart0_rts-0 {
@@ -543,8 +543,8 @@
                                 usart1 {
                                         pinctrl_usart1: usart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA5 periph A with pullup */
-                                                         AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA6 periph A */
+                                                        <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart1_rts: usart1_rts-0 {
@@ -566,8 +566,8 @@
                                 usart2 {
                                         pinctrl_usart2: usart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
-                                                         AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>;  /* PA8 periph A */
+                                                        <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart2_rts: usart2_rts-0 {
diff --git a/arch/arm/boot/dts/at91sam9x5_usart3.dtsi b/arch/arm/boot/dts/at91sam9x5_usart3.dtsi
index 43bb5b51caa6..a32d12b406a3 100644
--- a/arch/arm/boot/dts/at91sam9x5_usart3.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5_usart3.dtsi
@@ -21,8 +21,8 @@
                                 usart3 {
                                         pinctrl_usart3: usart3-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* PC22 periph B with pullup */
-                                                         AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>;         /* PC23 periph B */
+                                                        <AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE
+                                                         AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
                                         };
 
                                         pinctrl_usart3_rts: usart3_rts-0 {
diff --git a/arch/arm/boot/dts/atlas7-evb.dts b/arch/arm/boot/dts/atlas7-evb.dts
index 1e9cd1a8508e..900e03b7a7b2 100644
--- a/arch/arm/boot/dts/atlas7-evb.dts
+++ b/arch/arm/boot/dts/atlas7-evb.dts
@@ -73,7 +73,7 @@
                 btm {
                         uart6: uart@11000000 {
                                 status = "okay";
-                                sirf,uart-has-rtscts;
+                                uart-has-rtscts;
                         };
                 };
 
diff --git a/arch/arm/boot/dts/axp209.dtsi b/arch/arm/boot/dts/axp209.dtsi
index 897103e0a79b..0d9ff12bdf28 100644
--- a/arch/arm/boot/dts/axp209.dtsi
+++ b/arch/arm/boot/dts/axp209.dtsi
@@ -58,6 +58,11 @@
                 status = "disabled";
         };
 
+        axp_adc: adc {
+                compatible = "x-powers,axp209-adc";
+                #io-channel-cells = <1>;
+        };
+
         axp_gpio: gpio {
                 compatible = "x-powers,axp209-gpio";
                 gpio-controller;
diff --git a/arch/arm/boot/dts/axp22x.dtsi b/arch/arm/boot/dts/axp22x.dtsi
index 87fb08e812ec..65a07a67aca9 100644
--- a/arch/arm/boot/dts/axp22x.dtsi
+++ b/arch/arm/boot/dts/axp22x.dtsi
@@ -57,6 +57,11 @@
                 status = "disabled";
         };
 
+        axp_adc: adc {
+                compatible = "x-powers,axp221-adc";
+                #io-channel-cells = <1>;
+        };
+
         battery_power_supply: battery-power-supply {
                 compatible = "x-powers,axp221-battery-power-supply";
                 status = "disabled";
diff --git a/arch/arm/boot/dts/axp81x.dtsi b/arch/arm/boot/dts/axp81x.dtsi
index fd55b896afa1..043c717dcef1 100644
--- a/arch/arm/boot/dts/axp81x.dtsi
+++ b/arch/arm/boot/dts/axp81x.dtsi
@@ -48,7 +48,12 @@
         interrupt-controller;
         #interrupt-cells = <1>;
 
-        axp_gpio: axp-gpio {
+        axp_adc: adc {
+                compatible = "x-powers,axp813-adc";
+                #io-channel-cells = <1>;
+        };
+
+        axp_gpio: gpio {
                 compatible = "x-powers,axp813-gpio";
                 gpio-controller;
                 #gpio-cells = <2>;
@@ -64,6 +69,11 @@
                 };
         };
 
+        battery_power_supply: battery-power-supply {
+                compatible = "x-powers,axp813-battery-power-supply";
+                status = "disabled";
+        };
+
         regulators {
                 /* Default work frequency for buck regulators */
                 x-powers,dcdc-freq = <3000>;
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index b8565fc33eea..b7f79f1c431a 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -12,7 +12,7 @@
 /dts-v1/;
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
-#include "bcm283x-rpi-usb-host.dtsi"
+#include "bcm283x-rpi-usb-otg.dtsi"
 
 / {
         compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
@@ -131,6 +131,18 @@
 
 &uart0 {
         pinctrl-names = "default";
-        pinctrl-0 = <&uart0_gpio14>;
+        pinctrl-0 = <&uart0_gpio32 &uart0_ctsrts_gpio30>;
+        status = "okay";
+
+        bluetooth {
+                compatible = "brcm,bcm43438-bt";
+                max-speed = <2000000>;
+                shutdown-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;
+        };
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_gpio14>;
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 593f58d4ac0f..6c3cfaa77f3d 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -18,7 +18,9 @@
 
         soc {
                 firmware: firmware {
-                        compatible = "raspberrypi,bcm2835-firmware";
+                        compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
+                        #address-cells = <0>;
+                        #size-cells = <0>;
                         mboxes = <&mailbox>;
                 };
 
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 3e4ed7c5b0b3..0b31d995a066 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -25,6 +25,23 @@
         };
 };
 
+&firmware {
+        expgpio: gpio {
+                compatible = "raspberrypi,firmware-gpio";
+                gpio-controller;
+                #gpio-cells = <2>;
+                gpio-line-names = "BT_ON",
+                                  "WL_ON",
+                                  "STATUS_LED",
+                                  "LAN_RUN",
+                                  "HPD_N",
+                                  "CAM_GPIO0",
+                                  "CAM_GPIO1",
+                                  "PWR_LOW_N";
+                status = "okay";
+        };
+};
+
 /* uart0 communicates with the BT module */
 &uart0 {
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 9d293decf8d3..ac00e730f898 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -223,6 +223,7 @@
                         gpclk2_gpio43: gpclk2_gpio43 {
                                 brcm,pins = <43>;
                                 brcm,function = <BCM2835_FSEL_ALT0>;
+                                brcm,pull = <BCM2835_PUD_OFF>;
                         };
 
                         i2c0_gpio0: i2c0_gpio0 {
@@ -252,7 +253,7 @@
 
                         jtag_gpio4: jtag_gpio4 {
                                 brcm,pins = <4 5 6 12 13>;
-                                brcm,function = <BCM2835_FSEL_ALT4>;
+                                brcm,function = <BCM2835_FSEL_ALT5>;
                         };
                         jtag_gpio22: jtag_gpio22 {
                                 brcm,pins = <22 23 24 25 26 27>;
@@ -335,10 +336,12 @@
                         uart0_ctsrts_gpio30: uart0_ctsrts_gpio30 {
                                 brcm,pins = <30 31>;
                                 brcm,function = <BCM2835_FSEL_ALT3>;
+                                brcm,pull = <BCM2835_PUD_UP BCM2835_PUD_OFF>;
                         };
                         uart0_gpio32: uart0_gpio32 {
                                 brcm,pins = <32 33>;
                                 brcm,function = <BCM2835_FSEL_ALT3>;
+                                brcm,pull = <BCM2835_PUD_OFF BCM2835_PUD_UP>;
                         };
                         uart0_gpio36: uart0_gpio36 {
                                 brcm,pins = <36 37>;
@@ -397,8 +400,8 @@
 
                 i2s: i2s@7e203000 {
                         compatible = "brcm,bcm2835-i2s";
-                        reg = <0x7e203000 0x20>,
-                              <0x7e101098 0x02>;
+                        reg = <0x7e203000 0x24>;
+                        clocks = <&clocks BCM2835_CLOCK_PCM>;
 
                         dmas = <&dma 2>,
                                <&dma 3>;
@@ -438,6 +441,17 @@
                         interrupts = <2 14>; /* pwa1 */
                 };
 
+                dpi: dpi@7e208000 {
+                        compatible = "brcm,bcm2835-dpi";
+                        reg = <0x7e208000 0x8c>;
+                        clocks = <&clocks BCM2835_CLOCK_VPU>,
+                                 <&clocks BCM2835_CLOCK_DPI>;
+                        clock-names = "core", "pixel";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
                 dsi0: dsi@7e209000 {
                         compatible = "brcm,bcm2835-dsi0";
                         reg = <0x7e209000 0x78>;
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
index 8bef6429feee..87ea6ba664f5 100644
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
@@ -35,6 +35,74 @@
                        0x88000000 0x08000000>;
         };
 
+        spi {
+                compatible = "spi-gpio";
+                num-chipselects = <1>;
+                gpio-sck = <&chipcommon 7 0>;
+                gpio-mosi = <&chipcommon 4 0>;
+                cs-gpios = <&chipcommon 6 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                hc595: gpio_spi@0 {
+                        compatible = "fairchild,74hc595";
+                        reg = <0>;
+                        registers-number = <1>;
+                        spi-max-frequency = <100000>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                usb {
+                        label = "bcm53xx:green:usb";
+                        gpios = <&hc595 0 GPIO_ACTIVE_HIGH>;
+                };
+
+                power0 {
+                        label = "bcm53xx:green:power";
+                        gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "default-on";
+                };
+
+                power1 {
+                        label = "bcm53xx:red:power";
+                        gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
+                };
+
+                router0 {
+                        label = "bcm53xx:green:router";
+                        gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "default-on";
+                };
+
+                router1 {
+                        label = "bcm53xx:amber:router";
+                        gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
+                };
+
+                wan {
+                        label = "bcm53xx:green:wan";
+                        gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "default-on";
+                };
+
+                wireless0 {
+                        label = "bcm53xx:green:wireless";
+                        gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
+                };
+
+                wireless1 {
+                        label = "bcm53xx:amber:wireless";
+                        gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
+                };
+        };
+
         gpio-keys {
                 compatible = "gpio-keys";
                 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts
index fd8b8c689ffe..ecd05e26c262 100644
--- a/arch/arm/boot/dts/bcm958622hr.dts
+++ b/arch/arm/boot/dts/bcm958622hr.dts
@@ -204,10 +204,10 @@
                         reg = <4>;
                 };
 
-                port@5 {
-                        ethernet = <&amac0>;
+                port@8 {
+                        ethernet = <&amac2>;
                         label = "cpu";
-                        reg = <5>;
+                        reg = <8>;
                         fixed-link {
                                 speed = <1000>;
                                 full-duplex;
diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts
index b8bde13de90a..f5e85b301497 100644
--- a/arch/arm/boot/dts/bcm958623hr.dts
+++ b/arch/arm/boot/dts/bcm958623hr.dts
@@ -208,10 +208,10 @@
                         reg = <4>;
                 };
 
-                port@5 {
-                        ethernet = <&amac0>;
+                port@8 {
+                        ethernet = <&amac2>;
                         label = "cpu";
-                        reg = <5>;
+                        reg = <8>;
                         fixed-link {
                                 speed = <1000>;
                                 full-duplex;
diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index f0e2008f7490..ea3fc194f8f3 100644
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -210,10 +210,10 @@
                         reg = <4>;
                 };
 
-                port@5 {
-                        ethernet = <&amac0>;
+                port@8 {
+                        ethernet = <&amac2>;
                         label = "cpu";
-                        reg = <5>;
+                        reg = <8>;
                         fixed-link {
                                 speed = <1000>;
                                 full-duplex;
diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index 2cf2392483b2..3ea5f739e90b 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -245,10 +245,10 @@
                         reg = <4>;
                 };
 
-                port@5 {
-                        ethernet = <&amac0>;
+                port@8 {
+                        ethernet = <&amac2>;
                         label = "cpu";
-                        reg = <5>;
+                        reg = <8>;
                         fixed-link {
                                 speed = <1000>;
                                 full-duplex;
diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts
index bce251a68591..ea9a0806b446 100644
--- a/arch/arm/boot/dts/bcm988312hr.dts
+++ b/arch/arm/boot/dts/bcm988312hr.dts
@@ -216,10 +216,10 @@
                         reg = <4>;
                 };
 
-                port@5 {
-                        ethernet = <&amac0>;
+                port@8 {
+                        ethernet = <&amac2>;
                         label = "cpu";
-                        reg = <5>;
+                        reg = <8>;
                         fixed-link {
                                 speed = <1000>;
                                 full-duplex;
diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index c75507922f7d..3962fa4b07f5 100644
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -15,11 +15,16 @@
         compatible = "ti,da850-evm", "ti,da850";
         model = "DA850/AM1808/OMAP-L138 EVM";
 
+        chosen {
+                stdout-path = &serial2;
+        };
+
         aliases {
                 serial0 = &serial0;
                 serial1 = &serial1;
                 serial2 = &serial2;
                 ethernet0 = &eth0;
+                spi0 = &spi1;
         };
 
         soc@1c00000 {
diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts
index 81942ae83e1f..1ffd87796cac 100644
--- a/arch/arm/boot/dts/da850-lego-ev3.dts
+++ b/arch/arm/boot/dts/da850-lego-ev3.dts
@@ -184,6 +184,23 @@
                 io-channel-names = "voltage", "current";
                 rechargeable-gpios = <&gpio 136 GPIO_ACTIVE_LOW>;
         };
+
+        /* ARM local RAM */
+        memory@ffff0000 {
+                compatible = "syscon", "simple-mfd";
+                reg = <0xffff0000 0x2000>; /* 8k */
+
+                /*
+                 * The I2C bootloader looks for this magic value to either
+                 * boot normally or boot into a firmware update mode.
+                 */
+                reboot-mode {
+                        compatible = "syscon-reboot-mode";
+                        offset = <0x1ffc>;
+                        mode-normal = <0x00000000>;
+                        mode-loader = <0x5555aaaa>;
+                };
+        };
 };
 
 &pmx_core {
@@ -293,7 +310,7 @@
          * EEPROM contains the first stage bootloader, HW ID and Bluetooth MAC.
          */
         eeprom@50 {
-                compatible = "microchip,24c128";
+                compatible = "microchip,24c128", "atmel,24c128";
                 pagesize = <64>;
                 read-only;
                 reg = <0x50>;
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index a7385c338ee9..f1425b0f3a54 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -87,33 +87,6 @@
                         DRA7XX_CORE_IOPAD(0x3818, MUX_MODE15 | PULL_UP) /* wakeup0.off */
                 >;
         };
-
-        mmc1_pins_default: mmc1_pins_default {
-                pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x376c, PIN_INPUT | MUX_MODE14)       /* mmc1sdcd.gpio219 */
-                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */
-                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */
-                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */
-                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */
-                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */
-                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */
-                >;
-        };
-
-        mmc2_pins_default: mmc2_pins_default {
-                pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
-                        DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
-                        DRA7XX_CORE_IOPAD(0x34a0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */
-                        DRA7XX_CORE_IOPAD(0x34a4, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */
-                        DRA7XX_CORE_IOPAD(0x34a8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */
-                        DRA7XX_CORE_IOPAD(0x34ac, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */
-                        DRA7XX_CORE_IOPAD(0x348c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */
-                        DRA7XX_CORE_IOPAD(0x3490, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */
-                        DRA7XX_CORE_IOPAD(0x3494, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */
-                        DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
-                >;
-        };
 };
 
 &i2c1 {
@@ -350,6 +323,7 @@
 &mmc2 {
         status = "okay";
         vmmc-supply = <&evm_1v8_sw>;
+        vqmmc-supply = <&evm_1v8_sw>;
         bus-width = <8>;
         pinctrl-names = "default", "hs", "ddr_1_8v-rev11", "ddr_1_8v", "hs200_1_8v-rev11", "hs200_1_8v";
         pinctrl-0 = <&mmc2_pins_default>;
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index e4a420f16800..f4ddd86f2c77 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -92,8 +92,6 @@
                         clock-latency = <300000>; /* From omap-cpufreq driver */
 
                         /* cooling options */
-                        cooling-min-level = <0>;
-                        cooling-max-level = <2>;
                         #cooling-cells = <2>; /* min followed by max */
 
                         vbb-supply = <&abb_mpu>;
diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index 41c9132eb550..ebc4bbae981e 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -24,13 +24,13 @@
 
                 regulator-name = "vddshv8";
                 regulator-min-microvolt = <1800000>;
-                regulator-max-microvolt = <3000000>;
+                regulator-max-microvolt = <3300000>;
                 regulator-boot-on;
                 vin-supply = <&evm_5v0>;
 
                 gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>;
                 states = <1800000 0x0
-                          3000000 0x1>;
+                          3300000 0x1>;
         };
 
         evm_1v8_sw: fixedregulator-evm_1v8 {
@@ -50,6 +50,19 @@
         };
 };
 
+&dra7_pmx_core {
+        mmc1_pins_default: mmc1_pins_default {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mmc1_clk.clk */
+                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */
+                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */
+                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */
+                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */
+                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */
+                >;
+        };
+};
+
 &i2c1 {
         status = "okay";
         clock-frequency = <400000>;
diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts
index c4fe7f8ef72a..2deb96405d06 100644
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@ -9,6 +9,7 @@
 
 #include "dra76x.dtsi"
 #include "dra7-evm-common.dtsi"
+#include "dra76x-mmc-iodelay.dtsi"
 #include <dt-bindings/net/ti-dp83867.h>
 
 / {
@@ -100,46 +101,6 @@
         };
 };
 
-&dra7_pmx_core {
-        mmc1_pins_default: mmc1_pins_default {
-                pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x376c, PIN_INPUT | MUX_MODE14)       /* mmc1sdcd.gpio219 */
-                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */
-                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */
-                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */
-                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */
-                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */
-                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */
-                >;
-        };
-
-        mmc1_pins_sdr12: pinmux_mmc1_sdr12_pins {
-                pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */
-                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */
-                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */
-                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */
-                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */
-                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */
-                >;
-        };
-
-        mmc2_pins_default: mmc2_pins_default {
-                pinctrl-single,pins = <
-                        DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
-                        DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
-                        DRA7XX_CORE_IOPAD(0x34a0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */
-                        DRA7XX_CORE_IOPAD(0x34a4, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */
-                        DRA7XX_CORE_IOPAD(0x34a8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */
-                        DRA7XX_CORE_IOPAD(0x34ac, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */
-                        DRA7XX_CORE_IOPAD(0x348c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */
-                        DRA7XX_CORE_IOPAD(0x3490, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */
-                        DRA7XX_CORE_IOPAD(0x3494, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */
-                        DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
-                >;
-        };
-};
-
 &i2c1 {
         status = "okay";
         clock-frequency = <400000>;
@@ -353,16 +314,21 @@
          * is always hardwired.
          */
         cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>;
-        pinctrl-names = "default";
+        pinctrl-names = "default", "hs";
         pinctrl-0 = <&mmc1_pins_default>;
+        pinctrl-1 = <&mmc1_pins_hs>;
 };
 
 &mmc2 {
         status = "okay";
         vmmc-supply = <&vio_1v8>;
+        vqmmc-supply = <&vio_1v8>;
         bus-width = <8>;
-        pinctrl-names = "default";
+        pinctrl-names = "default", "hs", "ddr_1_8v", "hs200_1_8v";
         pinctrl-0 = <&mmc2_pins_default>;
+        pinctrl-1 = <&mmc2_pins_default>;
+        pinctrl-2 = <&mmc2_pins_default>;
+        pinctrl-3 = <&mmc2_pins_hs200 &mmc2_iodelay_hs200_conf>;
 };
 
 /* No RTC on this device */
diff --git a/arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi
new file mode 100644
index 000000000000..baba7b00eca7
--- /dev/null
+++ b/arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi
@@ -0,0 +1,285 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2018 Texas Instruments
+// MMC IOdelay values for TI's DRA76x and AM576x SoCs.
+// Author: Sekhar Nori <nsekhar@ti.com>
+
+/*
+ * Rules for modifying this file:
+ * a) Update of this file should typically correspond to a datamanual revision.
+ *    Datamanual revision that was used should be updated in comment below.
+ *    If there is no update to datamanual, do not update the values. If you
+ *    need to use values different from that recommended by the datamanual
+ *    for your design, then you should consider adding values to the device-
+ *    -tree file for your board directly.
+ * b) We keep the mode names as close to the datamanual as possible. So
+ *    if the manual calls a mode, DDR50, or DDR or DDR 1.8v or DDR 3.3v,
+ *    we follow that in code too.
+ * c) If the values change between multiple revisions of silicon, we add
+ *    a revision tag to both the new and old entry. Use 'rev11' for PG 1.1,
+ *    'rev20' for PG 2.0 and so on.
+ * d) The node name and node label should be the exact same string. This is
+ *    to curb naming creativity and achieve consistency.
+ *
+ * Datamanual Revisions:
+ *
+ * DRA76x Silicon Revision 1.0: SPRS993A, Revised July 2017
+ *
+ */
+
+&dra7_pmx_core {
+        mmc1_pins_default: mmc1_pins_default {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */
+                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */
+                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */
+                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */
+                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */
+                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */
+                >;
+        };
+
+        mmc1_pins_hs: mmc1_pins_hs {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_clk.clk */
+                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_cmd.cmd */
+                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_dat0.dat0 */
+                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_dat1.dat1 */
+                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_dat2.dat2 */
+                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE11 | MUX_MODE0) /* mmc1_dat3.dat3 */
+                >;
+        };
+
+        mmc1_pins_sdr50: mmc1_pins_sdr50 {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0)    /* mmc1_clk.clk */
+                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0)    /* mmc1_cmd.cmd */
+                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0)    /* mmc1_dat0.dat0 */
+                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0)    /* mmc1_dat1.dat1 */
+                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0)    /* mmc1_dat2.dat2 */
+                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_VIRTUAL_MODE10 | MUX_MODE0)    /* mmc1_dat3.dat3 */
+                >;
+        };
+
+        mmc1_pins_ddr50: mmc1_pins_ddr50 {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)   /* mmc1_clk.clk */
+                        DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)   /* mmc1_cmd.cmd */
+                        DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)   /* mmc1_dat0.dat0 */
+                        DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)   /* mmc1_dat1.dat1 */
+                        DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)   /* mmc1_dat2.dat2 */
+                        DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)   /* mmc1_dat3.dat3 */
+                >;
+        };
+
+        mmc2_pins_default: mmc2_pins_default {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */
+                        DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
+                        DRA7XX_CORE_IOPAD(0x34a0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */
+                        DRA7XX_CORE_IOPAD(0x34a4, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */
+                        DRA7XX_CORE_IOPAD(0x34a8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */
+                        DRA7XX_CORE_IOPAD(0x34ac, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */
+                        DRA7XX_CORE_IOPAD(0x348c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */
+                        DRA7XX_CORE_IOPAD(0x3490, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */
+                        DRA7XX_CORE_IOPAD(0x3494, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */
+                        DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
+                >;
+        };
+
+        mmc2_pins_hs200: mmc2_pins_hs200 {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a23.mmc2_clk */
+                        DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
+                        DRA7XX_CORE_IOPAD(0x34a0, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */
+                        DRA7XX_CORE_IOPAD(0x34a4, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */
+                        DRA7XX_CORE_IOPAD(0x34a8, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */
+                        DRA7XX_CORE_IOPAD(0x34ac, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */
+                        DRA7XX_CORE_IOPAD(0x348c, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */
+                        DRA7XX_CORE_IOPAD(0x3490, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */
+                        DRA7XX_CORE_IOPAD(0x3494, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */
+                        DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */
+                >;
+        };
+
+        mmc3_pins_default: mmc3_pins_default {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x377c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_clk.mmc3_clk */
+                        DRA7XX_CORE_IOPAD(0x3780, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_cmd.mmc3_cmd */
+                        DRA7XX_CORE_IOPAD(0x3784, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat0.mmc3_dat0 */
+                        DRA7XX_CORE_IOPAD(0x3788, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat1.mmc3_dat1 */
+                        DRA7XX_CORE_IOPAD(0x378c, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat2.mmc3_dat2 */
+                        DRA7XX_CORE_IOPAD(0x3790, (PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE0)) /* mmc3_dat3.mmc3_dat3 */
+                >;
+        };
+
+        mmc4_pins_hs: mmc4_pins_hs {
+                pinctrl-single,pins = <
+                        DRA7XX_CORE_IOPAD(0x37e8, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_ctsn.mmc4_clk */
+                        DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart1_rtsn.mmc4_cmd */
+                        DRA7XX_CORE_IOPAD(0x37f0, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_rxd.mmc4_dat0 */
+                        DRA7XX_CORE_IOPAD(0x37f4, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_txd.mmc4_dat1 */
+                        DRA7XX_CORE_IOPAD(0x37f8, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_ctsn.mmc4_dat2 */
+                        DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_PULLUP | MODE_SELECT | MUX_MODE3) /* uart2_rtsn.mmc4_dat3 */
+                >;
+        };
+};
+
+&dra7_iodelay_core {
+
+        /* Corresponds to MMC1_DDR_MANUAL1 in datamanual */
+        mmc1_iodelay_ddr_conf: mmc1_iodelay_ddr_conf {
+                pinctrl-pin-array = <
+                        0x618 A_DELAY_PS(489) G_DELAY_PS(0)     /* CFG_MMC1_CLK_IN */
+                        0x624 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_CMD_IN */
+                        0x630 A_DELAY_PS(374) G_DELAY_PS(0)     /* CFG_MMC1_DAT0_IN */
+                        0x63c A_DELAY_PS(31) G_DELAY_PS(0)      /* CFG_MMC1_DAT1_IN */
+                        0x648 A_DELAY_PS(56) G_DELAY_PS(0)      /* CFG_MMC1_DAT2_IN */
+                        0x654 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT3_IN */
+                        0x620 A_DELAY_PS(1355) G_DELAY_PS(0)    /* CFG_MMC1_CLK_OUT */
+                        0x628 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_CMD_OEN */
+                        0x62c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_CMD_OUT */
+                        0x634 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT0_OEN */
+                        0x638 A_DELAY_PS(0) G_DELAY_PS(4)       /* CFG_MMC1_DAT0_OUT */
+                        0x640 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT1_OEN */
+                        0x644 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT1_OUT */
+                        0x64c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT2_OEN */
+                        0x650 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT2_OUT */
+                        0x658 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT3_OEN */
+                        0x65c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT3_OUT */
+                >;
+        };
+
+        /* Corresponds to MMC1_SDR104_MANUAL1 in datamanual */
+        mmc1_iodelay_sdr104_conf: mmc1_iodelay_sdr104_conf {
+                pinctrl-pin-array = <
+                        0x620 A_DELAY_PS(892) G_DELAY_PS(0)     /* CFG_MMC1_CLK_OUT */
+                        0x628 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_CMD_OEN */
+                        0x62c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_CMD_OUT */
+                        0x634 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT0_OEN */
+                        0x638 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT0_OUT */
+                        0x640 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT1_OEN */
+                        0x644 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT1_OUT */
+                        0x64c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT2_OEN */
+                        0x650 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT2_OUT */
+                        0x658 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT3_OEN */
+                        0x65c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC1_DAT3_OUT */
+                >;
+        };
+
+        /* Corresponds to MMC2_HS200_MANUAL1 in datamanual */
+        mmc2_iodelay_hs200_conf: mmc2_iodelay_hs200_conf {
+                pinctrl-pin-array = <
+                        0x190 A_DELAY_PS(384) G_DELAY_PS(0)       /* CFG_GPMC_A19_OEN */
+                        0x194 A_DELAY_PS(0) G_DELAY_PS(174)       /* CFG_GPMC_A19_OUT */
+                        0x1a8 A_DELAY_PS(410) G_DELAY_PS(0)       /* CFG_GPMC_A20_OEN */
+                        0x1ac A_DELAY_PS(85) G_DELAY_PS(0)        /* CFG_GPMC_A20_OUT */
+                        0x1b4 A_DELAY_PS(468) G_DELAY_PS(0)       /* CFG_GPMC_A21_OEN */
+                        0x1b8 A_DELAY_PS(139) G_DELAY_PS(0)       /* CFG_GPMC_A21_OUT */
+                        0x1c0 A_DELAY_PS(676) G_DELAY_PS(0)       /* CFG_GPMC_A22_OEN */
+                        0x1c4 A_DELAY_PS(69) G_DELAY_PS(0)        /* CFG_GPMC_A22_OUT */
+                        0x1d0 A_DELAY_PS(1062) G_DELAY_PS(154)    /* CFG_GPMC_A23_OUT */
+                        0x1d8 A_DELAY_PS(640) G_DELAY_PS(0)       /* CFG_GPMC_A24_OEN */
+                        0x1dc A_DELAY_PS(0) G_DELAY_PS(0)         /* CFG_GPMC_A24_OUT */
+                        0x1e4 A_DELAY_PS(356) G_DELAY_PS(0)       /* CFG_GPMC_A25_OEN */
+                        0x1e8 A_DELAY_PS(0) G_DELAY_PS(0)         /* CFG_GPMC_A25_OUT */
+                        0x1f0 A_DELAY_PS(579) G_DELAY_PS(0)       /* CFG_GPMC_A26_OEN */
+                        0x1f4 A_DELAY_PS(0) G_DELAY_PS(0)         /* CFG_GPMC_A26_OUT */
+                        0x1fc A_DELAY_PS(435) G_DELAY_PS(0)       /* CFG_GPMC_A27_OEN */
+                        0x200 A_DELAY_PS(36) G_DELAY_PS(0)        /* CFG_GPMC_A27_OUT */
+                        0x364 A_DELAY_PS(759) G_DELAY_PS(0)       /* CFG_GPMC_CS1_OEN */
+                        0x368 A_DELAY_PS(72) G_DELAY_PS(0)        /* CFG_GPMC_CS1_OUT */
+              >;
+        };
+
+        /* Corresponds to MMC3_MANUAL1 in datamanual */
+        mmc3_iodelay_manual1_conf: mmc3_iodelay_manual1_conf {
+                pinctrl-pin-array = <
+                        0x678 A_DELAY_PS(0) G_DELAY_PS(386)     /* CFG_MMC3_CLK_IN */
+                        0x680 A_DELAY_PS(605) G_DELAY_PS(0)     /* CFG_MMC3_CLK_OUT */
+                        0x684 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_CMD_IN */
+                        0x688 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_CMD_OEN */
+                        0x68c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_CMD_OUT */
+                        0x690 A_DELAY_PS(171) G_DELAY_PS(0)     /* CFG_MMC3_DAT0_IN */
+                        0x694 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT0_OEN */
+                        0x698 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT0_OUT */
+                        0x69c A_DELAY_PS(221) G_DELAY_PS(0)     /* CFG_MMC3_DAT1_IN */
+                        0x6a0 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT1_OEN */
+                        0x6a4 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT1_OUT */
+                        0x6a8 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT2_IN */
+                        0x6ac A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT2_OEN */
+                        0x6b0 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT2_OUT */
+                        0x6b4 A_DELAY_PS(474) G_DELAY_PS(0)     /* CFG_MMC3_DAT3_IN */
+                        0x6b8 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT3_OEN */
+                        0x6bc A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT3_OUT */
+                >;
+        };
+
+        /* Corresponds to MMC3_MANUAL2 in datamanual */
+        mmc3_iodelay_sdr50_conf: mmc3_iodelay_sdr50_conf {
+                pinctrl-pin-array = <
+                        0x678 A_DELAY_PS(852) G_DELAY_PS(0)     /* CFG_MMC3_CLK_IN */
+                        0x680 A_DELAY_PS(94) G_DELAY_PS(0)      /* CFG_MMC3_CLK_OUT */
+                        0x684 A_DELAY_PS(122) G_DELAY_PS(0)     /* CFG_MMC3_CMD_IN */
+                        0x688 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_CMD_OEN */
+                        0x68c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_CMD_OUT */
+                        0x690 A_DELAY_PS(91) G_DELAY_PS(0)      /* CFG_MMC3_DAT0_IN */
+                        0x694 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT0_OEN */
+                        0x698 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT0_OUT */
+                        0x69c A_DELAY_PS(57) G_DELAY_PS(0)      /* CFG_MMC3_DAT1_IN */
+                        0x6a0 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT1_OEN */
+                        0x6a4 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT1_OUT */
+                        0x6a8 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT2_IN */
+                        0x6ac A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT2_OEN */
+                        0x6b0 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT2_OUT */
+                        0x6b4 A_DELAY_PS(375) G_DELAY_PS(0)     /* CFG_MMC3_DAT3_IN */
+                        0x6b8 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT3_OEN */
+                        0x6bc A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_MMC3_DAT3_OUT */
+                >;
+        };
+
+        /* Corresponds to MMC4_MANUAL1 in datamanual */
+        mmc4_iodelay_manual1_conf: mmc4_iodelay_manual1_conf {
+                pinctrl-pin-array = <
+                        0x840 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART1_CTSN_IN */
+                        0x848 A_DELAY_PS(1147) G_DELAY_PS(0)    /* CFG_UART1_CTSN_OUT */
+                        0x84c A_DELAY_PS(1834) G_DELAY_PS(0)    /* CFG_UART1_RTSN_IN */
+                        0x850 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART1_RTSN_OEN */
+                        0x854 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART1_RTSN_OUT */
+                        0x870 A_DELAY_PS(2165) G_DELAY_PS(0)    /* CFG_UART2_CTSN_IN */
+                        0x874 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_CTSN_OEN */
+                        0x878 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_CTSN_OUT */
+                        0x87c A_DELAY_PS(1929) G_DELAY_PS(64)   /* CFG_UART2_RTSN_IN */
+                        0x880 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_RTSN_OEN */
+                        0x884 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_RTSN_OUT */
+                        0x888 A_DELAY_PS(1935) G_DELAY_PS(128)  /* CFG_UART2_RXD_IN */
+                        0x88c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_RXD_OEN */
+                        0x890 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_RXD_OUT */
+                        0x894 A_DELAY_PS(2172) G_DELAY_PS(44)   /* CFG_UART2_TXD_IN */
+                        0x898 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_TXD_OEN */
+                        0x89c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_TXD_OUT */
+                >;
+        };
+
+        /* Corresponds to MMC4_DS_MANUAL1 in datamanual */
+        mmc4_iodelay_default_conf: mmc4_iodelay_default_conf {
+                pinctrl-pin-array = <
+                        0x840 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART1_CTSN_IN */
+                        0x848 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART1_CTSN_OUT */
+                        0x84c A_DELAY_PS(307) G_DELAY_PS(0)     /* CFG_UART1_RTSN_IN */
+                        0x850 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART1_RTSN_OEN */
+                        0x854 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART1_RTSN_OUT */
+                        0x870 A_DELAY_PS(785) G_DELAY_PS(0)     /* CFG_UART2_CTSN_IN */
+                        0x874 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_CTSN_OEN */
+                        0x878 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_CTSN_OUT */
+                        0x87c A_DELAY_PS(613) G_DELAY_PS(0)     /* CFG_UART2_RTSN_IN */
+                        0x880 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_RTSN_OEN */
+                        0x884 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_RTSN_OUT */
+                        0x888 A_DELAY_PS(683) G_DELAY_PS(0)     /* CFG_UART2_RXD_IN */
+                        0x88c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_RXD_OEN */
+                        0x890 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_RXD_OUT */
+                        0x894 A_DELAY_PS(835) G_DELAY_PS(0)     /* CFG_UART2_TXD_IN */
+                        0x898 A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_TXD_OEN */
+                        0x89c A_DELAY_PS(0) G_DELAY_PS(0)       /* CFG_UART2_TXD_OUT */
+                >;
+        };
+};
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index 60d0a732833a..c238407133bf 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -38,28 +38,28 @@
                 #size-cells = <0>;
 
                 one {
-                        debounce_interval = <50>;
+                        debounce-interval = <50>;
                         wakeup-source;
                         label = "DSW2-1";
                         linux,code = <KEY_1>;
                         gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
                 };
                 two {
-                        debounce_interval = <50>;
+                        debounce-interval = <50>;
                         wakeup-source;
                         label = "DSW2-2";
                         linux,code = <KEY_2>;
                         gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                 };
                 three {
-                        debounce_interval = <50>;
+                        debounce-interval = <50>;
                         wakeup-source;
                         label = "DSW2-3";
                         linux,code = <KEY_3>;
                         gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
                 };
                 four {
-                        debounce_interval = <50>;
+                        debounce-interval = <50>;
                         wakeup-source;
                         label = "DSW2-4";
                         linux,code = <KEY_4>;
diff --git a/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi b/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
index 25186ac4188d..1dbf3bbff8d3 100644
--- a/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
+++ b/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Samsung's Exynos SoC MFC (Video Codec) reserved memory common definition.
  *
  * Copyright (c) 2016 Samsung Electronics Co., Ltd
- *
- * 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.
  */
 
 / {
diff --git a/arch/arm/boot/dts/exynos-syscon-restart.dtsi b/arch/arm/boot/dts/exynos-syscon-restart.dtsi
index 09a2040054ed..4b3dd0549a54 100644
--- a/arch/arm/boot/dts/exynos-syscon-restart.dtsi
+++ b/arch/arm/boot/dts/exynos-syscon-restart.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Samsung's Exynos SoC syscon reboot/poweroff nodes common definition.
- *
- * 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.
  */
 
 / {
diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi
index 0aa577fe9f95..620b50c19ead 100644
--- a/arch/arm/boot/dts/exynos3250-artik5.dtsi
+++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi
@@ -245,6 +245,7 @@
                                 regulator-name = "VLDO23_1.8V";
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
                         };
 
                         ldo24_reg: LDO24 {
@@ -316,6 +317,41 @@
         status = "okay";
 };
 
+&mshc_1 {
+        cap-sd-highspeed;
+        cap-sdio-irq;
+        disable-wp;
+        non-removable;
+        keep-power-in-suspend;
+        fifo-depth = <0x40>;
+        vqmmc-supply = <&ldo11_reg>;
+        /*
+         * Voltage negotiation is broken for the SDIO periph so we
+         * can't actually set the voltage here.
+         * vmmc-supply = <&ldo23_reg>;
+         */
+        card-detect-delay = <500>;
+        clock-frequency = <100000000>;
+        max-frequency = <100000000>;
+        samsung,dw-mshc-ciu-div = <3>;
+        samsung,dw-mshc-sdr-timing = <0 1>;
+        samsung,dw-mshc-ddr-timing = <1 2>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&sd1_cmd &sd1_clk &sd1_bus1 &sd1_bus4 &wlanen>;
+        bus-width = <4>;
+        status = "okay";
+};
+
+&pinctrl_1 {
+        wlanen: wlanen {
+                samsung,pins = "gpx2-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV3>;
+                samsung,pin-val = <1>;
+        };
+};
+
 &rtc {
         clocks = <&cmu CLK_RTC>, <&s2mps14_osc S2MPS11_CLK_AP>;
         clock-names = "rtc", "rtc_src";
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index b8fb94f5daa8..0a5f989d963b 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -161,34 +161,39 @@
                         syscon = <&pmu_system_controller>;
                 };
 
-                pd_cam: cam-power-domain@10023c00 {
+                pd_cam: power-domain@10023c00 {
                         compatible = "samsung,exynos4210-pd";
                         reg = <0x10023C00 0x20>;
                         #power-domain-cells = <0>;
+                        label = "CAM";
                 };
 
-                pd_mfc: mfc-power-domain@10023c40 {
+                pd_mfc: power-domain@10023c40 {
                         compatible = "samsung,exynos4210-pd";
                         reg = <0x10023C40 0x20>;
                         #power-domain-cells = <0>;
+                        label = "MFC";
                 };
 
-                pd_g3d: g3d-power-domain@10023c60 {
+                pd_g3d: power-domain@10023c60 {
                         compatible = "samsung,exynos4210-pd";
                         reg = <0x10023C60 0x20>;
                         #power-domain-cells = <0>;
+                        label = "G3D";
                 };
 
-                pd_lcd0: lcd0-power-domain@10023c80 {
+                pd_lcd0: power-domain@10023c80 {
                         compatible = "samsung,exynos4210-pd";
                         reg = <0x10023C80 0x20>;
                         #power-domain-cells = <0>;
+                        label = "LCD0";
                 };
 
-                pd_isp: isp-power-domain@10023ca0 {
+                pd_isp: power-domain@10023ca0 {
                         compatible = "samsung,exynos4210-pd";
                         reg = <0x10023CA0 0x20>;
                         #power-domain-cells = <0>;
+                        label = "ISP";
                 };
 
                 cmu: clock-controller@10030000 {
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 6d59cc827649..909a9f2bf5be 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -52,961 +52,976 @@
                 serial3 = &serial_3;
         };
 
-        clock_audss: clock-controller@3810000 {
-                compatible = "samsung,exynos4210-audss-clock";
-                reg = <0x03810000 0x0C>;
-                #clock-cells = <1>;
-                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_FOUT_EPLL>,
-                         <&clock CLK_SCLK_AUDIO0>, <&clock CLK_SCLK_AUDIO0>;
-                clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in";
-        };
-
-        i2s0: i2s@3830000 {
-                compatible = "samsung,s5pv210-i2s";
-                reg = <0x03830000 0x100>;
-                clocks = <&clock_audss EXYNOS_I2S_BUS>,
-                         <&clock_audss EXYNOS_DOUT_AUD_BUS>,
-                         <&clock_audss EXYNOS_SCLK_I2S>;
-                clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
-                #clock-cells = <1>;
-                clock-output-names = "i2s_cdclk0";
-                dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;
-                dma-names = "tx", "rx", "tx-sec";
-                samsung,idma-addr = <0x03000000>;
-                #sound-dai-cells = <1>;
-                status = "disabled";
-        };
+        soc: soc {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
 
-        chipid@10000000 {
-                compatible = "samsung,exynos4210-chipid";
-                reg = <0x10000000 0x100>;
-        };
+                clock_audss: clock-controller@3810000 {
+                        compatible = "samsung,exynos4210-audss-clock";
+                        reg = <0x03810000 0x0C>;
+                        #clock-cells = <1>;
+                        clocks = <&clock CLK_FIN_PLL>, <&clock CLK_FOUT_EPLL>,
+                                 <&clock CLK_SCLK_AUDIO0>,
+                                 <&clock CLK_SCLK_AUDIO0>;
+                        clock-names = "pll_ref", "pll_in", "sclk_audio",
+                                      "sclk_pcm_in";
+                };
 
-        scu: snoop-control-unit@10500000 {
-                compatible = "arm,cortex-a9-scu";
-                reg = <0x10500000 0x2000>;
-        };
+                i2s0: i2s@3830000 {
+                        compatible = "samsung,s5pv210-i2s";
+                        reg = <0x03830000 0x100>;
+                        clocks = <&clock_audss EXYNOS_I2S_BUS>,
+                                 <&clock_audss EXYNOS_DOUT_AUD_BUS>,
+                                 <&clock_audss EXYNOS_SCLK_I2S>;
+                        clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
+                        #clock-cells = <1>;
+                        clock-output-names = "i2s_cdclk0";
+                        dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;
+                        dma-names = "tx", "rx", "tx-sec";
+                        samsung,idma-addr = <0x03000000>;
+                        #sound-dai-cells = <1>;
+                        status = "disabled";
+                };
 
-        memory-controller@12570000 {
-                compatible = "samsung,exynos4210-srom";
-                reg = <0x12570000 0x14>;
-        };
+                chipid@10000000 {
+                        compatible = "samsung,exynos4210-chipid";
+                        reg = <0x10000000 0x100>;
+                };
 
-        mipi_phy: video-phy {
-                compatible = "samsung,s5pv210-mipi-video-phy";
-                #phy-cells = <1>;
-                syscon = <&pmu_system_controller>;
-        };
+                scu: snoop-control-unit@10500000 {
+                        compatible = "arm,cortex-a9-scu";
+                        reg = <0x10500000 0x2000>;
+                };
 
-        pd_mfc: mfc-power-domain@10023c40 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023C40 0x20>;
-                #power-domain-cells = <0>;
-                label = "MFC";
-        };
+                memory-controller@12570000 {
+                        compatible = "samsung,exynos4210-srom";
+                        reg = <0x12570000 0x14>;
+                };
 
-        pd_g3d: g3d-power-domain@10023c60 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023C60 0x20>;
-                #power-domain-cells = <0>;
-                label = "G3D";
-        };
+                mipi_phy: video-phy {
+                        compatible = "samsung,s5pv210-mipi-video-phy";
+                        #phy-cells = <1>;
+                        syscon = <&pmu_system_controller>;
+                };
 
-        pd_lcd0: lcd0-power-domain@10023c80 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023C80 0x20>;
-                #power-domain-cells = <0>;
-                label = "LCD0";
-        };
+                pd_mfc: mfc-power-domain@10023c40 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023C40 0x20>;
+                        #power-domain-cells = <0>;
+                        label = "MFC";
+                };
 
-        pd_tv: tv-power-domain@10023c20 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023C20 0x20>;
-                #power-domain-cells = <0>;
-                power-domains = <&pd_lcd0>;
-                label = "TV";
-        };
+                pd_g3d: g3d-power-domain@10023c60 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023C60 0x20>;
+                        #power-domain-cells = <0>;
+                        label = "G3D";
+                };
 
-        pd_cam: cam-power-domain@10023c00 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023C00 0x20>;
-                #power-domain-cells = <0>;
-                label = "CAM";
-        };
+                pd_lcd0: lcd0-power-domain@10023c80 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023C80 0x20>;
+                        #power-domain-cells = <0>;
+                        label = "LCD0";
+                };
 
-        pd_gps: gps-power-domain@10023ce0 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023CE0 0x20>;
-                #power-domain-cells = <0>;
-                label = "GPS";
-        };
+                pd_tv: tv-power-domain@10023c20 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023C20 0x20>;
+                        #power-domain-cells = <0>;
+                        power-domains = <&pd_lcd0>;
+                        label = "TV";
+                };
 
-        pd_gps_alive: gps-alive-power-domain@10023d00 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023D00 0x20>;
-                #power-domain-cells = <0>;
-                label = "GPS alive";
-        };
+                pd_cam: cam-power-domain@10023c00 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023C00 0x20>;
+                        #power-domain-cells = <0>;
+                        label = "CAM";
+                };
 
-        gic: interrupt-controller@10490000 {
-                compatible = "arm,cortex-a9-gic";
-                #interrupt-cells = <3>;
-                interrupt-controller;
-                reg = <0x10490000 0x10000>, <0x10480000 0x10000>;
-        };
+                pd_gps: gps-power-domain@10023ce0 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023CE0 0x20>;
+                        #power-domain-cells = <0>;
+                        label = "GPS";
+                };
 
-        combiner: interrupt-controller@10440000 {
-                compatible = "samsung,exynos4210-combiner";
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                reg = <0x10440000 0x1000>;
-        };
+                pd_gps_alive: gps-alive-power-domain@10023d00 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023D00 0x20>;
+                        #power-domain-cells = <0>;
+                        label = "GPS alive";
+                };
 
-        pmu {
-                compatible = "arm,cortex-a9-pmu";
-                interrupt-parent = <&combiner>;
-                interrupts = <2 2>, <3 2>;
-        };
+                gic: interrupt-controller@10490000 {
+                        compatible = "arm,cortex-a9-gic";
+                        #interrupt-cells = <3>;
+                        interrupt-controller;
+                        reg = <0x10490000 0x10000>, <0x10480000 0x10000>;
+                };
 
-        sys_reg: syscon@10010000 {
-                compatible = "samsung,exynos4-sysreg", "syscon";
-                reg = <0x10010000 0x400>;
-        };
+                combiner: interrupt-controller@10440000 {
+                        compatible = "samsung,exynos4210-combiner";
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0x10440000 0x1000>;
+                };
 
-        pmu_system_controller: system-controller@10020000 {
-                compatible = "samsung,exynos4210-pmu", "syscon";
-                reg = <0x10020000 0x4000>;
-                interrupt-controller;
-                #interrupt-cells = <3>;
-                interrupt-parent = <&gic>;
-        };
+                pmu: pmu {
+                        compatible = "arm,cortex-a9-pmu";
+                        interrupt-parent = <&combiner>;
+                        interrupts = <2 2>, <3 2>;
+                };
 
-        dsi_0: dsi@11c80000 {
-                compatible = "samsung,exynos4210-mipi-dsi";
-                reg = <0x11C80000 0x10000>;
-                interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
-                power-domains = <&pd_lcd0>;
-                phys = <&mipi_phy 1>;
-                phy-names = "dsim";
-                clocks = <&clock CLK_DSIM0>, <&clock CLK_SCLK_MIPI0>;
-                clock-names = "bus_clk", "sclk_mipi";
-                status = "disabled";
-                #address-cells = <1>;
-                #size-cells = <0>;
-        };
+                sys_reg: syscon@10010000 {
+                        compatible = "samsung,exynos4-sysreg", "syscon";
+                        reg = <0x10010000 0x400>;
+                };
 
-        camera {
-                compatible = "samsung,fimc", "simple-bus";
-                status = "disabled";
-                #address-cells = <1>;
-                #size-cells = <1>;
-                #clock-cells = <1>;
-                clock-output-names = "cam_a_clkout", "cam_b_clkout";
-                ranges;
+                pmu_system_controller: system-controller@10020000 {
+                        compatible = "samsung,exynos4210-pmu", "syscon";
+                        reg = <0x10020000 0x4000>;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        interrupt-parent = <&gic>;
+                };
 
-                fimc_0: fimc@11800000 {
-                        compatible = "samsung,exynos4210-fimc";
-                        reg = <0x11800000 0x1000>;
-                        interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_FIMC0>, <&clock CLK_SCLK_FIMC0>;
-                        clock-names = "fimc", "sclk_fimc";
-                        power-domains = <&pd_cam>;
-                        samsung,sysreg = <&sys_reg>;
-                        iommus = <&sysmmu_fimc0>;
+                dsi_0: dsi@11c80000 {
+                        compatible = "samsung,exynos4210-mipi-dsi";
+                        reg = <0x11C80000 0x10000>;
+                        interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+                        power-domains = <&pd_lcd0>;
+                        phys = <&mipi_phy 1>;
+                        phy-names = "dsim";
+                        clocks = <&clock CLK_DSIM0>, <&clock CLK_SCLK_MIPI0>;
+                        clock-names = "bus_clk", "sclk_mipi";
                         status = "disabled";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
                 };
 
-                fimc_1: fimc@11810000 {
-                        compatible = "samsung,exynos4210-fimc";
-                        reg = <0x11810000 0x1000>;
-                        interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_FIMC1>, <&clock CLK_SCLK_FIMC1>;
-                        clock-names = "fimc", "sclk_fimc";
-                        power-domains = <&pd_cam>;
-                        samsung,sysreg = <&sys_reg>;
-                        iommus = <&sysmmu_fimc1>;
+                camera: camera {
+                        compatible = "samsung,fimc", "simple-bus";
                         status = "disabled";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        #clock-cells = <1>;
+                        clock-output-names = "cam_a_clkout", "cam_b_clkout";
+                        ranges;
+
+                        fimc_0: fimc@11800000 {
+                                compatible = "samsung,exynos4210-fimc";
+                                reg = <0x11800000 0x1000>;
+                                interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_FIMC0>,
+                                         <&clock CLK_SCLK_FIMC0>;
+                                clock-names = "fimc", "sclk_fimc";
+                                power-domains = <&pd_cam>;
+                                samsung,sysreg = <&sys_reg>;
+                                iommus = <&sysmmu_fimc0>;
+                                status = "disabled";
+                        };
+
+                        fimc_1: fimc@11810000 {
+                                compatible = "samsung,exynos4210-fimc";
+                                reg = <0x11810000 0x1000>;
+                                interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_FIMC1>,
+                                         <&clock CLK_SCLK_FIMC1>;
+                                clock-names = "fimc", "sclk_fimc";
+                                power-domains = <&pd_cam>;
+                                samsung,sysreg = <&sys_reg>;
+                                iommus = <&sysmmu_fimc1>;
+                                status = "disabled";
+                        };
+
+                        fimc_2: fimc@11820000 {
+                                compatible = "samsung,exynos4210-fimc";
+                                reg = <0x11820000 0x1000>;
+                                interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_FIMC2>,
+                                         <&clock CLK_SCLK_FIMC2>;
+                                clock-names = "fimc", "sclk_fimc";
+                                power-domains = <&pd_cam>;
+                                samsung,sysreg = <&sys_reg>;
+                                iommus = <&sysmmu_fimc2>;
+                                status = "disabled";
+                        };
+
+                        fimc_3: fimc@11830000 {
+                                compatible = "samsung,exynos4210-fimc";
+                                reg = <0x11830000 0x1000>;
+                                interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_FIMC3>,
+                                         <&clock CLK_SCLK_FIMC3>;
+                                clock-names = "fimc", "sclk_fimc";
+                                power-domains = <&pd_cam>;
+                                samsung,sysreg = <&sys_reg>;
+                                iommus = <&sysmmu_fimc3>;
+                                status = "disabled";
+                        };
+
+                        csis_0: csis@11880000 {
+                                compatible = "samsung,exynos4210-csis";
+                                reg = <0x11880000 0x4000>;
+                                interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_CSIS0>,
+                                         <&clock CLK_SCLK_CSIS0>;
+                                clock-names = "csis", "sclk_csis";
+                                bus-width = <4>;
+                                power-domains = <&pd_cam>;
+                                phys = <&mipi_phy 0>;
+                                phy-names = "csis";
+                                status = "disabled";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+
+                        csis_1: csis@11890000 {
+                                compatible = "samsung,exynos4210-csis";
+                                reg = <0x11890000 0x4000>;
+                                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_CSIS1>,
+                                         <&clock CLK_SCLK_CSIS1>;
+                                clock-names = "csis", "sclk_csis";
+                                bus-width = <2>;
+                                power-domains = <&pd_cam>;
+                                phys = <&mipi_phy 2>;
+                                phy-names = "csis";
+                                status = "disabled";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
                 };
 
-                fimc_2: fimc@11820000 {
-                        compatible = "samsung,exynos4210-fimc";
-                        reg = <0x11820000 0x1000>;
-                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_FIMC2>, <&clock CLK_SCLK_FIMC2>;
-                        clock-names = "fimc", "sclk_fimc";
-                        power-domains = <&pd_cam>;
-                        samsung,sysreg = <&sys_reg>;
-                        iommus = <&sysmmu_fimc2>;
+                rtc: rtc@10070000 {
+                        compatible = "samsung,s3c6410-rtc";
+                        reg = <0x10070000 0x100>;
+                        interrupt-parent = <&pmu_system_controller>;
+                        interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_RTC>;
+                        clock-names = "rtc";
                         status = "disabled";
                 };
 
-                fimc_3: fimc@11830000 {
-                        compatible = "samsung,exynos4210-fimc";
-                        reg = <0x11830000 0x1000>;
-                        interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_FIMC3>, <&clock CLK_SCLK_FIMC3>;
-                        clock-names = "fimc", "sclk_fimc";
-                        power-domains = <&pd_cam>;
-                        samsung,sysreg = <&sys_reg>;
-                        iommus = <&sysmmu_fimc3>;
+                keypad: keypad@100a0000 {
+                        compatible = "samsung,s5pv210-keypad";
+                        reg = <0x100A0000 0x100>;
+                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_KEYIF>;
+                        clock-names = "keypad";
                         status = "disabled";
                 };
 
-                csis_0: csis@11880000 {
-                        compatible = "samsung,exynos4210-csis";
-                        reg = <0x11880000 0x4000>;
-                        interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_CSIS0>, <&clock CLK_SCLK_CSIS0>;
-                        clock-names = "csis", "sclk_csis";
-                        bus-width = <4>;
-                        power-domains = <&pd_cam>;
-                        phys = <&mipi_phy 0>;
-                        phy-names = "csis";
+                sdhci_0: sdhci@12510000 {
+                        compatible = "samsung,exynos4210-sdhci";
+                        reg = <0x12510000 0x100>;
+                        interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_SDMMC0>, <&clock CLK_SCLK_MMC0>;
+                        clock-names = "hsmmc", "mmc_busclk.2";
                         status = "disabled";
-                        #address-cells = <1>;
-                        #size-cells = <0>;
                 };
 
-                csis_1: csis@11890000 {
-                        compatible = "samsung,exynos4210-csis";
-                        reg = <0x11890000 0x4000>;
-                        interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_CSIS1>, <&clock CLK_SCLK_CSIS1>;
-                        clock-names = "csis", "sclk_csis";
-                        bus-width = <2>;
-                        power-domains = <&pd_cam>;
-                        phys = <&mipi_phy 2>;
-                        phy-names = "csis";
+                sdhci_1: sdhci@12520000 {
+                        compatible = "samsung,exynos4210-sdhci";
+                        reg = <0x12520000 0x100>;
+                        interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_SDMMC1>, <&clock CLK_SCLK_MMC1>;
+                        clock-names = "hsmmc", "mmc_busclk.2";
                         status = "disabled";
-                        #address-cells = <1>;
-                        #size-cells = <0>;
                 };
-        };
-
-        rtc: rtc@10070000 {
-                compatible = "samsung,s3c6410-rtc";
-                reg = <0x10070000 0x100>;
-                interrupt-parent = <&pmu_system_controller>;
-                interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_RTC>;
-                clock-names = "rtc";
-                status = "disabled";
-        };
-
-        keypad: keypad@100a0000 {
-                compatible = "samsung,s5pv210-keypad";
-                reg = <0x100A0000 0x100>;
-                interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_KEYIF>;
-                clock-names = "keypad";
-                status = "disabled";
-        };
-
-        sdhci_0: sdhci@12510000 {
-                compatible = "samsung,exynos4210-sdhci";
-                reg = <0x12510000 0x100>;
-                interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_SDMMC0>, <&clock CLK_SCLK_MMC0>;
-                clock-names = "hsmmc", "mmc_busclk.2";
-                status = "disabled";
-        };
 
-        sdhci_1: sdhci@12520000 {
-                compatible = "samsung,exynos4210-sdhci";
-                reg = <0x12520000 0x100>;
-                interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_SDMMC1>, <&clock CLK_SCLK_MMC1>;
-                clock-names = "hsmmc", "mmc_busclk.2";
-                status = "disabled";
-        };
-
-        sdhci_2: sdhci@12530000 {
-                compatible = "samsung,exynos4210-sdhci";
-                reg = <0x12530000 0x100>;
-                interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_SDMMC2>, <&clock CLK_SCLK_MMC2>;
-                clock-names = "hsmmc", "mmc_busclk.2";
-                status = "disabled";
-        };
-
-        sdhci_3: sdhci@12540000 {
-                compatible = "samsung,exynos4210-sdhci";
-                reg = <0x12540000 0x100>;
-                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_SDMMC3>, <&clock CLK_SCLK_MMC3>;
-                clock-names = "hsmmc", "mmc_busclk.2";
-                status = "disabled";
-        };
-
-        exynos_usbphy: exynos-usbphy@125b0000 {
-                compatible = "samsung,exynos4210-usb2-phy";
-                reg = <0x125B0000 0x100>;
-                samsung,pmureg-phandle = <&pmu_system_controller>;
-                clocks = <&clock CLK_USB_DEVICE>, <&clock CLK_XUSBXTI>;
-                clock-names = "phy", "ref";
-                #phy-cells = <1>;
-                status = "disabled";
-        };
-
-        hsotg: hsotg@12480000 {
-                compatible = "samsung,s3c6400-hsotg";
-                reg = <0x12480000 0x20000>;
-                interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_USB_DEVICE>;
-                clock-names = "otg";
-                phys = <&exynos_usbphy 0>;
-                phy-names = "usb2-phy";
-                status = "disabled";
-        };
+                sdhci_2: sdhci@12530000 {
+                        compatible = "samsung,exynos4210-sdhci";
+                        reg = <0x12530000 0x100>;
+                        interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_SDMMC2>, <&clock CLK_SCLK_MMC2>;
+                        clock-names = "hsmmc", "mmc_busclk.2";
+                        status = "disabled";
+                };
 
-        ehci: ehci@12580000 {
-                compatible = "samsung,exynos4210-ehci";
-                reg = <0x12580000 0x100>;
-                interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_USB_HOST>;
-                clock-names = "usbhost";
-                status = "disabled";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                port@0 {
-                        reg = <0>;
-                        phys = <&exynos_usbphy 1>;
+                sdhci_3: sdhci@12540000 {
+                        compatible = "samsung,exynos4210-sdhci";
+                        reg = <0x12540000 0x100>;
+                        interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_SDMMC3>, <&clock CLK_SCLK_MMC3>;
+                        clock-names = "hsmmc", "mmc_busclk.2";
                         status = "disabled";
                 };
-                port@1 {
-                        reg = <1>;
-                        phys = <&exynos_usbphy 2>;
+
+                exynos_usbphy: exynos-usbphy@125b0000 {
+                        compatible = "samsung,exynos4210-usb2-phy";
+                        reg = <0x125B0000 0x100>;
+                        samsung,pmureg-phandle = <&pmu_system_controller>;
+                        clocks = <&clock CLK_USB_DEVICE>, <&clock CLK_XUSBXTI>;
+                        clock-names = "phy", "ref";
+                        #phy-cells = <1>;
                         status = "disabled";
                 };
-                port@2 {
-                        reg = <2>;
-                        phys = <&exynos_usbphy 3>;
+
+                hsotg: hsotg@12480000 {
+                        compatible = "samsung,s3c6400-hsotg";
+                        reg = <0x12480000 0x20000>;
+                        interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_USB_DEVICE>;
+                        clock-names = "otg";
+                        phys = <&exynos_usbphy 0>;
+                        phy-names = "usb2-phy";
                         status = "disabled";
                 };
-        };
 
-        ohci: ohci@12590000 {
-                compatible = "samsung,exynos4210-ohci";
-                reg = <0x12590000 0x100>;
-                interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_USB_HOST>;
-                clock-names = "usbhost";
-                status = "disabled";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                port@0 {
-                        reg = <0>;
-                        phys = <&exynos_usbphy 1>;
+                ehci: ehci@12580000 {
+                        compatible = "samsung,exynos4210-ehci";
+                        reg = <0x12580000 0x100>;
+                        interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_USB_HOST>;
+                        clock-names = "usbhost";
                         status = "disabled";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        port@0 {
+                                reg = <0>;
+                                phys = <&exynos_usbphy 1>;
+                                status = "disabled";
+                        };
+                        port@1 {
+                                reg = <1>;
+                                phys = <&exynos_usbphy 2>;
+                                status = "disabled";
+                        };
+                        port@2 {
+                                reg = <2>;
+                                phys = <&exynos_usbphy 3>;
+                                status = "disabled";
+                        };
                 };
-        };
 
-        i2s1: i2s@13960000 {
-                compatible = "samsung,s3c6410-i2s";
-                reg = <0x13960000 0x100>;
-                clocks = <&clock CLK_I2S1>;
-                clock-names = "iis";
-                #clock-cells = <1>;
-                clock-output-names = "i2s_cdclk1";
-                dmas = <&pdma1 12>, <&pdma1 11>;
-                dma-names = "tx", "rx";
-                #sound-dai-cells = <1>;
-                status = "disabled";
-        };
+                ohci: ohci@12590000 {
+                        compatible = "samsung,exynos4210-ohci";
+                        reg = <0x12590000 0x100>;
+                        interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_USB_HOST>;
+                        clock-names = "usbhost";
+                        status = "disabled";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        port@0 {
+                                reg = <0>;
+                                phys = <&exynos_usbphy 1>;
+                                status = "disabled";
+                        };
+                };
 
-        i2s2: i2s@13970000 {
-                compatible = "samsung,s3c6410-i2s";
-                reg = <0x13970000 0x100>;
-                clocks = <&clock CLK_I2S2>;
-                clock-names = "iis";
-                #clock-cells = <1>;
-                clock-output-names = "i2s_cdclk2";
-                dmas = <&pdma0 14>, <&pdma0 13>;
-                dma-names = "tx", "rx";
-                #sound-dai-cells = <1>;
-                status = "disabled";
-        };
+                i2s1: i2s@13960000 {
+                        compatible = "samsung,s3c6410-i2s";
+                        reg = <0x13960000 0x100>;
+                        clocks = <&clock CLK_I2S1>;
+                        clock-names = "iis";
+                        #clock-cells = <1>;
+                        clock-output-names = "i2s_cdclk1";
+                        dmas = <&pdma1 12>, <&pdma1 11>;
+                        dma-names = "tx", "rx";
+                        #sound-dai-cells = <1>;
+                        status = "disabled";
+                };
 
-        mfc: codec@13400000 {
-                compatible = "samsung,mfc-v5";
-                reg = <0x13400000 0x10000>;
-                interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
-                power-domains = <&pd_mfc>;
-                clocks = <&clock CLK_MFC>, <&clock CLK_SCLK_MFC>;
-                clock-names = "mfc", "sclk_mfc";
-                iommus = <&sysmmu_mfc_l>, <&sysmmu_mfc_r>;
-                iommu-names = "left", "right";
-        };
+                i2s2: i2s@13970000 {
+                        compatible = "samsung,s3c6410-i2s";
+                        reg = <0x13970000 0x100>;
+                        clocks = <&clock CLK_I2S2>;
+                        clock-names = "iis";
+                        #clock-cells = <1>;
+                        clock-output-names = "i2s_cdclk2";
+                        dmas = <&pdma0 14>, <&pdma0 13>;
+                        dma-names = "tx", "rx";
+                        #sound-dai-cells = <1>;
+                        status = "disabled";
+                };
 
-        serial_0: serial@13800000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0x13800000 0x100>;
-                interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
-                clock-names = "uart", "clk_uart_baud0";
-                dmas = <&pdma0 15>, <&pdma0 16>;
-                dma-names = "rx", "tx";
-                status = "disabled";
-        };
+                mfc: codec@13400000 {
+                        compatible = "samsung,mfc-v5";
+                        reg = <0x13400000 0x10000>;
+                        interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+                        power-domains = <&pd_mfc>;
+                        clocks = <&clock CLK_MFC>, <&clock CLK_SCLK_MFC>;
+                        clock-names = "mfc", "sclk_mfc";
+                        iommus = <&sysmmu_mfc_l>, <&sysmmu_mfc_r>;
+                        iommu-names = "left", "right";
+                };
 
-        serial_1: serial@13810000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0x13810000 0x100>;
-                interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
-                clock-names = "uart", "clk_uart_baud0";
-                dmas = <&pdma1 15>, <&pdma1 16>;
-                dma-names = "rx", "tx";
-                status = "disabled";
-        };
+                serial_0: serial@13800000 {
+                        compatible = "samsung,exynos4210-uart";
+                        reg = <0x13800000 0x100>;
+                        interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
+                        clock-names = "uart", "clk_uart_baud0";
+                        dmas = <&pdma0 15>, <&pdma0 16>;
+                        dma-names = "rx", "tx";
+                        status = "disabled";
+                };
 
-        serial_2: serial@13820000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0x13820000 0x100>;
-                interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
-                clock-names = "uart", "clk_uart_baud0";
-                dmas = <&pdma0 17>, <&pdma0 18>;
-                dma-names = "rx", "tx";
-                status = "disabled";
-        };
+                serial_1: serial@13810000 {
+                        compatible = "samsung,exynos4210-uart";
+                        reg = <0x13810000 0x100>;
+                        interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
+                        clock-names = "uart", "clk_uart_baud0";
+                        dmas = <&pdma1 15>, <&pdma1 16>;
+                        dma-names = "rx", "tx";
+                        status = "disabled";
+                };
 
-        serial_3: serial@13830000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0x13830000 0x100>;
-                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
-                clock-names = "uart", "clk_uart_baud0";
-                dmas = <&pdma1 17>, <&pdma1 18>;
-                dma-names = "rx", "tx";
-                status = "disabled";
-        };
+                serial_2: serial@13820000 {
+                        compatible = "samsung,exynos4210-uart";
+                        reg = <0x13820000 0x100>;
+                        interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
+                        clock-names = "uart", "clk_uart_baud0";
+                        dmas = <&pdma0 17>, <&pdma0 18>;
+                        dma-names = "rx", "tx";
+                        status = "disabled";
+                };
 
-        i2c_0: i2c@13860000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-i2c";
-                reg = <0x13860000 0x100>;
-                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C0>;
-                clock-names = "i2c";
-                pinctrl-names = "default";
-                pinctrl-0 = <&i2c0_bus>;
-                status = "disabled";
-        };
+                serial_3: serial@13830000 {
+                        compatible = "samsung,exynos4210-uart";
+                        reg = <0x13830000 0x100>;
+                        interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
+                        clock-names = "uart", "clk_uart_baud0";
+                        dmas = <&pdma1 17>, <&pdma1 18>;
+                        dma-names = "rx", "tx";
+                        status = "disabled";
+                };
 
-        i2c_1: i2c@13870000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-i2c";
-                reg = <0x13870000 0x100>;
-                interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C1>;
-                clock-names = "i2c";
-                pinctrl-names = "default";
-                pinctrl-0 = <&i2c1_bus>;
-                status = "disabled";
-        };
+                i2c_0: i2c@13860000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0x13860000 0x100>;
+                        interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C0>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c0_bus>;
+                        status = "disabled";
+                };
 
-        i2c_2: i2c@13880000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-i2c";
-                reg = <0x13880000 0x100>;
-                interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C2>;
-                clock-names = "i2c";
-                pinctrl-names = "default";
-                pinctrl-0 = <&i2c2_bus>;
-                status = "disabled";
-        };
+                i2c_1: i2c@13870000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0x13870000 0x100>;
+                        interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C1>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c1_bus>;
+                        status = "disabled";
+                };
 
-        i2c_3: i2c@13890000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-i2c";
-                reg = <0x13890000 0x100>;
-                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C3>;
-                clock-names = "i2c";
-                pinctrl-names = "default";
-                pinctrl-0 = <&i2c3_bus>;
-                status = "disabled";
-        };
+                i2c_2: i2c@13880000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0x13880000 0x100>;
+                        interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C2>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c2_bus>;
+                        status = "disabled";
+                };
 
-        i2c_4: i2c@138a0000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-i2c";
-                reg = <0x138A0000 0x100>;
-                interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C4>;
-                clock-names = "i2c";
-                pinctrl-names = "default";
-                pinctrl-0 = <&i2c4_bus>;
-                status = "disabled";
-        };
+                i2c_3: i2c@13890000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0x13890000 0x100>;
+                        interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C3>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c3_bus>;
+                        status = "disabled";
+                };
 
-        i2c_5: i2c@138b0000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-i2c";
-                reg = <0x138B0000 0x100>;
-                interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C5>;
-                clock-names = "i2c";
-                pinctrl-names = "default";
-                pinctrl-0 = <&i2c5_bus>;
-                status = "disabled";
-        };
+                i2c_4: i2c@138a0000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0x138A0000 0x100>;
+                        interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C4>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c4_bus>;
+                        status = "disabled";
+                };
 
-        i2c_6: i2c@138c0000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-i2c";
-                reg = <0x138C0000 0x100>;
-                interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C6>;
-                clock-names = "i2c";
-                pinctrl-names = "default";
-                pinctrl-0 = <&i2c6_bus>;
-                status = "disabled";
-        };
+                i2c_5: i2c@138b0000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0x138B0000 0x100>;
+                        interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C5>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c5_bus>;
+                        status = "disabled";
+                };
 
-        i2c_7: i2c@138d0000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-i2c";
-                reg = <0x138D0000 0x100>;
-                interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C7>;
-                clock-names = "i2c";
-                pinctrl-names = "default";
-                pinctrl-0 = <&i2c7_bus>;
-                status = "disabled";
-        };
+                i2c_6: i2c@138c0000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0x138C0000 0x100>;
+                        interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C6>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c6_bus>;
+                        status = "disabled";
+                };
 
-        i2c_8: i2c@138e0000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "samsung,s3c2440-hdmiphy-i2c";
-                reg = <0x138E0000 0x100>;
-                interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_I2C_HDMI>;
-                clock-names = "i2c";
-                status = "disabled";
-
-                hdmi_i2c_phy: hdmiphy@38 {
-                        compatible = "exynos4210-hdmiphy";
-                        reg = <0x38>;
+                i2c_7: i2c@138d0000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0x138D0000 0x100>;
+                        interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C7>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c7_bus>;
+                        status = "disabled";
                 };
-        };
 
-        spi_0: spi@13920000 {
-                compatible = "samsung,exynos4210-spi";
-                reg = <0x13920000 0x100>;
-                interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
-                dmas = <&pdma0 7>, <&pdma0 6>;
-                dma-names = "tx", "rx";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                clocks = <&clock CLK_SPI0>, <&clock CLK_SCLK_SPI0>;
-                clock-names = "spi", "spi_busclk0";
-                pinctrl-names = "default";
-                pinctrl-0 = <&spi0_bus>;
-                status = "disabled";
-        };
+                i2c_8: i2c@138e0000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "samsung,s3c2440-hdmiphy-i2c";
+                        reg = <0x138E0000 0x100>;
+                        interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_I2C_HDMI>;
+                        clock-names = "i2c";
+                        status = "disabled";
 
-        spi_1: spi@13930000 {
-                compatible = "samsung,exynos4210-spi";
-                reg = <0x13930000 0x100>;
-                interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
-                dmas = <&pdma1 7>, <&pdma1 6>;
-                dma-names = "tx", "rx";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                clocks = <&clock CLK_SPI1>, <&clock CLK_SCLK_SPI1>;
-                clock-names = "spi", "spi_busclk0";
-                pinctrl-names = "default";
-                pinctrl-0 = <&spi1_bus>;
-                status = "disabled";
-        };
+                        hdmi_i2c_phy: hdmiphy@38 {
+                                compatible = "exynos4210-hdmiphy";
+                                reg = <0x38>;
+                        };
+                };
 
-        spi_2: spi@13940000 {
-                compatible = "samsung,exynos4210-spi";
-                reg = <0x13940000 0x100>;
-                interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
-                dmas = <&pdma0 9>, <&pdma0 8>;
-                dma-names = "tx", "rx";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                clocks = <&clock CLK_SPI2>, <&clock CLK_SCLK_SPI2>;
-                clock-names = "spi", "spi_busclk0";
-                pinctrl-names = "default";
-                pinctrl-0 = <&spi2_bus>;
-                status = "disabled";
-        };
+                spi_0: spi@13920000 {
+                        compatible = "samsung,exynos4210-spi";
+                        reg = <0x13920000 0x100>;
+                        interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&pdma0 7>, <&pdma0 6>;
+                        dma-names = "tx", "rx";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&clock CLK_SPI0>, <&clock CLK_SCLK_SPI0>;
+                        clock-names = "spi", "spi_busclk0";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&spi0_bus>;
+                        status = "disabled";
+                };
 
-        pwm: pwm@139d0000 {
-                compatible = "samsung,exynos4210-pwm";
-                reg = <0x139D0000 0x1000>;
-                interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_PWM>;
-                clock-names = "timers";
-                #pwm-cells = <3>;
-                status = "disabled";
-        };
+                spi_1: spi@13930000 {
+                        compatible = "samsung,exynos4210-spi";
+                        reg = <0x13930000 0x100>;
+                        interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&pdma1 7>, <&pdma1 6>;
+                        dma-names = "tx", "rx";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&clock CLK_SPI1>, <&clock CLK_SCLK_SPI1>;
+                        clock-names = "spi", "spi_busclk0";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&spi1_bus>;
+                        status = "disabled";
+                };
 
-        amba {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                compatible = "simple-bus";
-                interrupt-parent = <&gic>;
-                ranges;
+                spi_2: spi@13940000 {
+                        compatible = "samsung,exynos4210-spi";
+                        reg = <0x13940000 0x100>;
+                        interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&pdma0 9>, <&pdma0 8>;
+                        dma-names = "tx", "rx";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&clock CLK_SPI2>, <&clock CLK_SCLK_SPI2>;
+                        clock-names = "spi", "spi_busclk0";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&spi2_bus>;
+                        status = "disabled";
+                };
 
-                pdma0: pdma@12680000 {
-                        compatible = "arm,pl330", "arm,primecell";
-                        reg = <0x12680000 0x1000>;
-                        interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_PDMA0>;
-                        clock-names = "apb_pclk";
-                        #dma-cells = <1>;
-                        #dma-channels = <8>;
-                        #dma-requests = <32>;
-                };
-
-                pdma1: pdma@12690000 {
-                        compatible = "arm,pl330", "arm,primecell";
-                        reg = <0x12690000 0x1000>;
-                        interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_PDMA1>;
-                        clock-names = "apb_pclk";
-                        #dma-cells = <1>;
-                        #dma-channels = <8>;
-                        #dma-requests = <32>;
-                };
-
-                mdma1: mdma@12850000 {
-                        compatible = "arm,pl330", "arm,primecell";
-                        reg = <0x12850000 0x1000>;
-                        interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clock CLK_MDMA>;
-                        clock-names = "apb_pclk";
-                        #dma-cells = <1>;
-                        #dma-channels = <8>;
-                        #dma-requests = <1>;
+                pwm: pwm@139d0000 {
+                        compatible = "samsung,exynos4210-pwm";
+                        reg = <0x139D0000 0x1000>;
+                        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_PWM>;
+                        clock-names = "timers";
+                        #pwm-cells = <3>;
+                        status = "disabled";
                 };
-        };
 
-        fimd: fimd@11c00000 {
-                compatible = "samsung,exynos4210-fimd";
-                interrupt-parent = <&combiner>;
-                reg = <0x11c00000 0x20000>;
-                interrupt-names = "fifo", "vsync", "lcd_sys";
-                interrupts = <11 0>, <11 1>, <11 2>;
-                clocks = <&clock CLK_SCLK_FIMD0>, <&clock CLK_FIMD0>;
-                clock-names = "sclk_fimd", "fimd";
-                power-domains = <&pd_lcd0>;
-                iommus = <&sysmmu_fimd0>;
-                samsung,sysreg = <&sys_reg>;
-                status = "disabled";
-        };
+                amba {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "simple-bus";
+                        interrupt-parent = <&gic>;
+                        ranges;
+
+                        pdma0: pdma@12680000 {
+                                compatible = "arm,pl330", "arm,primecell";
+                                reg = <0x12680000 0x1000>;
+                                interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_PDMA0>;
+                                clock-names = "apb_pclk";
+                                #dma-cells = <1>;
+                                #dma-channels = <8>;
+                                #dma-requests = <32>;
+                        };
+
+                        pdma1: pdma@12690000 {
+                                compatible = "arm,pl330", "arm,primecell";
+                                reg = <0x12690000 0x1000>;
+                                interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_PDMA1>;
+                                clock-names = "apb_pclk";
+                                #dma-cells = <1>;
+                                #dma-channels = <8>;
+                                #dma-requests = <32>;
+                        };
+
+                        mdma1: mdma@12850000 {
+                                compatible = "arm,pl330", "arm,primecell";
+                                reg = <0x12850000 0x1000>;
+                                interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clock CLK_MDMA>;
+                                clock-names = "apb_pclk";
+                                #dma-cells = <1>;
+                                #dma-channels = <8>;
+                                #dma-requests = <1>;
+                        };
+                };
 
-        tmu: tmu@100c0000 {
-                #include "exynos4412-tmu-sensor-conf.dtsi"
-        };
+                fimd: fimd@11c00000 {
+                        compatible = "samsung,exynos4210-fimd";
+                        interrupt-parent = <&combiner>;
+                        reg = <0x11c00000 0x20000>;
+                        interrupt-names = "fifo", "vsync", "lcd_sys";
+                        interrupts = <11 0>, <11 1>, <11 2>;
+                        clocks = <&clock CLK_SCLK_FIMD0>, <&clock CLK_FIMD0>;
+                        clock-names = "sclk_fimd", "fimd";
+                        power-domains = <&pd_lcd0>;
+                        iommus = <&sysmmu_fimd0>;
+                        samsung,sysreg = <&sys_reg>;
+                        status = "disabled";
+                };
 
-        jpeg_codec: jpeg-codec@11840000 {
-                compatible = "samsung,exynos4210-jpeg";
-                reg = <0x11840000 0x1000>;
-                interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_JPEG>;
-                clock-names = "jpeg";
-                power-domains = <&pd_cam>;
-                iommus = <&sysmmu_jpeg>;
-        };
+                tmu: tmu@100c0000 {
+                        interrupt-parent = <&combiner>;
+                        reg = <0x100C0000 0x100>;
+                        interrupts = <2 4>;
+                        status = "disabled";
+                        #include "exynos4412-tmu-sensor-conf.dtsi"
+                };
 
-        rotator: rotator@12810000 {
-                compatible = "samsung,exynos4210-rotator";
-                reg = <0x12810000 0x64>;
-                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_ROTATOR>;
-                clock-names = "rotator";
-                iommus = <&sysmmu_rotator>;
-        };
+                jpeg_codec: jpeg-codec@11840000 {
+                        compatible = "samsung,exynos4210-jpeg";
+                        reg = <0x11840000 0x1000>;
+                        interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_JPEG>;
+                        clock-names = "jpeg";
+                        power-domains = <&pd_cam>;
+                        iommus = <&sysmmu_jpeg>;
+                };
 
-        hdmi: hdmi@12d00000 {
-                compatible = "samsung,exynos4210-hdmi";
-                reg = <0x12D00000 0x70000>;
-                interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
-                clock-names = "hdmi", "sclk_hdmi", "sclk_pixel", "sclk_hdmiphy",
-                        "mout_hdmi";
-                clocks = <&clock CLK_HDMI>, <&clock CLK_SCLK_HDMI>,
-                        <&clock CLK_SCLK_PIXEL>, <&clock CLK_SCLK_HDMIPHY>,
-                        <&clock CLK_MOUT_HDMI>;
-                phy = <&hdmi_i2c_phy>;
-                power-domains = <&pd_tv>;
-                samsung,syscon-phandle = <&pmu_system_controller>;
-                #sound-dai-cells = <0>;
-                status = "disabled";
-        };
+                rotator: rotator@12810000 {
+                        compatible = "samsung,exynos4210-rotator";
+                        reg = <0x12810000 0x64>;
+                        interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_ROTATOR>;
+                        clock-names = "rotator";
+                        iommus = <&sysmmu_rotator>;
+                };
 
-        hdmicec: cec@100b0000 {
-                compatible = "samsung,s5p-cec";
-                reg = <0x100B0000 0x200>;
-                interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_HDMI_CEC>;
-                clock-names = "hdmicec";
-                samsung,syscon-phandle = <&pmu_system_controller>;
-                hdmi-phandle = <&hdmi>;
-                pinctrl-names = "default";
-                pinctrl-0 = <&hdmi_cec>;
-                status = "disabled";
-        };
+                hdmi: hdmi@12d00000 {
+                        compatible = "samsung,exynos4210-hdmi";
+                        reg = <0x12D00000 0x70000>;
+                        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+                        clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
+                                      "sclk_hdmiphy", "mout_hdmi";
+                        clocks = <&clock CLK_HDMI>, <&clock CLK_SCLK_HDMI>,
+                                 <&clock CLK_SCLK_PIXEL>,
+                                 <&clock CLK_SCLK_HDMIPHY>,
+                                 <&clock CLK_MOUT_HDMI>;
+                        phy = <&hdmi_i2c_phy>;
+                        power-domains = <&pd_tv>;
+                        samsung,syscon-phandle = <&pmu_system_controller>;
+                        #sound-dai-cells = <0>;
+                        status = "disabled";
+                };
 
-        mixer: mixer@12c10000 {
-                compatible = "samsung,exynos4210-mixer";
-                interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
-                reg = <0x12C10000 0x2100>, <0x12c00000 0x300>;
-                power-domains = <&pd_tv>;
-                iommus = <&sysmmu_tv>;
-                status = "disabled";
-        };
+                hdmicec: cec@100b0000 {
+                        compatible = "samsung,s5p-cec";
+                        reg = <0x100B0000 0x200>;
+                        interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_HDMI_CEC>;
+                        clock-names = "hdmicec";
+                        samsung,syscon-phandle = <&pmu_system_controller>;
+                        hdmi-phandle = <&hdmi>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&hdmi_cec>;
+                        status = "disabled";
+                };
 
-        ppmu_dmc0: ppmu_dmc0@106a0000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x106a0000 0x2000>;
-                clocks = <&clock CLK_PPMUDMC0>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                mixer: mixer@12c10000 {
+                        compatible = "samsung,exynos4210-mixer";
+                        interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+                        reg = <0x12C10000 0x2100>, <0x12c00000 0x300>;
+                        power-domains = <&pd_tv>;
+                        iommus = <&sysmmu_tv>;
+                        status = "disabled";
+                };
 
-        ppmu_dmc1: ppmu_dmc1@106b0000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x106b0000 0x2000>;
-                clocks = <&clock CLK_PPMUDMC1>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_dmc0: ppmu_dmc0@106a0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x106a0000 0x2000>;
+                        clocks = <&clock CLK_PPMUDMC0>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_cpu: ppmu_cpu@106c0000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x106c0000 0x2000>;
-                clocks = <&clock CLK_PPMUCPU>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_dmc1: ppmu_dmc1@106b0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x106b0000 0x2000>;
+                        clocks = <&clock CLK_PPMUDMC1>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_acp: ppmu_acp@10ae0000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x106e0000 0x2000>;
-                status = "disabled";
-        };
+                ppmu_cpu: ppmu_cpu@106c0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x106c0000 0x2000>;
+                        clocks = <&clock CLK_PPMUCPU>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_rightbus: ppmu_rightbus@112a0000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x112a0000 0x2000>;
-                clocks = <&clock CLK_PPMURIGHT>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_rightbus: ppmu_rightbus@112a0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x112a0000 0x2000>;
+                        clocks = <&clock CLK_PPMURIGHT>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_leftbus: ppmu_leftbus0@116a0000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x116a0000 0x2000>;
-                clocks = <&clock CLK_PPMULEFT>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_leftbus: ppmu_leftbus0@116a0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x116a0000 0x2000>;
+                        clocks = <&clock CLK_PPMULEFT>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_camif: ppmu_camif@11ac0000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x11ac0000 0x2000>;
-                clocks = <&clock CLK_PPMUCAMIF>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_camif: ppmu_camif@11ac0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x11ac0000 0x2000>;
+                        clocks = <&clock CLK_PPMUCAMIF>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_lcd0: ppmu_lcd0@11e40000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x11e40000 0x2000>;
-                clocks = <&clock CLK_PPMULCD0>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_lcd0: ppmu_lcd0@11e40000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x11e40000 0x2000>;
+                        clocks = <&clock CLK_PPMULCD0>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_fsys: ppmu_g3d@12630000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x12630000 0x2000>;
-                status = "disabled";
-        };
+                ppmu_fsys: ppmu_g3d@12630000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x12630000 0x2000>;
+                        status = "disabled";
+                };
 
-        ppmu_image: ppmu_image@12aa0000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x12aa0000 0x2000>;
-                clocks = <&clock CLK_PPMUIMAGE>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_image: ppmu_image@12aa0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x12aa0000 0x2000>;
+                        clocks = <&clock CLK_PPMUIMAGE>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_tv: ppmu_tv@12e40000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x12e40000 0x2000>;
-                clocks = <&clock CLK_PPMUTV>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_tv: ppmu_tv@12e40000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x12e40000 0x2000>;
+                        clocks = <&clock CLK_PPMUTV>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_g3d: ppmu_g3d@13220000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x13220000 0x2000>;
-                clocks = <&clock CLK_PPMUG3D>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_g3d: ppmu_g3d@13220000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x13220000 0x2000>;
+                        clocks = <&clock CLK_PPMUG3D>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_mfc_left: ppmu_mfc_left@13660000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x13660000 0x2000>;
-                clocks = <&clock CLK_PPMUMFC_L>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_mfc_left: ppmu_mfc_left@13660000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x13660000 0x2000>;
+                        clocks = <&clock CLK_PPMUMFC_L>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        ppmu_mfc_right: ppmu_mfc_right@13670000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x13670000 0x2000>;
-                clocks = <&clock CLK_PPMUMFC_R>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                ppmu_mfc_right: ppmu_mfc_right@13670000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x13670000 0x2000>;
+                        clocks = <&clock CLK_PPMUMFC_R>;
+                        clock-names = "ppmu";
+                        status = "disabled";
+                };
 
-        sysmmu_mfc_l: sysmmu@13620000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x13620000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <5 5>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_MFCL>, <&clock CLK_MFC>;
-                power-domains = <&pd_mfc>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_mfc_l: sysmmu@13620000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x13620000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <5 5>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_MFCL>, <&clock CLK_MFC>;
+                        power-domains = <&pd_mfc>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_mfc_r: sysmmu@13630000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x13630000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <5 6>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_MFCR>, <&clock CLK_MFC>;
-                power-domains = <&pd_mfc>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_mfc_r: sysmmu@13630000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x13630000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <5 6>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_MFCR>, <&clock CLK_MFC>;
+                        power-domains = <&pd_mfc>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_tv: sysmmu@12e20000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x12E20000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <5 4>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_TV>, <&clock CLK_MIXER>;
-                power-domains = <&pd_tv>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_tv: sysmmu@12e20000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x12E20000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <5 4>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_TV>, <&clock CLK_MIXER>;
+                        power-domains = <&pd_tv>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_fimc0: sysmmu@11a20000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x11A20000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <4 2>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_FIMC0>, <&clock CLK_FIMC0>;
-                power-domains = <&pd_cam>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_fimc0: sysmmu@11a20000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x11A20000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <4 2>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_FIMC0>, <&clock CLK_FIMC0>;
+                        power-domains = <&pd_cam>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_fimc1: sysmmu@11a30000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x11A30000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <4 3>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_FIMC1>, <&clock CLK_FIMC1>;
-                power-domains = <&pd_cam>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_fimc1: sysmmu@11a30000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x11A30000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <4 3>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_FIMC1>, <&clock CLK_FIMC1>;
+                        power-domains = <&pd_cam>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_fimc2: sysmmu@11a40000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x11A40000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <4 4>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_FIMC2>, <&clock CLK_FIMC2>;
-                power-domains = <&pd_cam>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_fimc2: sysmmu@11a40000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x11A40000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <4 4>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_FIMC2>, <&clock CLK_FIMC2>;
+                        power-domains = <&pd_cam>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_fimc3: sysmmu@11a50000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x11A50000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <4 5>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_FIMC3>, <&clock CLK_FIMC3>;
-                power-domains = <&pd_cam>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_fimc3: sysmmu@11a50000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x11A50000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <4 5>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_FIMC3>, <&clock CLK_FIMC3>;
+                        power-domains = <&pd_cam>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_jpeg: sysmmu@11a60000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x11A60000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <4 6>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_JPEG>, <&clock CLK_JPEG>;
-                power-domains = <&pd_cam>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_jpeg: sysmmu@11a60000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x11A60000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <4 6>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_JPEG>, <&clock CLK_JPEG>;
+                        power-domains = <&pd_cam>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_rotator: sysmmu@12a30000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x12A30000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <5 0>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_ROTATOR>, <&clock CLK_ROTATOR>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_rotator: sysmmu@12a30000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x12A30000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <5 0>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_ROTATOR>,
+                                 <&clock CLK_ROTATOR>;
+                        #iommu-cells = <0>;
+                };
 
-        sysmmu_fimd0: sysmmu@11e20000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x11E20000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <5 2>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_FIMD0>, <&clock CLK_FIMD0>;
-                power-domains = <&pd_lcd0>;
-                #iommu-cells = <0>;
-        };
+                sysmmu_fimd0: sysmmu@11e20000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x11E20000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <5 2>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_FIMD0>, <&clock CLK_FIMD0>;
+                        power-domains = <&pd_lcd0>;
+                        #iommu-cells = <0>;
+                };
 
-        sss: sss@10830000 {
-                compatible = "samsung,exynos4210-secss";
-                reg = <0x10830000 0x300>;
-                interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_SSS>;
-                clock-names = "secss";
-        };
+                sss: sss@10830000 {
+                        compatible = "samsung,exynos4210-secss";
+                        reg = <0x10830000 0x300>;
+                        interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_SSS>;
+                        clock-names = "secss";
+                };
 
-        prng: rng@10830400 {
-                compatible = "samsung,exynos4-rng";
-                reg = <0x10830400 0x200>;
-                clocks = <&clock CLK_SSS>;
-                clock-names = "secss";
+                prng: rng@10830400 {
+                        compatible = "samsung,exynos4-rng";
+                        reg = <0x10830400 0x200>;
+                        clocks = <&clock CLK_SSS>;
+                        clock-names = "secss";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index dbe6c052d8c1..520c5934a8d4 100644
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -13,853 +13,851 @@
 
 #include <dt-bindings/pinctrl/samsung.h>
 
-/ {
-        pinctrl@11400000 {
-                gpa0: gpa0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
+&pinctrl_0 {
+        gpa0: gpa0 {
+                gpio-controller;
+                #gpio-cells = <2>;
 
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpa1: gpa1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpb: gpb {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpc0: gpc0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpc1: gpc1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpd0: gpd0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpd1: gpd1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpe0: gpe0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpe1: gpe1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpe2: gpe2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpe3: gpe3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpe4: gpe4 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf0: gpf0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf1: gpf1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf2: gpf2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf3: gpf3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        uart0_data: uart0-data {
+                samsung,pins = "gpa0-0", "gpa0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart0_fctl: uart0-fctl {
+                samsung,pins = "gpa0-2", "gpa0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart1_data: uart1-data {
+                samsung,pins = "gpa0-4", "gpa0-5";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart1_fctl: uart1-fctl {
+                samsung,pins = "gpa0-6", "gpa0-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c2_bus: i2c2-bus {
+                samsung,pins = "gpa0-6", "gpa0-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart2_data: uart2-data {
+                samsung,pins = "gpa1-0", "gpa1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart2_fctl: uart2-fctl {
+                samsung,pins = "gpa1-2", "gpa1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart_audio_a: uart-audio-a {
+                samsung,pins = "gpa1-0", "gpa1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c3_bus: i2c3-bus {
+                samsung,pins = "gpa1-2", "gpa1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart3_data: uart3-data {
+                samsung,pins = "gpa1-4", "gpa1-5";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart_audio_b: uart-audio-b {
+                samsung,pins = "gpa1-4", "gpa1-5";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        spi0_bus: spi0-bus {
+                samsung,pins = "gpb-0", "gpb-2", "gpb-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c4_bus: i2c4-bus {
+                samsung,pins = "gpb-2", "gpb-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        spi1_bus: spi1-bus {
+                samsung,pins = "gpb-4", "gpb-6", "gpb-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c5_bus: i2c5-bus {
+                samsung,pins = "gpb-6", "gpb-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2s1_bus: i2s1-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pcm1_bus: pcm1-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        ac97_bus: ac97-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2s2_bus: i2s2-bus {
+                samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
+                                "gpc1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pcm2_bus: pcm2-bus {
+                samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
+                                "gpc1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        spdif_bus: spdif-bus {
+                samsung,pins = "gpc1-0", "gpc1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c6_bus: i2c6-bus {
+                samsung,pins = "gpc1-3", "gpc1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        spi2_bus: spi2-bus {
+                samsung,pins = "gpc1-1", "gpc1-2", "gpc1-3", "gpc1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_5>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c7_bus: i2c7-bus {
+                samsung,pins = "gpd0-2", "gpd0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c0_bus: i2c0-bus {
+                samsung,pins = "gpd1-0", "gpd1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c1_bus: i2c1-bus {
+                samsung,pins = "gpd1-2", "gpd1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pwm0_out: pwm0-out {
+                samsung,pins = "gpd0-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pwm1_out: pwm1-out {
+                samsung,pins = "gpd0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pwm2_out: pwm2-out {
+                samsung,pins = "gpd0-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pwm3_out: pwm3-out {
+                samsung,pins = "gpd0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_ctrl: lcd-ctrl {
+                samsung,pins = "gpd0-0", "gpd0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_sync: lcd-sync {
+                samsung,pins = "gpf0-0", "gpf0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_en: lcd-en {
+                samsung,pins = "gpe3-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_clk: lcd-clk {
+                samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_data16: lcd-data-width16 {
+                samsung,pins = "gpf0-7", "gpf1-0", "gpf1-1", "gpf1-2",
+                                "gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",
+                                "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",
+                                "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_data18: lcd-data-width18 {
+                samsung,pins = "gpf0-6", "gpf0-7", "gpf1-0", "gpf1-1",
+                                "gpf1-2", "gpf1-3", "gpf1-6", "gpf1-7",
+                                "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
+                                "gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",
+                                "gpf3-2", "gpf3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_data24: lcd-data-width24 {
+                samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",
+                                "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",
+                                "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",
+                                "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
+                                "gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
+                                "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+};
+
+&pinctrl_1 {
+        gpj0: gpj0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpj1: gpj1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpk0: gpk0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpk1: gpk1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpk2: gpk2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpk3: gpk3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpl0: gpl0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpl1: gpl1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpl2: gpl2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpy0: gpy0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy1: gpy1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy2: gpy2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
 
-                gpa1: gpa1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
+        gpy3: gpy3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy4: gpy4 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy5: gpy5 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy6: gpy6 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpx0: gpx0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                interrupt-parent = <&gic>;
+                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                #interrupt-cells = <2>;
+        };
+
+        gpx1: gpx1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                interrupt-parent = <&gic>;
+                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                #interrupt-cells = <2>;
+        };
+
+        gpx2: gpx2 {
+                gpio-controller;
+                #gpio-cells = <2>;
 
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpx3: gpx3 {
+                gpio-controller;
+                #gpio-cells = <2>;
 
-                gpb: gpb {
-                        gpio-controller;
-                        #gpio-cells = <2>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
 
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
+        sd0_clk: sd0-clk {
+                samsung,pins = "gpk0-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
 
-                gpc0: gpc0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
+        sd0_cmd: sd0-cmd {
+                samsung,pins = "gpk0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_cd: sd0-cd {
+                samsung,pins = "gpk0-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_bus1: sd0-bus-width1 {
+                samsung,pins = "gpk0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_bus4: sd0-bus-width4 {
+                samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_bus8: sd0-bus-width8 {
+                samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_clk: sd4-clk {
+                samsung,pins = "gpk0-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_cmd: sd4-cmd {
+                samsung,pins = "gpk0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_cd: sd4-cd {
+                samsung,pins = "gpk0-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_bus1: sd4-bus-width1 {
+                samsung,pins = "gpk0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_bus4: sd4-bus-width4 {
+                samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_bus8: sd4-bus-width8 {
+                samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_clk: sd1-clk {
+                samsung,pins = "gpk1-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_cmd: sd1-cmd {
+                samsung,pins = "gpk1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_cd: sd1-cd {
+                samsung,pins = "gpk1-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_bus1: sd1-bus-width1 {
+                samsung,pins = "gpk1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_bus4: sd1-bus-width4 {
+                samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_clk: sd2-clk {
+                samsung,pins = "gpk2-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_cmd: sd2-cmd {
+                samsung,pins = "gpk2-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_cd: sd2-cd {
+                samsung,pins = "gpk2-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_bus1: sd2-bus-width1 {
+                samsung,pins = "gpk2-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_bus4: sd2-bus-width4 {
+                samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_bus8: sd2-bus-width8 {
+                samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_clk: sd3-clk {
+                samsung,pins = "gpk3-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_cmd: sd3-cmd {
+                samsung,pins = "gpk3-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_cd: sd3-cd {
+                samsung,pins = "gpk3-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_bus1: sd3-bus-width1 {
+                samsung,pins = "gpk3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_bus4: sd3-bus-width4 {
+                samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        eint0: ext-int0 {
+                samsung,pins = "gpx0-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint8: ext-int8 {
+                samsung,pins = "gpx1-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint15: ext-int15 {
+                samsung,pins = "gpx1-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint16: ext-int16 {
+                samsung,pins = "gpx2-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint31: ext-int31 {
+                samsung,pins = "gpx3-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        cam_port_a_io: cam-port-a-io {
+                samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
+                                "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
+                                "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        cam_port_a_clk_active: cam-port-a-clk-active {
+                samsung,pins = "gpj1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        cam_port_a_clk_idle: cam-port-a-clk-idle {
+                samsung,pins = "gpj1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        hdmi_cec: hdmi-cec {
+                samsung,pins = "gpx3-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+};
+
+&pinctrl_2 {
+        gpz: gpz {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        i2s0_bus: i2s0-bus {
+                samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
+                                "gpz-4", "gpz-5", "gpz-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
 
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpc1: gpc1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpd0: gpd0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpd1: gpd1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpe0: gpe0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpe1: gpe1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpe2: gpe2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpe3: gpe3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpe4: gpe4 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpf0: gpf0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpf1: gpf1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpf2: gpf2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpf3: gpf3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                uart0_data: uart0-data {
-                        samsung,pins = "gpa0-0", "gpa0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart0_fctl: uart0-fctl {
-                        samsung,pins = "gpa0-2", "gpa0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart1_data: uart1-data {
-                        samsung,pins = "gpa0-4", "gpa0-5";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart1_fctl: uart1-fctl {
-                        samsung,pins = "gpa0-6", "gpa0-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c2_bus: i2c2-bus {
-                        samsung,pins = "gpa0-6", "gpa0-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart2_data: uart2-data {
-                        samsung,pins = "gpa1-0", "gpa1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart2_fctl: uart2-fctl {
-                        samsung,pins = "gpa1-2", "gpa1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart_audio_a: uart-audio-a {
-                        samsung,pins = "gpa1-0", "gpa1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c3_bus: i2c3-bus {
-                        samsung,pins = "gpa1-2", "gpa1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart3_data: uart3-data {
-                        samsung,pins = "gpa1-4", "gpa1-5";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart_audio_b: uart-audio-b {
-                        samsung,pins = "gpa1-4", "gpa1-5";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                spi0_bus: spi0-bus {
-                        samsung,pins = "gpb-0", "gpb-2", "gpb-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c4_bus: i2c4-bus {
-                        samsung,pins = "gpb-2", "gpb-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                spi1_bus: spi1-bus {
-                        samsung,pins = "gpb-4", "gpb-6", "gpb-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c5_bus: i2c5-bus {
-                        samsung,pins = "gpb-6", "gpb-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2s1_bus: i2s1-bus {
-                        samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
-                                        "gpc0-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pcm1_bus: pcm1-bus {
-                        samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
-                                        "gpc0-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                ac97_bus: ac97-bus {
-                        samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
-                                        "gpc0-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2s2_bus: i2s2-bus {
-                        samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
-                                        "gpc1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pcm2_bus: pcm2-bus {
-                        samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
-                                        "gpc1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                spdif_bus: spdif-bus {
-                        samsung,pins = "gpc1-0", "gpc1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c6_bus: i2c6-bus {
-                        samsung,pins = "gpc1-3", "gpc1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                spi2_bus: spi2-bus {
-                        samsung,pins = "gpc1-1", "gpc1-2", "gpc1-3", "gpc1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_5>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c7_bus: i2c7-bus {
-                        samsung,pins = "gpd0-2", "gpd0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c0_bus: i2c0-bus {
-                        samsung,pins = "gpd1-0", "gpd1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c1_bus: i2c1-bus {
-                        samsung,pins = "gpd1-2", "gpd1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pwm0_out: pwm0-out {
-                        samsung,pins = "gpd0-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pwm1_out: pwm1-out {
-                        samsung,pins = "gpd0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pwm2_out: pwm2-out {
-                        samsung,pins = "gpd0-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pwm3_out: pwm3-out {
-                        samsung,pins = "gpd0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_ctrl: lcd-ctrl {
-                        samsung,pins = "gpd0-0", "gpd0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_sync: lcd-sync {
-                        samsung,pins = "gpf0-0", "gpf0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_en: lcd-en {
-                        samsung,pins = "gpe3-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_clk: lcd-clk {
-                        samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_data16: lcd-data-width16 {
-                        samsung,pins = "gpf0-7", "gpf1-0", "gpf1-1", "gpf1-2",
-                                        "gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",
-                                        "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",
-                                        "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_data18: lcd-data-width18 {
-                        samsung,pins = "gpf0-6", "gpf0-7", "gpf1-0", "gpf1-1",
-                                        "gpf1-2", "gpf1-3", "gpf1-6", "gpf1-7",
-                                        "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
-                                        "gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",
-                                        "gpf3-2", "gpf3-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_data24: lcd-data-width24 {
-                        samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",
-                                        "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",
-                                        "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",
-                                        "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
-                                        "gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
-                                        "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-        };
-
-        pinctrl@11000000 {
-                gpj0: gpj0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpj1: gpj1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpk0: gpk0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpk1: gpk1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpk2: gpk2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpk3: gpk3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpl0: gpl0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpl1: gpl1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpl2: gpl2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpy0: gpy0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy1: gpy1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy2: gpy2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy3: gpy3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy4: gpy4 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy5: gpy5 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy6: gpy6 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpx0: gpx0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        interrupt-parent = <&gic>;
-                        interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-                        #interrupt-cells = <2>;
-                };
-
-                gpx1: gpx1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        interrupt-parent = <&gic>;
-                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                        #interrupt-cells = <2>;
-                };
-
-                gpx2: gpx2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpx3: gpx3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                sd0_clk: sd0-clk {
-                        samsung,pins = "gpk0-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_cmd: sd0-cmd {
-                        samsung,pins = "gpk0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_cd: sd0-cd {
-                        samsung,pins = "gpk0-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_bus1: sd0-bus-width1 {
-                        samsung,pins = "gpk0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_bus4: sd0-bus-width4 {
-                        samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_bus8: sd0-bus-width8 {
-                        samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_clk: sd4-clk {
-                        samsung,pins = "gpk0-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_cmd: sd4-cmd {
-                        samsung,pins = "gpk0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_cd: sd4-cd {
-                        samsung,pins = "gpk0-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_bus1: sd4-bus-width1 {
-                        samsung,pins = "gpk0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_bus4: sd4-bus-width4 {
-                        samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_bus8: sd4-bus-width8 {
-                        samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_clk: sd1-clk {
-                        samsung,pins = "gpk1-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_cmd: sd1-cmd {
-                        samsung,pins = "gpk1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_cd: sd1-cd {
-                        samsung,pins = "gpk1-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_bus1: sd1-bus-width1 {
-                        samsung,pins = "gpk1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_bus4: sd1-bus-width4 {
-                        samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_clk: sd2-clk {
-                        samsung,pins = "gpk2-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_cmd: sd2-cmd {
-                        samsung,pins = "gpk2-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_cd: sd2-cd {
-                        samsung,pins = "gpk2-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_bus1: sd2-bus-width1 {
-                        samsung,pins = "gpk2-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_bus4: sd2-bus-width4 {
-                        samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_bus8: sd2-bus-width8 {
-                        samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_clk: sd3-clk {
-                        samsung,pins = "gpk3-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_cmd: sd3-cmd {
-                        samsung,pins = "gpk3-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_cd: sd3-cd {
-                        samsung,pins = "gpk3-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_bus1: sd3-bus-width1 {
-                        samsung,pins = "gpk3-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_bus4: sd3-bus-width4 {
-                        samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                eint0: ext-int0 {
-                        samsung,pins = "gpx0-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint8: ext-int8 {
-                        samsung,pins = "gpx1-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint15: ext-int15 {
-                        samsung,pins = "gpx1-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint16: ext-int16 {
-                        samsung,pins = "gpx2-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint31: ext-int31 {
-                        samsung,pins = "gpx3-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                cam_port_a_io: cam-port-a-io {
-                        samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
-                                        "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
-                                        "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                cam_port_a_clk_active: cam-port-a-clk-active {
-                        samsung,pins = "gpj1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                cam_port_a_clk_idle: cam-port-a-clk-idle {
-                        samsung,pins = "gpj1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                hdmi_cec: hdmi-cec {
-                        samsung,pins = "gpx3-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-        };
-
-        pinctrl@3860000 {
-                gpz: gpz {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                i2s0_bus: i2s0-bus {
-                        samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
-                                        "gpz-4", "gpz-5", "gpz-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pcm0_bus: pcm0-bus {
-                        samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
-                                        "gpz-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
+        pcm0_bus: pcm0-bus {
+                samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
+                                "gpz-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
         };
 };
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index aaade17b140e..eaeeb4f6b84a 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -148,43 +148,12 @@
                 };
         };
 
-        camera {
-                pinctrl-names = "default";
-                pinctrl-0 = <>;
-                status = "okay";
-
-                fimc_0: fimc@11800000 {
-                        status = "okay";
-                        assigned-clocks = <&clock CLK_MOUT_FIMC0>,
-                                        <&clock CLK_SCLK_FIMC0>;
-                        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
-                        assigned-clock-rates = <0>, <160000000>;
-                };
-
-                fimc_1: fimc@11810000 {
-                        status = "okay";
-                        assigned-clocks = <&clock CLK_MOUT_FIMC1>,
-                                        <&clock CLK_SCLK_FIMC1>;
-                        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
-                        assigned-clock-rates = <0>, <160000000>;
-                };
-
-                fimc_2: fimc@11820000 {
-                        status = "okay";
-                        assigned-clocks = <&clock CLK_MOUT_FIMC2>,
-                                        <&clock CLK_SCLK_FIMC2>;
-                        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
-                        assigned-clock-rates = <0>, <160000000>;
-                };
+};
 
-                fimc_3: fimc@11830000 {
-                        status = "okay";
-                        assigned-clocks = <&clock CLK_MOUT_FIMC3>,
-                                        <&clock CLK_SCLK_FIMC3>;
-                        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
-                        assigned-clock-rates = <0>, <160000000>;
-                };
-        };
+&camera {
+        pinctrl-names = "default";
+        pinctrl-0 = <>;
+        status = "okay";
 };
 
 &cpu0 {
@@ -234,6 +203,38 @@
         vbus-supply = <&safe1_sreg>;
 };
 
+&fimc_0 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC0>,
+                          <&clock CLK_SCLK_FIMC0>;
+        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+        assigned-clock-rates = <0>, <160000000>;
+};
+
+&fimc_1 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC1>,
+                          <&clock CLK_SCLK_FIMC1>;
+        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+        assigned-clock-rates = <0>, <160000000>;
+};
+
+&fimc_2 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC2>,
+                          <&clock CLK_SCLK_FIMC2>;
+        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+                assigned-clock-rates = <0>, <160000000>;
+};
+
+&fimc_3 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC3>,
+                          <&clock CLK_SCLK_FIMC3>;
+        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+        assigned-clock-rates = <0>, <160000000>;
+};
+
 &fimd {
         status = "okay";
 };
@@ -275,6 +276,7 @@
 
         max8997_pmic@66 {
                 compatible = "maxim,max8997-pmic";
+                interrupts-extended = <&gpx0 7 0>, <&gpx2 3 0>;
 
                 reg = <0x66>;
                 interrupt-parent = <&gpx0>;
diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index 21fff7cd3aa4..4e6ff97e1ec4 100644
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -28,24 +28,6 @@
                 stdout-path = &serial_2;
         };
 
-        sysram@2020000 {
-                smp-sysram@0 {
-                        status = "disabled";
-                };
-
-                smp-sysram@5000 {
-                        compatible = "samsung,exynos4210-sysram";
-                        reg = <0x5000 0x1000>;
-                };
-
-                smp-sysram@1f000 {
-                        status = "disabled";
-                };
-        };
-
-        mct@10050000 {
-                compatible = "none";
-        };
 
         fixed-rate-clocks {
                 xxti {
@@ -173,45 +155,6 @@
                 };
         };
 
-        camera {
-                status = "okay";
-
-                pinctrl-names = "default";
-                pinctrl-0 = <>;
-
-                fimc_0: fimc@11800000 {
-                        status = "okay";
-                        assigned-clocks = <&clock CLK_MOUT_FIMC0>,
-                                        <&clock CLK_SCLK_FIMC0>;
-                        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
-                        assigned-clock-rates = <0>, <160000000>;
-                };
-
-                fimc_1: fimc@11810000 {
-                        status = "okay";
-                        assigned-clocks = <&clock CLK_MOUT_FIMC1>,
-                                        <&clock CLK_SCLK_FIMC1>;
-                        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
-                        assigned-clock-rates = <0>, <160000000>;
-                };
-
-                fimc_2: fimc@11820000 {
-                        status = "okay";
-                        assigned-clocks = <&clock CLK_MOUT_FIMC2>,
-                                        <&clock CLK_SCLK_FIMC2>;
-                        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
-                        assigned-clock-rates = <0>, <160000000>;
-                };
-
-                fimc_3: fimc@11830000 {
-                        status = "okay";
-                        assigned-clocks = <&clock CLK_MOUT_FIMC3>,
-                                        <&clock CLK_SCLK_FIMC3>;
-                        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
-                        assigned-clock-rates = <0>, <160000000>;
-                };
-        };
-
         hdmi_en: voltage-regulator-hdmi-5v {
                 compatible = "regulator-fixed";
                 regulator-name = "HDMI_5V";
@@ -234,6 +177,13 @@
         };
 };
 
+&camera {
+        status = "okay";
+
+        pinctrl-names = "default";
+        pinctrl-0 = <>;
+};
+
 &cpu0 {
         cpu0-supply = <&vdd_arm_reg>;
 };
@@ -250,6 +200,38 @@
         vbus-supply = <&safeout1_reg>;
 };
 
+&fimc_0 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC0>,
+                          <&clock CLK_SCLK_FIMC0>;
+        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+        assigned-clock-rates = <0>, <160000000>;
+};
+
+&fimc_1 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC1>,
+                          <&clock CLK_SCLK_FIMC1>;
+        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+        assigned-clock-rates = <0>, <160000000>;
+};
+
+&fimc_2 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC2>,
+                          <&clock CLK_SCLK_FIMC2>;
+        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+        assigned-clock-rates = <0>, <160000000>;
+};
+
+&fimc_3 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC3>,
+                          <&clock CLK_SCLK_FIMC3>;
+        assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
+        assigned-clock-rates = <0>, <160000000>;
+};
+
 &fimd {
         pinctrl-0 = <&lcd_clk>, <&lcd_data24>;
         pinctrl-names = "default";
@@ -501,6 +483,10 @@
         status = "okay";
 };
 
+&mct {
+        compatible = "none";
+};
+
 &mdma1 {
         reg = <0x12840000 0x1000>;
 };
@@ -579,3 +565,18 @@
         /delete-property/dmas;
         /delete-property/dma-names;
 };
+
+&sysram {
+        smp-sysram@0 {
+                status = "disabled";
+        };
+
+        smp-sysram@5000 {
+                compatible = "samsung,exynos4210-sysram";
+                reg = <0x5000 0x1000>;
+        };
+
+        smp-sysram@1f000 {
+                status = "disabled";
+        };
+};
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index cc978cf28267..88fb47cef9a8 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -17,7 +17,6 @@
  */
 
 #include "exynos4.dtsi"
-#include "exynos4210-pinctrl.dtsi"
 #include "exynos4-cpu-thermal.dtsi"
 
 / {
@@ -49,8 +48,6 @@
                                 400000  975000
                                 200000  950000
                         >;
-                        cooling-min-level = <4>;
-                        cooling-max-level = <2>;
                         #cooling-cells = <2>; /* min followed by max */
                 };
 
@@ -61,365 +58,323 @@
                 };
         };
 
-        sysram: sysram@2020000 {
-                compatible = "mmio-sram";
-                reg = <0x02020000 0x20000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges = <0 0x02020000 0x20000>;
+        soc: soc {
+                sysram: sysram@2020000 {
+                        compatible = "mmio-sram";
+                        reg = <0x02020000 0x20000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0x02020000 0x20000>;
 
-                smp-sysram@0 {
-                        compatible = "samsung,exynos4210-sysram";
-                        reg = <0x0 0x1000>;
-                };
+                        smp-sysram@0 {
+                                compatible = "samsung,exynos4210-sysram";
+                                reg = <0x0 0x1000>;
+                        };
 
-                smp-sysram@1f000 {
-                        compatible = "samsung,exynos4210-sysram-ns";
-                        reg = <0x1f000 0x1000>;
+                        smp-sysram@1f000 {
+                                compatible = "samsung,exynos4210-sysram-ns";
+                                reg = <0x1f000 0x1000>;
+                        };
                 };
-        };
 
-        pd_lcd1: lcd1-power-domain@10023ca0 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023CA0 0x20>;
-                #power-domain-cells = <0>;
-                label = "LCD1";
-        };
+                pd_lcd1: lcd1-power-domain@10023ca0 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023CA0 0x20>;
+                        #power-domain-cells = <0>;
+                        label = "LCD1";
+                };
 
-        l2c: l2-cache-controller@10502000 {
-                compatible = "arm,pl310-cache";
-                reg = <0x10502000 0x1000>;
-                cache-unified;
-                cache-level = <2>;
-                arm,tag-latency = <2 2 1>;
-                arm,data-latency = <2 2 1>;
-        };
+                l2c: l2-cache-controller@10502000 {
+                        compatible = "arm,pl310-cache";
+                        reg = <0x10502000 0x1000>;
+                        cache-unified;
+                        cache-level = <2>;
+                        arm,tag-latency = <2 2 1>;
+                        arm,data-latency = <2 2 1>;
+                };
 
-        mct: mct@10050000 {
-                compatible = "samsung,exynos4210-mct";
-                reg = <0x10050000 0x800>;
-                interrupt-parent = <&mct_map>;
-                interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
-                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
-                clock-names = "fin_pll", "mct";
-
-                mct_map: mct-map {
-                        #interrupt-cells = <1>;
-                        #address-cells = <0>;
-                        #size-cells = <0>;
-                        interrupt-map = <0 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>,
+                mct: mct@10050000 {
+                        compatible = "samsung,exynos4210-mct";
+                        reg = <0x10050000 0x800>;
+                        interrupt-parent = <&mct_map>;
+                        interrupts = <0>, <1>, <2>, <3>, <4>, <5>;
+                        clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
+                        clock-names = "fin_pll", "mct";
+
+                        mct_map: mct-map {
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map =
+                                        <0 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>,
                                         <1 &gic 0 69 IRQ_TYPE_LEVEL_HIGH>,
                                         <2 &combiner 12 6>,
                                         <3 &combiner 12 7>,
                                         <4 &gic 0 42 IRQ_TYPE_LEVEL_HIGH>,
                                         <5 &gic 0 48 IRQ_TYPE_LEVEL_HIGH>;
+                        };
                 };
-        };
 
-        watchdog: watchdog@10060000 {
-                compatible = "samsung,s3c6410-wdt";
-                reg = <0x10060000 0x100>;
-                interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_WDT>;
-                clock-names = "watchdog";
-        };
-
-        clock: clock-controller@10030000 {
-                compatible = "samsung,exynos4210-clock";
-                reg = <0x10030000 0x20000>;
-                #clock-cells = <1>;
-        };
-
-        pinctrl_0: pinctrl@11400000 {
-                compatible = "samsung,exynos4210-pinctrl";
-                reg = <0x11400000 0x1000>;
-                interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
-        };
-
-        pinctrl_1: pinctrl@11000000 {
-                compatible = "samsung,exynos4210-pinctrl";
-                reg = <0x11000000 0x1000>;
-                interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
-
-                wakup_eint: wakeup-interrupt-controller {
-                        compatible = "samsung,exynos4210-wakeup-eint";
-                        interrupt-parent = <&gic>;
-                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+                watchdog: watchdog@10060000 {
+                        compatible = "samsung,s3c6410-wdt";
+                        reg = <0x10060000 0x100>;
+                        interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_WDT>;
+                        clock-names = "watchdog";
                 };
-        };
 
-        pinctrl_2: pinctrl@3860000 {
-                compatible = "samsung,exynos4210-pinctrl";
-                reg = <0x03860000 0x1000>;
-        };
+                clock: clock-controller@10030000 {
+                        compatible = "samsung,exynos4210-clock";
+                        reg = <0x10030000 0x20000>;
+                        #clock-cells = <1>;
+                };
 
-        tmu: tmu@100c0000 {
-                compatible = "samsung,exynos4210-tmu";
-                interrupt-parent = <&combiner>;
-                reg = <0x100C0000 0x100>;
-                interrupts = <2 4>;
-                clocks = <&clock CLK_TMU_APBIF>;
-                clock-names = "tmu_apbif";
-                samsung,tmu_gain = <15>;
-                samsung,tmu_reference_voltage = <7>;
-                status = "disabled";
-        };
+                pinctrl_0: pinctrl@11400000 {
+                        compatible = "samsung,exynos4210-pinctrl";
+                        reg = <0x11400000 0x1000>;
+                        interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
+                };
 
-        thermal-zones {
-                cpu_thermal: cpu-thermal {
-                        polling-delay-passive = <0>;
-                        polling-delay = <0>;
-                        thermal-sensors = <&tmu 0>;
+                pinctrl_1: pinctrl@11000000 {
+                        compatible = "samsung,exynos4210-pinctrl";
+                        reg = <0x11000000 0x1000>;
+                        interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
 
-                        trips {
-                              cpu_alert0: cpu-alert-0 {
-                                      temperature = <85000>; /* millicelsius */
-                              };
-                              cpu_alert1: cpu-alert-1 {
-                                      temperature = <100000>; /* millicelsius */
-                              };
-                              cpu_alert2: cpu-alert-2 {
-                                      temperature = <110000>; /* millicelsius */
-                              };
+                        wakup_eint: wakeup-interrupt-controller {
+                                compatible = "samsung,exynos4210-wakeup-eint";
+                                interrupt-parent = <&gic>;
+                                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
                         };
                 };
-        };
-
-        g2d: g2d@12800000 {
-                compatible = "samsung,s5pv210-g2d";
-                reg = <0x12800000 0x1000>;
-                interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
-                clock-names = "sclk_fimg2d", "fimg2d";
-                power-domains = <&pd_lcd0>;
-                iommus = <&sysmmu_g2d>;
-        };
 
-        camera {
-                clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
-                         <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
-                clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
+                pinctrl_2: pinctrl@3860000 {
+                        compatible = "samsung,exynos4210-pinctrl";
+                        reg = <0x03860000 0x1000>;
+                };
 
-                fimc_0: fimc@11800000 {
-                        samsung,pix-limits = <4224 8192 1920 4224>;
-                        samsung,mainscaler-ext;
-                        samsung,cam-if;
+                g2d: g2d@12800000 {
+                        compatible = "samsung,s5pv210-g2d";
+                        reg = <0x12800000 0x1000>;
+                        interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
+                        clock-names = "sclk_fimg2d", "fimg2d";
+                        power-domains = <&pd_lcd0>;
+                        iommus = <&sysmmu_g2d>;
                 };
 
-                fimc_1: fimc@11810000 {
-                        samsung,pix-limits = <4224 8192 1920 4224>;
-                        samsung,mainscaler-ext;
-                        samsung,cam-if;
+                ppmu_acp: ppmu_acp@10ae0000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x10ae0000 0x2000>;
+                        status = "disabled";
                 };
 
-                fimc_2: fimc@11820000 {
-                        samsung,pix-limits = <4224 8192 1920 4224>;
-                        samsung,mainscaler-ext;
-                        samsung,lcd-wb;
+                ppmu_lcd1: ppmu_lcd1@12240000 {
+                        compatible = "samsung,exynos-ppmu";
+                        reg = <0x12240000 0x2000>;
+                        clocks = <&clock CLK_PPMULCD1>;
+                        clock-names = "ppmu";
+                        status = "disabled";
                 };
 
-                fimc_3: fimc@11830000 {
-                        samsung,pix-limits = <1920 8192 1366 1920>;
-                        samsung,rotators = <0>;
-                        samsung,mainscaler-ext;
-                        samsung,lcd-wb;
+                sysmmu_g2d: sysmmu@12a20000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x12A20000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <4 7>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_G2D>, <&clock CLK_G2D>;
+                        power-domains = <&pd_lcd0>;
+                        #iommu-cells = <0>;
                 };
-        };
 
-        mixer: mixer@12c10000 {
-                clock-names = "mixer", "hdmi", "sclk_hdmi", "vp", "mout_mixer",
-                        "sclk_mixer";
-                clocks = <&clock CLK_MIXER>, <&clock CLK_HDMI>,
-                        <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>,
-                        <&clock CLK_MOUT_MIXER>, <&clock CLK_SCLK_MIXER>;
-        };
+                sysmmu_fimd1: sysmmu@12220000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        interrupt-parent = <&combiner>;
+                        reg = <0x12220000 0x1000>;
+                        interrupts = <5 3>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_FIMD1>, <&clock CLK_FIMD1>;
+                        power-domains = <&pd_lcd1>;
+                        #iommu-cells = <0>;
+                };
 
-        ppmu_lcd1: ppmu_lcd1@12240000 {
-                compatible = "samsung,exynos-ppmu";
-                reg = <0x12240000 0x2000>;
-                clocks = <&clock CLK_PPMULCD1>;
-                clock-names = "ppmu";
-                status = "disabled";
-        };
+                bus_dmc: bus_dmc {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_DMC>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_dmc_opp_table>;
+                        status = "disabled";
+                };
 
-        sysmmu_g2d: sysmmu@12a20000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x12A20000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <4 7>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_G2D>, <&clock CLK_G2D>;
-                power-domains = <&pd_lcd0>;
-                #iommu-cells = <0>;
-        };
+                bus_acp: bus_acp {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_ACP>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_acp_opp_table>;
+                        status = "disabled";
+                };
 
-        sysmmu_fimd1: sysmmu@12220000 {
-                compatible = "samsung,exynos-sysmmu";
-                interrupt-parent = <&combiner>;
-                reg = <0x12220000 0x1000>;
-                interrupts = <5 3>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_FIMD1>, <&clock CLK_FIMD1>;
-                power-domains = <&pd_lcd1>;
-                #iommu-cells = <0>;
-        };
+                bus_peri: bus_peri {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_ACLK100>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_peri_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_dmc: bus_dmc {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_DMC>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_dmc_opp_table>;
-                status = "disabled";
-        };
+                bus_fsys: bus_fsys {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_ACLK133>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_fsys_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_acp: bus_acp {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_ACP>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_acp_opp_table>;
-                status = "disabled";
-        };
+                bus_display: bus_display {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_ACLK160>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_display_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_peri: bus_peri {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_ACLK100>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_peri_opp_table>;
-                status = "disabled";
-        };
+                bus_lcd0: bus_lcd0 {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_ACLK200>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_leftbus_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_fsys: bus_fsys {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_ACLK133>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_fsys_opp_table>;
-                status = "disabled";
-        };
+                bus_leftbus: bus_leftbus {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_GDL>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_leftbus_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_display: bus_display {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_ACLK160>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_display_opp_table>;
-                status = "disabled";
-        };
+                bus_rightbus: bus_rightbus {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_GDR>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_leftbus_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_lcd0: bus_lcd0 {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_ACLK200>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_leftbus_opp_table>;
-                status = "disabled";
-        };
+                bus_mfc: bus_mfc {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_SCLK_MFC>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_leftbus_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_leftbus: bus_leftbus {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_GDL>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_leftbus_opp_table>;
-                status = "disabled";
-        };
+                bus_dmc_opp_table: opp_table1 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-        bus_rightbus: bus_rightbus {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_GDR>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_leftbus_opp_table>;
-                status = "disabled";
-        };
-
-        bus_mfc: bus_mfc {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_SCLK_MFC>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_leftbus_opp_table>;
-                status = "disabled";
-        };
+                        opp-134000000 {
+                                opp-hz = /bits/ 64 <134000000>;
+                                opp-microvolt = <1025000>;
+                        };
+                        opp-267000000 {
+                                opp-hz = /bits/ 64 <267000000>;
+                                opp-microvolt = <1050000>;
+                        };
+                        opp-400000000 {
+                                opp-hz = /bits/ 64 <400000000>;
+                                opp-microvolt = <1150000>;
+                        };
+                };
 
-        bus_dmc_opp_table: opp_table1 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_acp_opp_table: opp_table2 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-                opp-134000000 {
-                        opp-hz = /bits/ 64 <134000000>;
-                        opp-microvolt = <1025000>;
-                };
-                opp-267000000 {
-                        opp-hz = /bits/ 64 <267000000>;
-                        opp-microvolt = <1050000>;
-                };
-                opp-400000000 {
-                        opp-hz = /bits/ 64 <400000000>;
-                        opp-microvolt = <1150000>;
+                        opp-134000000 {
+                                opp-hz = /bits/ 64 <134000000>;
+                        };
+                        opp-160000000 {
+                                opp-hz = /bits/ 64 <160000000>;
+                        };
+                        opp-200000000 {
+                                opp-hz = /bits/ 64 <200000000>;
+                        };
                 };
-        };
 
-        bus_acp_opp_table: opp_table2 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_peri_opp_table: opp_table3 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-                opp-134000000 {
-                        opp-hz = /bits/ 64 <134000000>;
-                };
-                opp-160000000 {
-                        opp-hz = /bits/ 64 <160000000>;
-                };
-                opp-200000000 {
-                        opp-hz = /bits/ 64 <200000000>;
+                        opp-5000000 {
+                                opp-hz = /bits/ 64 <5000000>;
+                        };
+                        opp-100000000 {
+                                opp-hz = /bits/ 64 <100000000>;
+                        };
                 };
-        };
 
-        bus_peri_opp_table: opp_table3 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_fsys_opp_table: opp_table4 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-                opp-5000000 {
-                        opp-hz = /bits/ 64 <5000000>;
-                };
-                opp-100000000 {
-                        opp-hz = /bits/ 64 <100000000>;
+                        opp-10000000 {
+                                opp-hz = /bits/ 64 <10000000>;
+                        };
+                        opp-134000000 {
+                                opp-hz = /bits/ 64 <134000000>;
+                        };
                 };
-        };
 
-        bus_fsys_opp_table: opp_table4 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_display_opp_table: opp_table5 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-                opp-10000000 {
-                        opp-hz = /bits/ 64 <10000000>;
-                };
-                opp-134000000 {
-                        opp-hz = /bits/ 64 <134000000>;
+                        opp-100000000 {
+                                opp-hz = /bits/ 64 <100000000>;
+                        };
+                        opp-134000000 {
+                                opp-hz = /bits/ 64 <134000000>;
+                        };
+                        opp-160000000 {
+                                opp-hz = /bits/ 64 <160000000>;
+                        };
                 };
-        };
 
-        bus_display_opp_table: opp_table5 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_leftbus_opp_table: opp_table6 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-                opp-100000000 {
-                        opp-hz = /bits/ 64 <100000000>;
-                };
-                opp-134000000 {
-                        opp-hz = /bits/ 64 <134000000>;
-                };
-                opp-160000000 {
-                        opp-hz = /bits/ 64 <160000000>;
+                        opp-100000000 {
+                                opp-hz = /bits/ 64 <100000000>;
+                        };
+                        opp-160000000 {
+                                opp-hz = /bits/ 64 <160000000>;
+                        };
+                        opp-200000000 {
+                                opp-hz = /bits/ 64 <200000000>;
+                        };
                 };
         };
 
-        bus_leftbus_opp_table: opp_table6 {
-                compatible = "operating-points-v2";
-                opp-shared;
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <0>;
+                        polling-delay = <0>;
+                        thermal-sensors = <&tmu 0>;
 
-                opp-100000000 {
-                        opp-hz = /bits/ 64 <100000000>;
-                };
-                opp-160000000 {
-                        opp-hz = /bits/ 64 <160000000>;
-                };
-                opp-200000000 {
-                        opp-hz = /bits/ 64 <200000000>;
+                        trips {
+                                cpu_alert0: cpu-alert-0 {
+                                temperature = <85000>; /* millicelsius */
+                                };
+                                cpu_alert1: cpu-alert-1 {
+                                temperature = <100000>; /* millicelsius */
+                                };
+                                cpu_alert2: cpu-alert-2 {
+                                temperature = <110000>; /* millicelsius */
+                                };
+                        };
                 };
         };
 };
@@ -428,6 +383,12 @@
         cpu-offset = <0x8000>;
 };
 
+&camera {
+        clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
+                 <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
+        clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
+};
+
 &combiner {
         samsung,combiner-nr = <16>;
         interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
@@ -448,10 +409,43 @@
                      <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 };
 
+&fimc_0 {
+        samsung,pix-limits = <4224 8192 1920 4224>;
+        samsung,mainscaler-ext;
+        samsung,cam-if;
+};
+
+&fimc_1 {
+        samsung,pix-limits = <4224 8192 1920 4224>;
+        samsung,mainscaler-ext;
+        samsung,cam-if;
+};
+
+&fimc_2 {
+        samsung,pix-limits = <4224 8192 1920 4224>;
+        samsung,mainscaler-ext;
+        samsung,lcd-wb;
+};
+
+&fimc_3 {
+        samsung,pix-limits = <1920 8192 1366 1920>;
+        samsung,rotators = <0>;
+        samsung,mainscaler-ext;
+        samsung,lcd-wb;
+};
+
 &mdma1 {
         power-domains = <&pd_lcd0>;
 };
 
+&mixer {
+        clock-names = "mixer", "hdmi", "sclk_hdmi", "vp", "mout_mixer",
+                      "sclk_mixer";
+        clocks = <&clock CLK_MIXER>, <&clock CLK_HDMI>,
+                 <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>,
+                 <&clock CLK_MOUT_MIXER>, <&clock CLK_SCLK_MIXER>;
+};
+
 &pmu_system_controller {
         clock-names = "clkout0", "clkout1", "clkout2", "clkout3",
                         "clkout4", "clkout8", "clkout9";
@@ -468,3 +462,13 @@
 &sysmmu_rotator {
         power-domains = <&pd_lcd0>;
 };
+
+&tmu {
+        compatible = "samsung,exynos4210-tmu";
+        clocks = <&clock CLK_TMU_APBIF>;
+        clock-names = "tmu_apbif";
+        samsung,tmu_gain = <15>;
+        samsung,tmu_reference_voltage = <7>;
+};
+
+#include "exynos4210-pinctrl.dtsi"
diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
new file mode 100644
index 000000000000..ee8e1f445370
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Samsung's Exynos4412 based Galaxy S3 board device tree source
+ *
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ */
+
+/dts-v1/;
+#include "exynos4412-midas.dtsi"
+
+/ {
+        aliases {
+                i2c9 = &i2c_ak8975;
+                i2c10 = &i2c_cm36651;
+        };
+
+        regulators {
+                lcd_vdd3_reg: voltage-regulator-2 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "LCD_VDD_2.2V";
+                        regulator-min-microvolt = <2200000>;
+                        regulator-max-microvolt = <2200000>;
+                        gpio = <&gpc0 1 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+
+                ps_als_reg: voltage-regulator-5 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "LED_A_3.0V";
+                        regulator-min-microvolt = <3000000>;
+                        regulator-max-microvolt = <3000000>;
+                        gpio = <&gpj0 5 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+        };
+
+        i2c_ak8975: i2c-gpio-0 {
+                compatible = "i2c-gpio";
+                gpios = <&gpy2 4 GPIO_ACTIVE_HIGH>, <&gpy2 5 GPIO_ACTIVE_HIGH>;
+                i2c-gpio,delay-us = <2>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "okay";
+
+                ak8975@c {
+                        compatible = "asahi-kasei,ak8975";
+                        reg = <0x0c>;
+                        gpios = <&gpj0 7 GPIO_ACTIVE_HIGH>;
+                };
+        };
+
+        i2c_cm36651: i2c-gpio-2 {
+                compatible = "i2c-gpio";
+                gpios = <&gpf0 0 GPIO_ACTIVE_LOW>, <&gpf0 1 GPIO_ACTIVE_LOW>;
+                i2c-gpio,delay-us = <2>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cm36651@18 {
+                        compatible = "capella,cm36651";
+                        reg = <0x18>;
+                        interrupt-parent = <&gpx0>;
+                        interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
+                        vled-supply = <&ps_als_reg>;
+                };
+        };
+};
+
+&buck9_reg {
+        maxim,ena-gpios = <&gpm0 3 GPIO_ACTIVE_HIGH>;
+};
+
+&cam_af_reg {
+        gpio = <&gpm0 4 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&cam_io_reg {
+        gpio = <&gpm0 2 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&dsi_0 {
+        status = "okay";
+
+        panel@0 {
+                compatible = "samsung,s6e8aa0";
+                reg = <0>;
+                vdd3-supply = <&lcd_vdd3_reg>;
+                vci-supply = <&ldo25_reg>;
+                reset-gpios = <&gpf2 1 GPIO_ACTIVE_HIGH>;
+                power-on-delay= <50>;
+                reset-delay = <100>;
+                init-delay = <100>;
+                flip-horizontal;
+                flip-vertical;
+                panel-width-mm = <58>;
+                panel-height-mm = <103>;
+
+                display-timings {
+                        timing-0 {
+                                clock-frequency = <57153600>;
+                                hactive = <720>;
+                                vactive = <1280>;
+                                hfront-porch = <5>;
+                                hback-porch = <5>;
+                                hsync-len = <5>;
+                                vfront-porch = <13>;
+                                vback-porch = <1>;
+                                vsync-len = <2>;
+                        };
+                };
+        };
+};
+
+&i2c_3 {
+        mms114-touchscreen@48 {
+                compatible = "melfas,mms114";
+                reg = <0x48>;
+                interrupt-parent = <&gpm2>;
+                interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+                x-size = <720>;
+                y-size = <1280>;
+                avdd-supply = <&ldo23_reg>;
+                vdd-supply = <&ldo24_reg>;
+        };
+};
+
+&ldo25_reg {
+        regulator-name = "LCD_VCC_3.3V";
+        regulator-min-microvolt = <2800000>;
+        regulator-max-microvolt = <2800000>;
+};
+
+&s5c73m3 {
+        standby-gpios = <&gpm0 1 GPIO_ACTIVE_LOW>;   /* ISP_STANDBY */
+        vdda-supply = <&ldo17_reg>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/exynos4412-i9300.dts b/arch/arm/boot/dts/exynos4412-i9300.dts
new file mode 100644
index 000000000000..f8125a945f8d
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-i9300.dts
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Samsung's Exynos4412 based M0 (GT-I9300) board device tree source
+ *
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ */
+
+/dts-v1/;
+#include "exynos4412-galaxy-s3.dtsi"
+
+/ {
+        model = "Samsung Galaxy S3 (GT-I9300) based on Exynos4412";
+        compatible = "samsung,i9300", "samsung,midas", "samsung,exynos4412", "samsung,exynos4";
+
+        /* bootargs are passed in by bootloader */
+
+        memory@40000000 {
+                device_type = "memory";
+                reg =  <0x40000000 0x40000000>;
+        };
+};
diff --git a/arch/arm/boot/dts/exynos4412-i9305.dts b/arch/arm/boot/dts/exynos4412-i9305.dts
new file mode 100644
index 000000000000..54a2a55dbf70
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-i9305.dts
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+#include "exynos4412-galaxy-s3.dtsi"
+
+/ {
+        model = "Samsung Galaxy S3 (GT-I9305) based on Exynos4412";
+        compatible = "samsung,i9305", "samsung,midas", "samsung,exynos4412", "samsung,exynos4";
+
+        /* bootargs are passed in by bootloader */
+
+        memory@40000000 {
+                device_type = "memory";
+                reg =  <0x40000000 0x80000000>;
+        };
+};
+
+&i2c0_bus {
+        /* SCL and SDA pins are swapped */
+        samsung,pins = "gpd1-1", "gpd1-0";
+};
diff --git a/arch/arm/boot/dts/exynos4412-itop-elite.dts b/arch/arm/boot/dts/exynos4412-itop-elite.dts
index a4cd4939fe9a..0dedeba89b5f 100644
--- a/arch/arm/boot/dts/exynos4412-itop-elite.dts
+++ b/arch/arm/boot/dts/exynos4412-itop-elite.dts
@@ -116,14 +116,6 @@
                 compatible = "pwm-beeper";
                 pwms = <&pwm 0 4000000 PWM_POLARITY_INVERTED>;
         };
-
-        camera: camera {
-                pinctrl-0 = <&cam_port_a_clk_active>;
-                pinctrl-names = "default";
-                status = "okay";
-                assigned-clocks = <&clock CLK_MOUT_CAM0>;
-                assigned-clock-parents = <&clock CLK_XUSBXTI>;
-        };
 };
 
 &adc {
@@ -131,6 +123,14 @@
         status = "okay";
 };
 
+&camera {
+        pinctrl-0 = <&cam_port_a_clk_active>;
+        pinctrl-names = "default";
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_CAM0>;
+        assigned-clock-parents = <&clock CLK_XUSBXTI>;
+};
+
 &clock_audss {
         assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
                         <&clock_audss EXYNOS_MOUT_I2S>,
diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
new file mode 100644
index 000000000000..76f2b30f1731
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -0,0 +1,1308 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Samsung's Exynos4412 based Trats 2 board device tree source
+ *
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * Device tree source file for Samsung's Trats 2 board which is based on
+ * Samsung's Exynos4412 SoC.
+ */
+
+/dts-v1/;
+#include "exynos4412.dtsi"
+#include "exynos4412-ppmu-common.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/clock/maxim,max77686.h>
+#include <dt-bindings/pinctrl/samsung.h>
+
+/ {
+        compatible = "samsung,midas", "samsung,exynos4412", "samsung,exynos4";
+
+        aliases {
+                i2c11 = &i2c_max77693;
+                i2c12 = &i2c_max77693_fuel;
+        };
+
+        chosen {
+                stdout-path = &serial_2;
+        };
+
+        firmware@204f000 {
+                compatible = "samsung,secure-firmware";
+                reg = <0x0204F000 0x1000>;
+        };
+
+        fixed-rate-clocks {
+                xxti {
+                        compatible = "samsung,clock-xxti", "fixed-clock";
+                        clock-frequency = <0>;
+                };
+
+                xusbxti {
+                        compatible = "samsung,clock-xusbxti", "fixed-clock";
+                        clock-frequency = <24000000>;
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cam_io_reg: voltage-regulator-1 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "CAM_SENSOR_A";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        enable-active-high;
+                        status = "disabled";
+                };
+
+                cam_af_reg: voltage-regulator-3 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "CAM_AF";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        enable-active-high;
+                        status = "disabled";
+                };
+
+                vsil12: voltage-regulator-6 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VSIL_1.2V";
+                        regulator-min-microvolt = <1200000>;
+                        regulator-max-microvolt = <1200000>;
+                        gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                        vin-supply = <&buck7_reg>;
+                };
+
+                vcc33mhl: voltage-regulator-7 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VCC_3.3_MHL";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+
+                vcc18mhl: voltage-regulator-8 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VCC_1.8_MHL";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                key-down {
+                        gpios = <&gpx3 3 GPIO_ACTIVE_LOW>;
+                        linux,code = <114>;
+                        label = "volume down";
+                        debounce-interval = <10>;
+                };
+
+                key-up {
+                        gpios = <&gpx2 2 GPIO_ACTIVE_LOW>;
+                        linux,code = <115>;
+                        label = "volume up";
+                        debounce-interval = <10>;
+                };
+
+                key-power {
+                        gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
+                        linux,code = <116>;
+                        label = "power";
+                        debounce-interval = <10>;
+                        wakeup-source;
+                };
+
+                key-ok {
+                        gpios = <&gpx0 1 GPIO_ACTIVE_LOW>;
+                        linux,code = <139>;
+                        label = "ok";
+                        debounce-interval = <10>;
+                        wakeup-source;
+                };
+        };
+
+        i2c_max77693: i2c-gpio-1 {
+                compatible = "i2c-gpio";
+                gpios = <&gpm2 0 GPIO_ACTIVE_HIGH>, <&gpm2 1 GPIO_ACTIVE_HIGH>;
+                i2c-gpio,delay-us = <2>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "okay";
+
+                max77693@66 {
+                        compatible = "maxim,max77693";
+                        interrupt-parent = <&gpx1>;
+                        interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+                        reg = <0x66>;
+
+                        regulators {
+                                esafeout1_reg: ESAFEOUT1 {
+                                        regulator-name = "ESAFEOUT1";
+                                };
+                                esafeout2_reg: ESAFEOUT2 {
+                                        regulator-name = "ESAFEOUT2";
+                                };
+                                charger_reg: CHARGER {
+                                        regulator-name = "CHARGER";
+                                        regulator-min-microamp = <60000>;
+                                        regulator-max-microamp = <2580000>;
+                                };
+                        };
+
+                        max77693_haptic {
+                                compatible = "maxim,max77693-haptic";
+                                haptic-supply = <&ldo26_reg>;
+                                pwms = <&pwm 0 38022 0>;
+                        };
+
+                        charger {
+                                compatible = "maxim,max77693-charger";
+
+                                maxim,constant-microvolt = <4350000>;
+                                maxim,min-system-microvolt = <3600000>;
+                                maxim,thermal-regulation-celsius = <100>;
+                                maxim,battery-overcurrent-microamp = <3500000>;
+                                maxim,charge-input-threshold-microvolt = <4300000>;
+                        };
+                };
+        };
+
+        i2c_max77693_fuel: i2c-gpio-3 {
+                compatible = "i2c-gpio";
+                gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>, <&gpf1 4 GPIO_ACTIVE_HIGH>;
+                i2c-gpio,delay-us = <2>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "okay";
+
+                max77693-fuel-gauge@36 {
+                        compatible = "maxim,max17047";
+                        interrupt-parent = <&gpx2>;
+                        interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+                        reg = <0x36>;
+
+                        maxim,over-heat-temp = <700>;
+                        maxim,over-volt = <4500>;
+                };
+        };
+
+        i2c-mhl {
+                compatible = "i2c-gpio";
+                gpios = <&gpf0 4 GPIO_ACTIVE_HIGH>, <&gpf0 6 GPIO_ACTIVE_HIGH>;
+                i2c-gpio,delay-us = <100>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                pinctrl-0 = <&i2c_mhl_bus>;
+                pinctrl-names = "default";
+                status = "okay";
+
+                sii9234: hdmi-bridge@39 {
+                        compatible = "sil,sii9234";
+                        avcc33-supply = <&vcc33mhl>;
+                        iovcc18-supply = <&vcc18mhl>;
+                        avcc12-supply = <&vsil12>;
+                        cvcc12-supply = <&vsil12>;
+                        reset-gpios = <&gpf3 4 GPIO_ACTIVE_LOW>;
+                        interrupt-parent = <&gpf3>;
+                        interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
+                        reg = <0x39>;
+
+                        port {
+                                mhl_to_hdmi: endpoint {
+                                        remote-endpoint = <&hdmi_to_mhl>;
+                                };
+                        };
+                };
+        };
+
+        wlan_pwrseq: sdhci3-pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                reset-gpios = <&gpj0 0 GPIO_ACTIVE_LOW>;
+                clocks = <&max77686 MAX77686_CLK_PMIC>;
+                clock-names = "ext_clock";
+        };
+
+        sound {
+                compatible = "samsung,trats2-audio";
+                samsung,i2s-controller = <&i2s0>;
+                samsung,model = "Trats2";
+                samsung,audio-codec = <&wm1811>;
+                samsung,audio-routing =
+                        "SPK", "SPKOUTLN",
+                        "SPK", "SPKOUTLP",
+                        "SPK", "SPKOUTRN",
+                        "SPK", "SPKOUTRP";
+        };
+
+        thermistor-ap {
+                compatible = "murata,ncp15wb473";
+                pullup-uv = <1800000>;   /* VCC_1.8V_AP */
+                pullup-ohm = <100000>;   /* 100K */
+                pulldown-ohm = <100000>; /* 100K */
+                io-channels = <&adc 1>;  /* AP temperature */
+        };
+
+        thermistor-battery {
+                compatible = "murata,ncp15wb473";
+                pullup-uv = <1800000>;   /* VCC_1.8V_AP */
+                pullup-ohm = <100000>;   /* 100K */
+                pulldown-ohm = <100000>; /* 100K */
+                io-channels = <&adc 2>;  /* Battery temperature */
+        };
+
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        cooling-maps {
+                                map0 {
+                                     /* Corresponds to 800MHz at freq_table */
+                                     cooling-device = <&cpu0 7 7>;
+                                };
+                                map1 {
+                                     /* Corresponds to 200MHz at freq_table */
+                                     cooling-device = <&cpu0 13 13>;
+                               };
+                       };
+                };
+        };
+};
+
+&adc {
+        vdd-supply = <&ldo3_reg>;
+        status = "okay";
+};
+
+&bus_dmc {
+        devfreq-events = <&ppmu_dmc0_3>, <&ppmu_dmc1_3>;
+        vdd-supply = <&buck1_reg>;
+        status = "okay";
+};
+
+&bus_acp {
+        devfreq = <&bus_dmc>;
+        status = "okay";
+};
+
+&bus_c2c {
+        devfreq = <&bus_dmc>;
+        status = "okay";
+};
+
+&bus_leftbus {
+        devfreq-events = <&ppmu_leftbus_3>, <&ppmu_rightbus_3>;
+        vdd-supply = <&buck3_reg>;
+        status = "okay";
+};
+
+&bus_rightbus {
+        devfreq = <&bus_leftbus>;
+        status = "okay";
+};
+
+&bus_display {
+        devfreq = <&bus_leftbus>;
+        status = "okay";
+};
+
+&bus_fsys {
+        devfreq = <&bus_leftbus>;
+        status = "okay";
+};
+
+&bus_peri {
+        devfreq = <&bus_leftbus>;
+        status = "okay";
+};
+
+&bus_mfc {
+        devfreq = <&bus_leftbus>;
+        status = "okay";
+};
+
+&camera {
+        pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>;
+        pinctrl-names = "default";
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_CAM0>,
+                <&clock CLK_MOUT_CAM1>;
+        assigned-clock-parents = <&clock CLK_XUSBXTI>,
+                <&clock CLK_XUSBXTI>;
+};
+
+&cpu0 {
+        cpu0-supply = <&buck2_reg>;
+};
+
+&csis_0 {
+        status = "okay";
+        vddcore-supply = <&ldo8_reg>;
+        vddio-supply = <&ldo10_reg>;
+        assigned-clocks = <&clock CLK_MOUT_CSIS0>,
+                        <&clock CLK_SCLK_CSIS0>;
+        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+        assigned-clock-rates = <0>, <176000000>;
+
+        /* Camera C (3) MIPI CSI-2 (CSIS0) */
+        port@3 {
+                reg = <3>;
+                csis0_ep: endpoint {
+                        remote-endpoint = <&s5c73m3_ep>;
+                        data-lanes = <1 2 3 4>;
+                        samsung,csis-hs-settle = <12>;
+                };
+        };
+};
+
+&csis_1 {
+        status = "okay";
+        vddcore-supply = <&ldo8_reg>;
+        vddio-supply = <&ldo10_reg>;
+        assigned-clocks = <&clock CLK_MOUT_CSIS1>,
+                        <&clock CLK_SCLK_CSIS1>;
+        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+        assigned-clock-rates = <0>, <176000000>;
+
+        /* Camera D (4) MIPI CSI-2 (CSIS1) */
+        port@4 {
+                reg = <4>;
+                csis1_ep: endpoint {
+                        remote-endpoint = <&is_s5k6a3_ep>;
+                        data-lanes = <1>;
+                        samsung,csis-hs-settle = <18>;
+                        samsung,csis-wclk;
+                };
+        };
+};
+
+&dsi_0 {
+        vddcore-supply = <&ldo8_reg>;
+        vddio-supply = <&ldo10_reg>;
+        samsung,burst-clock-frequency = <500000000>;
+        samsung,esc-clock-frequency = <20000000>;
+        samsung,pll-clock-frequency = <24000000>;
+};
+
+&exynos_usbphy {
+        vbus-supply = <&esafeout1_reg>;
+        status = "okay";
+};
+
+&fimc_0 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC0>,
+                        <&clock CLK_SCLK_FIMC0>;
+        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+        assigned-clock-rates = <0>, <176000000>;
+};
+
+&fimc_1 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC1>,
+                        <&clock CLK_SCLK_FIMC1>;
+        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+        assigned-clock-rates = <0>, <176000000>;
+};
+
+&fimc_2 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC2>,
+                        <&clock CLK_SCLK_FIMC2>;
+        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+        assigned-clock-rates = <0>, <176000000>;
+};
+
+&fimc_3 {
+        status = "okay";
+        assigned-clocks = <&clock CLK_MOUT_FIMC3>,
+                        <&clock CLK_SCLK_FIMC3>;
+        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
+        assigned-clock-rates = <0>, <176000000>;
+};
+
+&fimc_is {
+        pinctrl-0 = <&fimc_is_uart>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        };
+
+&fimc_lite_0 {
+        status = "okay";
+};
+
+&fimc_lite_1 {
+        status = "okay";
+};
+
+&fimd {
+        status = "okay";
+};
+
+&hdmi {
+        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&hdmi_hpd>;
+        vdd-supply = <&ldo3_reg>;
+        vdd_osc-supply = <&ldo4_reg>;
+        vdd_pll-supply = <&ldo3_reg>;
+        ddc = <&i2c_5>;
+        status = "okay";
+
+        ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@1 {
+                        reg = <1>;
+                        hdmi_to_mhl: endpoint {
+                                remote-endpoint = <&mhl_to_hdmi>;
+                        };
+                };
+        };
+};
+
+&hsotg {
+        vusb_d-supply = <&ldo15_reg>;
+        vusb_a-supply = <&ldo12_reg>;
+        dr_mode = "peripheral";
+        status = "okay";
+};
+
+&i2c_0 {
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-slave-addr = <0x10>;
+        samsung,i2c-max-bus-freq = <400000>;
+        pinctrl-0 = <&i2c0_bus>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        s5c73m3: s5c73m3@3c {
+                compatible = "samsung,s5c73m3";
+                reg = <0x3c>;
+                xshutdown-gpios = <&gpf1 3 GPIO_ACTIVE_LOW>; /* ISP_RESET */
+                vdd-int-supply = <&buck9_reg>;
+                vddio-cis-supply = <&ldo9_reg>;
+                vddio-host-supply = <&ldo18_reg>;
+                vdd-af-supply = <&cam_af_reg>;
+                vdd-reg-supply = <&cam_io_reg>;
+                clock-frequency = <24000000>;
+                /* CAM_A_CLKOUT */
+                clocks = <&camera 0>;
+                clock-names = "cis_extclk";
+                status = "disabled";
+                port {
+                        s5c73m3_ep: endpoint {
+                                remote-endpoint = <&csis0_ep>;
+                                data-lanes = <1 2 3 4>;
+                        };
+                };
+        };
+};
+
+&i2c1_isp {
+        pinctrl-0 = <&fimc_is_i2c1>;
+        pinctrl-names = "default";
+
+        s5k6a3@10 {
+                compatible = "samsung,s5k6a3";
+                reg = <0x10>;
+                svdda-supply = <&cam_io_reg>;
+                svddio-supply = <&ldo19_reg>;
+                afvdd-supply = <&ldo19_reg>;
+                clock-frequency = <24000000>;
+                /* CAM_B_CLKOUT */
+                clocks = <&camera 1>;
+                clock-names = "extclk";
+                samsung,camclk-out = <1>;
+                gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>;
+
+                port {
+                        is_s5k6a3_ep: endpoint {
+                                remote-endpoint = <&csis1_ep>;
+                                data-lanes = <1>;
+                        };
+                };
+        };
+};
+
+&i2c_3 {
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-slave-addr = <0x10>;
+        samsung,i2c-max-bus-freq = <400000>;
+        pinctrl-0 = <&i2c3_bus>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&i2c_4 {
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-slave-addr = <0x10>;
+        samsung,i2c-max-bus-freq = <100000>;
+        pinctrl-0 = <&i2c4_bus>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        wm1811: wm1811@1a {
+                compatible = "wlf,wm1811";
+                reg = <0x1a>;
+                clocks = <&pmu_system_controller 0>;
+                clock-names = "MCLK1";
+                DCVDD-supply = <&ldo3_reg>;
+                DBVDD1-supply = <&ldo3_reg>;
+                wlf,ldo1ena = <&gpj0 4 0>;
+        };
+};
+
+&i2c_5 {
+        status = "okay";
+};
+
+&i2c_7 {
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-slave-addr = <0x10>;
+        samsung,i2c-max-bus-freq = <100000>;
+        pinctrl-0 = <&i2c7_bus>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        max77686: max77686_pmic@9 {
+                compatible = "maxim,max77686";
+                interrupt-parent = <&gpx0>;
+                interrupts = <7 IRQ_TYPE_NONE>;
+                reg = <0x09>;
+                #clock-cells = <1>;
+
+                voltage-regulators {
+                        ldo1_reg: LDO1 {
+                                regulator-name = "VALIVE_1.0V_AP";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        ldo2_reg: LDO2 {
+                                regulator-name = "VM1M2_1.2V_AP";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <1200000>;
+                                regulator-always-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
+                        };
+
+                        ldo3_reg: LDO3 {
+                                regulator-name = "VCC_1.8V_AP";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+
+                        ldo4_reg: LDO4 {
+                                regulator-name = "VCC_2.8V_AP";
+                                regulator-min-microvolt = <2800000>;
+                                regulator-max-microvolt = <2800000>;
+                                regulator-always-on;
+                        };
+
+                        ldo5_reg: LDO5 {
+                                regulator-name = "VCC_1.8V_IO";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+
+                        ldo6_reg: LDO6 {
+                                regulator-name = "VMPLL_1.0V_AP";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
+                        };
+
+                        ldo7_reg: LDO7 {
+                                regulator-name = "VPLL_1.0V_AP";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
+                        };
+
+                        ldo8_reg: LDO8 {
+                                regulator-name = "VMIPI_1.0V";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
+                        };
+
+                        ldo9_reg: LDO9 {
+                                regulator-name = "CAM_ISP_MIPI_1.2V";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <1200000>;
+                        };
+
+                        ldo10_reg: LDO10 {
+                                regulator-name = "VMIPI_1.8V";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
+                        };
+
+                        ldo11_reg: LDO11 {
+                                regulator-name = "VABB1_1.95V";
+                                regulator-min-microvolt = <1950000>;
+                                regulator-max-microvolt = <1950000>;
+                                regulator-always-on;
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
+                        };
+
+                        ldo12_reg: LDO12 {
+                                regulator-name = "VUOTG_3.0V";
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
+                        };
+
+                        ldo13_reg: LDO13 {
+                                regulator-name = "NFC_AVDD_1.8V";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                        };
+
+                        ldo14_reg: LDO14 {
+                                regulator-name = "VABB2_1.95V";
+                                regulator-min-microvolt = <1950000>;
+                                regulator-max-microvolt = <1950000>;
+                                regulator-always-on;
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
+                        };
+
+                        ldo15_reg: LDO15 {
+                                regulator-name = "VHSIC_1.0V";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
+                        };
+
+                        ldo16_reg: LDO16 {
+                                regulator-name = "VHSIC_1.8V";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
+                        };
+
+                        ldo17_reg: LDO17 {
+                                regulator-name = "CAM_SENSOR_CORE_1.2V";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <1200000>;
+                        };
+
+                        ldo18_reg: LDO18 {
+                                regulator-name = "CAM_ISP_SEN_IO_1.8V";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                        };
+
+                        ldo19_reg: LDO19 {
+                                regulator-name = "VT_CAM_1.8V";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                        };
+
+                        ldo20_reg: LDO20 {
+                                regulator-name = "VDDQ_PRE_1.8V";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                        };
+
+                        ldo21_reg: LDO21 {
+                                regulator-name = "VTF_2.8V";
+                                regulator-min-microvolt = <2800000>;
+                                regulator-max-microvolt = <2800000>;
+                                maxim,ena-gpios = <&gpy2 0 GPIO_ACTIVE_HIGH>;
+                        };
+
+                        ldo22_reg: LDO22 {
+                                regulator-name = "VMEM_VDD_2.8V";
+                                regulator-min-microvolt = <2800000>;
+                                regulator-max-microvolt = <2800000>;
+                                maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
+                        };
+
+                        ldo23_reg: LDO23 {
+                                regulator-name = "TSP_AVDD_3.3V";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                        };
+
+                        ldo24_reg: LDO24 {
+                                regulator-name = "TSP_VDD_1.8V";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                        };
+
+                        ldo25_reg: LDO25 {
+                                regulator-name = "LDO25";
+                        };
+
+                        ldo26_reg: LDO26 {
+                                regulator-name = "MOTOR_VCC_3.0V";
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3000000>;
+                        };
+
+                        buck1_reg: BUCK1 {
+                                regulator-name = "vdd_mif";
+                                regulator-min-microvolt = <850000>;
+                                regulator-max-microvolt = <1100000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
+                        };
+
+                        buck2_reg: BUCK2 {
+                                regulator-name = "vdd_arm";
+                                regulator-min-microvolt = <850000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
+                        };
+
+                        buck3_reg: BUCK3 {
+                                regulator-name = "vdd_int";
+                                regulator-min-microvolt = <850000>;
+                                regulator-max-microvolt = <1150000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
+                        };
+
+                        buck4_reg: BUCK4 {
+                                regulator-name = "vdd_g3d";
+                                regulator-min-microvolt = <850000>;
+                                regulator-max-microvolt = <1150000>;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
+                        };
+
+                        buck5_reg: BUCK5 {
+                                regulator-name = "VMEM_1.2V_AP";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <1200000>;
+                                regulator-always-on;
+                        };
+
+                        buck6_reg: BUCK6 {
+                                regulator-name = "VCC_SUB_1.35V";
+                                regulator-min-microvolt = <1350000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-always-on;
+                        };
+
+                        buck7_reg: BUCK7 {
+                                regulator-name = "VCC_SUB_2.0V";
+                                regulator-min-microvolt = <2000000>;
+                                regulator-max-microvolt = <2000000>;
+                                regulator-always-on;
+                        };
+
+                        buck8_reg: BUCK8 {
+                                regulator-name = "VMEM_VDDF_3.0V";
+                                regulator-min-microvolt = <2850000>;
+                                regulator-max-microvolt = <2850000>;
+                                maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
+                        };
+
+                        buck9_reg: BUCK9 {
+                                regulator-name = "CAM_ISP_CORE_1.2V";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1200000>;
+                        };
+                };
+        };
+};
+
+&i2c_8 {
+        status = "okay";
+};
+
+&i2s0 {
+        pinctrl-0 = <&i2s0_bus>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&mixer {
+        status = "okay";
+};
+
+&mshc_0 {
+        broken-cd;
+        non-removable;
+        card-detect-delay = <200>;
+        vmmc-supply = <&ldo22_reg>;
+        clock-frequency = <400000000>;
+        samsung,dw-mshc-ciu-div = <0>;
+        samsung,dw-mshc-sdr-timing = <2 3>;
+        samsung,dw-mshc-ddr-timing = <1 2>;
+        pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
+        pinctrl-names = "default";
+        status = "okay";
+        bus-width = <8>;
+        cap-mmc-highspeed;
+};
+
+&pmu_system_controller {
+        assigned-clocks = <&pmu_system_controller 0>;
+        assigned-clock-parents =  <&clock CLK_XUSBXTI>;
+};
+
+&pinctrl_0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&sleep0>;
+
+        mhl_int: mhl-int {
+                samsung,pins = "gpf3-5";
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+        };
+
+        i2c_mhl_bus: i2c-mhl-bus {
+                samsung,pins = "gpf0-4", "gpf0-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        sleep0: sleep-states {
+                PIN_SLP(gpa0-0, INPUT, NONE);
+                PIN_SLP(gpa0-1, OUT0, NONE);
+                PIN_SLP(gpa0-2, INPUT, NONE);
+                PIN_SLP(gpa0-3, INPUT, UP);
+                PIN_SLP(gpa0-4, INPUT, NONE);
+                PIN_SLP(gpa0-5, INPUT, DOWN);
+                PIN_SLP(gpa0-6, INPUT, DOWN);
+                PIN_SLP(gpa0-7, INPUT, UP);
+
+                PIN_SLP(gpa1-0, INPUT, DOWN);
+                PIN_SLP(gpa1-1, INPUT, DOWN);
+                PIN_SLP(gpa1-2, INPUT, DOWN);
+                PIN_SLP(gpa1-3, INPUT, DOWN);
+                PIN_SLP(gpa1-4, INPUT, DOWN);
+                PIN_SLP(gpa1-5, INPUT, DOWN);
+
+                PIN_SLP(gpb-0, INPUT, NONE);
+                PIN_SLP(gpb-1, INPUT, NONE);
+                PIN_SLP(gpb-2, INPUT, NONE);
+                PIN_SLP(gpb-3, INPUT, NONE);
+                PIN_SLP(gpb-4, INPUT, DOWN);
+                PIN_SLP(gpb-5, INPUT, UP);
+                PIN_SLP(gpb-6, INPUT, DOWN);
+                PIN_SLP(gpb-7, INPUT, DOWN);
+
+                PIN_SLP(gpc0-0, INPUT, DOWN);
+                PIN_SLP(gpc0-1, INPUT, DOWN);
+                PIN_SLP(gpc0-2, INPUT, DOWN);
+                PIN_SLP(gpc0-3, INPUT, DOWN);
+                PIN_SLP(gpc0-4, INPUT, DOWN);
+
+                PIN_SLP(gpc1-0, INPUT, NONE);
+                PIN_SLP(gpc1-1, PREV, NONE);
+                PIN_SLP(gpc1-2, INPUT, NONE);
+                PIN_SLP(gpc1-3, INPUT, NONE);
+                PIN_SLP(gpc1-4, INPUT, NONE);
+
+                PIN_SLP(gpd0-0, INPUT, DOWN);
+                PIN_SLP(gpd0-1, INPUT, DOWN);
+                PIN_SLP(gpd0-2, INPUT, NONE);
+                PIN_SLP(gpd0-3, INPUT, NONE);
+
+                PIN_SLP(gpd1-0, INPUT, DOWN);
+                PIN_SLP(gpd1-1, INPUT, DOWN);
+                PIN_SLP(gpd1-2, INPUT, NONE);
+                PIN_SLP(gpd1-3, INPUT, NONE);
+
+                PIN_SLP(gpf0-0, INPUT, NONE);
+                PIN_SLP(gpf0-1, INPUT, NONE);
+                PIN_SLP(gpf0-2, INPUT, DOWN);
+                PIN_SLP(gpf0-3, INPUT, DOWN);
+                PIN_SLP(gpf0-4, INPUT, NONE);
+                PIN_SLP(gpf0-5, INPUT, DOWN);
+                PIN_SLP(gpf0-6, INPUT, NONE);
+                PIN_SLP(gpf0-7, INPUT, DOWN);
+
+                PIN_SLP(gpf1-0, INPUT, DOWN);
+                PIN_SLP(gpf1-1, INPUT, DOWN);
+                PIN_SLP(gpf1-2, INPUT, DOWN);
+                PIN_SLP(gpf1-3, INPUT, DOWN);
+                PIN_SLP(gpf1-4, INPUT, NONE);
+                PIN_SLP(gpf1-5, INPUT, NONE);
+                PIN_SLP(gpf1-6, INPUT, DOWN);
+                PIN_SLP(gpf1-7, PREV, NONE);
+
+                PIN_SLP(gpf2-0, PREV, NONE);
+                PIN_SLP(gpf2-1, INPUT, DOWN);
+                PIN_SLP(gpf2-2, INPUT, DOWN);
+                PIN_SLP(gpf2-3, INPUT, DOWN);
+                PIN_SLP(gpf2-4, INPUT, DOWN);
+                PIN_SLP(gpf2-5, INPUT, DOWN);
+                PIN_SLP(gpf2-6, INPUT, NONE);
+                PIN_SLP(gpf2-7, INPUT, NONE);
+
+                PIN_SLP(gpf3-0, INPUT, NONE);
+                PIN_SLP(gpf3-1, PREV, NONE);
+                PIN_SLP(gpf3-2, PREV, NONE);
+                PIN_SLP(gpf3-3, PREV, NONE);
+                PIN_SLP(gpf3-4, OUT1, NONE);
+                PIN_SLP(gpf3-5, INPUT, DOWN);
+
+                PIN_SLP(gpj0-0, PREV, NONE);
+                PIN_SLP(gpj0-1, PREV, NONE);
+                PIN_SLP(gpj0-2, PREV, NONE);
+                PIN_SLP(gpj0-3, INPUT, DOWN);
+                PIN_SLP(gpj0-4, PREV, NONE);
+                PIN_SLP(gpj0-5, PREV, NONE);
+                PIN_SLP(gpj0-6, INPUT, DOWN);
+                PIN_SLP(gpj0-7, INPUT, DOWN);
+
+                PIN_SLP(gpj1-0, INPUT, DOWN);
+                PIN_SLP(gpj1-1, PREV, NONE);
+                PIN_SLP(gpj1-2, PREV, NONE);
+                PIN_SLP(gpj1-3, INPUT, DOWN);
+                PIN_SLP(gpj1-4, INPUT, DOWN);
+        };
+};
+
+&pinctrl_1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&sleep1>;
+
+        hdmi_hpd: hdmi-hpd {
+                samsung,pins = "gpx3-7";
+                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+        };
+
+        sleep1: sleep-states {
+                PIN_SLP(gpk0-0, PREV, NONE);
+                PIN_SLP(gpk0-1, PREV, NONE);
+                PIN_SLP(gpk0-2, OUT0, NONE);
+                PIN_SLP(gpk0-3, PREV, NONE);
+                PIN_SLP(gpk0-4, PREV, NONE);
+                PIN_SLP(gpk0-5, PREV, NONE);
+                PIN_SLP(gpk0-6, PREV, NONE);
+
+                PIN_SLP(gpk1-0, INPUT, DOWN);
+                PIN_SLP(gpk1-1, INPUT, DOWN);
+                PIN_SLP(gpk1-2, INPUT, DOWN);
+                PIN_SLP(gpk1-3, PREV, NONE);
+                PIN_SLP(gpk1-4, PREV, NONE);
+                PIN_SLP(gpk1-5, PREV, NONE);
+                PIN_SLP(gpk1-6, PREV, NONE);
+
+                PIN_SLP(gpk2-0, INPUT, DOWN);
+                PIN_SLP(gpk2-1, INPUT, DOWN);
+                PIN_SLP(gpk2-2, INPUT, DOWN);
+                PIN_SLP(gpk2-3, INPUT, DOWN);
+                PIN_SLP(gpk2-4, INPUT, DOWN);
+                PIN_SLP(gpk2-5, INPUT, DOWN);
+                PIN_SLP(gpk2-6, INPUT, DOWN);
+
+                PIN_SLP(gpk3-0, OUT0, NONE);
+                PIN_SLP(gpk3-1, INPUT, NONE);
+                PIN_SLP(gpk3-2, INPUT, DOWN);
+                PIN_SLP(gpk3-3, INPUT, NONE);
+                PIN_SLP(gpk3-4, INPUT, NONE);
+                PIN_SLP(gpk3-5, INPUT, NONE);
+                PIN_SLP(gpk3-6, INPUT, NONE);
+
+                PIN_SLP(gpl0-0, INPUT, DOWN);
+                PIN_SLP(gpl0-1, INPUT, DOWN);
+                PIN_SLP(gpl0-2, INPUT, DOWN);
+                PIN_SLP(gpl0-3, INPUT, DOWN);
+                PIN_SLP(gpl0-4, PREV, NONE);
+                PIN_SLP(gpl0-6, PREV, NONE);
+
+                PIN_SLP(gpl1-0, INPUT, DOWN);
+                PIN_SLP(gpl1-1, INPUT, DOWN);
+                PIN_SLP(gpl2-0, INPUT, DOWN);
+                PIN_SLP(gpl2-1, INPUT, DOWN);
+                PIN_SLP(gpl2-2, INPUT, DOWN);
+                PIN_SLP(gpl2-3, INPUT, DOWN);
+                PIN_SLP(gpl2-4, INPUT, DOWN);
+                PIN_SLP(gpl2-5, INPUT, DOWN);
+                PIN_SLP(gpl2-6, PREV, NONE);
+                PIN_SLP(gpl2-7, INPUT, DOWN);
+
+                PIN_SLP(gpm0-0, INPUT, DOWN);
+                PIN_SLP(gpm0-1, INPUT, DOWN);
+                PIN_SLP(gpm0-2, INPUT, DOWN);
+                PIN_SLP(gpm0-3, INPUT, DOWN);
+                PIN_SLP(gpm0-4, INPUT, DOWN);
+                PIN_SLP(gpm0-5, INPUT, DOWN);
+                PIN_SLP(gpm0-6, INPUT, DOWN);
+                PIN_SLP(gpm0-7, INPUT, DOWN);
+
+                PIN_SLP(gpm1-0, INPUT, DOWN);
+                PIN_SLP(gpm1-1, INPUT, DOWN);
+                PIN_SLP(gpm1-2, INPUT, NONE);
+                PIN_SLP(gpm1-3, INPUT, NONE);
+                PIN_SLP(gpm1-4, INPUT, NONE);
+                PIN_SLP(gpm1-5, INPUT, NONE);
+                PIN_SLP(gpm1-6, INPUT, DOWN);
+
+                PIN_SLP(gpm2-0, INPUT, NONE);
+                PIN_SLP(gpm2-1, INPUT, NONE);
+                PIN_SLP(gpm2-2, INPUT, DOWN);
+                PIN_SLP(gpm2-3, INPUT, DOWN);
+                PIN_SLP(gpm2-4, INPUT, DOWN);
+
+                PIN_SLP(gpm3-0, PREV, NONE);
+                PIN_SLP(gpm3-1, PREV, NONE);
+                PIN_SLP(gpm3-2, PREV, NONE);
+                PIN_SLP(gpm3-3, OUT1, NONE);
+                PIN_SLP(gpm3-4, INPUT, DOWN);
+                PIN_SLP(gpm3-5, INPUT, DOWN);
+                PIN_SLP(gpm3-6, INPUT, DOWN);
+                PIN_SLP(gpm3-7, INPUT, DOWN);
+
+                PIN_SLP(gpm4-0, INPUT, DOWN);
+                PIN_SLP(gpm4-1, INPUT, DOWN);
+                PIN_SLP(gpm4-2, INPUT, DOWN);
+                PIN_SLP(gpm4-3, INPUT, DOWN);
+                PIN_SLP(gpm4-4, INPUT, DOWN);
+                PIN_SLP(gpm4-5, INPUT, DOWN);
+                PIN_SLP(gpm4-6, INPUT, DOWN);
+                PIN_SLP(gpm4-7, INPUT, DOWN);
+
+                PIN_SLP(gpy0-0, INPUT, DOWN);
+                PIN_SLP(gpy0-1, INPUT, DOWN);
+                PIN_SLP(gpy0-2, INPUT, DOWN);
+                PIN_SLP(gpy0-3, INPUT, DOWN);
+                PIN_SLP(gpy0-4, INPUT, DOWN);
+                PIN_SLP(gpy0-5, INPUT, DOWN);
+
+                PIN_SLP(gpy1-0, INPUT, DOWN);
+                PIN_SLP(gpy1-1, INPUT, DOWN);
+                PIN_SLP(gpy1-2, INPUT, DOWN);
+                PIN_SLP(gpy1-3, INPUT, DOWN);
+
+                PIN_SLP(gpy2-0, PREV, NONE);
+                PIN_SLP(gpy2-1, INPUT, DOWN);
+                PIN_SLP(gpy2-2, INPUT, NONE);
+                PIN_SLP(gpy2-3, INPUT, NONE);
+                PIN_SLP(gpy2-4, INPUT, NONE);
+                PIN_SLP(gpy2-5, INPUT, NONE);
+
+                PIN_SLP(gpy3-0, INPUT, DOWN);
+                PIN_SLP(gpy3-1, INPUT, DOWN);
+                PIN_SLP(gpy3-2, INPUT, DOWN);
+                PIN_SLP(gpy3-3, INPUT, DOWN);
+                PIN_SLP(gpy3-4, INPUT, DOWN);
+                PIN_SLP(gpy3-5, INPUT, DOWN);
+                PIN_SLP(gpy3-6, INPUT, DOWN);
+                PIN_SLP(gpy3-7, INPUT, DOWN);
+
+                PIN_SLP(gpy4-0, INPUT, DOWN);
+                PIN_SLP(gpy4-1, INPUT, DOWN);
+                PIN_SLP(gpy4-2, INPUT, DOWN);
+                PIN_SLP(gpy4-3, INPUT, DOWN);
+                PIN_SLP(gpy4-4, INPUT, DOWN);
+                PIN_SLP(gpy4-5, INPUT, DOWN);
+                PIN_SLP(gpy4-6, INPUT, DOWN);
+                PIN_SLP(gpy4-7, INPUT, DOWN);
+
+                PIN_SLP(gpy5-0, INPUT, DOWN);
+                PIN_SLP(gpy5-1, INPUT, DOWN);
+                PIN_SLP(gpy5-2, INPUT, DOWN);
+                PIN_SLP(gpy5-3, INPUT, DOWN);
+                PIN_SLP(gpy5-4, INPUT, DOWN);
+                PIN_SLP(gpy5-5, INPUT, DOWN);
+                PIN_SLP(gpy5-6, INPUT, DOWN);
+                PIN_SLP(gpy5-7, INPUT, DOWN);
+
+                PIN_SLP(gpy6-0, INPUT, DOWN);
+                PIN_SLP(gpy6-1, INPUT, DOWN);
+                PIN_SLP(gpy6-2, INPUT, DOWN);
+                PIN_SLP(gpy6-3, INPUT, DOWN);
+                PIN_SLP(gpy6-4, INPUT, DOWN);
+                PIN_SLP(gpy6-5, INPUT, DOWN);
+                PIN_SLP(gpy6-6, INPUT, DOWN);
+                PIN_SLP(gpy6-7, INPUT, DOWN);
+        };
+};
+
+&pinctrl_2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&sleep2>;
+
+        sleep2: sleep-states {
+                PIN_SLP(gpz-0, INPUT, DOWN);
+                PIN_SLP(gpz-1, INPUT, DOWN);
+                PIN_SLP(gpz-2, INPUT, DOWN);
+                PIN_SLP(gpz-3, INPUT, DOWN);
+                PIN_SLP(gpz-4, INPUT, DOWN);
+                PIN_SLP(gpz-5, INPUT, DOWN);
+                PIN_SLP(gpz-6, INPUT, DOWN);
+        };
+};
+
+&pinctrl_3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&sleep3>;
+
+        sleep3: sleep-states {
+                PIN_SLP(gpv0-0, INPUT, DOWN);
+                PIN_SLP(gpv0-1, INPUT, DOWN);
+                PIN_SLP(gpv0-2, INPUT, DOWN);
+                PIN_SLP(gpv0-3, INPUT, DOWN);
+                PIN_SLP(gpv0-4, INPUT, DOWN);
+                PIN_SLP(gpv0-5, INPUT, DOWN);
+                PIN_SLP(gpv0-6, INPUT, DOWN);
+                PIN_SLP(gpv0-7, INPUT, DOWN);
+
+                PIN_SLP(gpv1-0, INPUT, DOWN);
+                PIN_SLP(gpv1-1, INPUT, DOWN);
+                PIN_SLP(gpv1-2, INPUT, DOWN);
+                PIN_SLP(gpv1-3, INPUT, DOWN);
+                PIN_SLP(gpv1-4, INPUT, DOWN);
+                PIN_SLP(gpv1-5, INPUT, DOWN);
+                PIN_SLP(gpv1-6, INPUT, DOWN);
+                PIN_SLP(gpv1-7, INPUT, DOWN);
+
+                PIN_SLP(gpv2-0, INPUT, DOWN);
+                PIN_SLP(gpv2-1, INPUT, DOWN);
+                PIN_SLP(gpv2-2, INPUT, DOWN);
+                PIN_SLP(gpv2-3, INPUT, DOWN);
+                PIN_SLP(gpv2-4, INPUT, DOWN);
+                PIN_SLP(gpv2-5, INPUT, DOWN);
+                PIN_SLP(gpv2-6, INPUT, DOWN);
+                PIN_SLP(gpv2-7, INPUT, DOWN);
+
+                PIN_SLP(gpv3-0, INPUT, DOWN);
+                PIN_SLP(gpv3-1, INPUT, DOWN);
+                PIN_SLP(gpv3-2, INPUT, DOWN);
+                PIN_SLP(gpv3-3, INPUT, DOWN);
+                PIN_SLP(gpv3-4, INPUT, DOWN);
+                PIN_SLP(gpv3-5, INPUT, DOWN);
+                PIN_SLP(gpv3-6, INPUT, DOWN);
+                PIN_SLP(gpv3-7, INPUT, DOWN);
+
+                PIN_SLP(gpv4-0, INPUT, DOWN);
+        };
+};
+
+&pwm {
+        pinctrl-0 = <&pwm0_out>;
+        pinctrl-names = "default";
+        samsung,pwm-outputs = <0>;
+        status = "okay";
+};
+
+&rtc {
+        status = "okay";
+        clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
+        clock-names = "rtc", "rtc_src";
+};
+
+&sdhci_2 {
+        bus-width = <4>;
+        cd-gpios = <&gpx3 4 GPIO_ACTIVE_HIGH>;
+        cd-inverted;
+        pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;
+        pinctrl-names = "default";
+        vmmc-supply = <&ldo21_reg>;
+        status = "okay";
+};
+
+&sdhci_3 {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        non-removable;
+        bus-width = <4>;
+
+        mmc-pwrseq = <&wlan_pwrseq>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
+        status = "okay";
+
+        brcmf: wifi@1 {
+                reg = <1>;
+                compatible = "brcm,bcm4329-fmac";
+                interrupt-parent = <&gpx2>;
+                interrupts = <5 IRQ_TYPE_NONE>;
+                interrupt-names = "host-wake";
+        };
+};
+
+&serial_0 {
+        status = "okay";
+};
+
+&serial_1 {
+        status = "okay";
+};
+
+&serial_2 {
+        status = "okay";
+};
+
+&serial_3 {
+        status = "okay";
+};
+
+&spi_1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spi1_bus>;
+        cs-gpios = <&gpb 5 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+
+        s5c73m3_spi: s5c73m3@0 {
+                compatible = "samsung,s5c73m3";
+                spi-max-frequency = <50000000>;
+                reg = <0>;
+                controller-data {
+                        samsung,spi-feedback-delay = <2>;
+                };
+        };
+};
+
+&tmu {
+        vtmu-supply = <&ldo10_reg>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/exynos4412-n710x.dts b/arch/arm/boot/dts/exynos4412-n710x.dts
new file mode 100644
index 000000000000..eb402a0d6651
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-n710x.dts
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+#include "exynos4412-midas.dtsi"
+
+/ {
+        compatible = "samsung,n710x", "samsung,midas", "samsung,exynos4412", "samsung,exynos4";
+        model = "Samsung Galaxy Note 2 (GT-N7100, GT-N7105) based on Exynos4412";
+
+        memory@40000000 {
+                device_type = "memory";
+                reg =  <0x40000000 0x80000000>;
+        };
+
+        /* bootargs are passed in by bootloader */
+
+        regulators {
+                cam_vdda_reg: voltage-regulator-9 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "CAM_SENSOR_CORE_1.2V";
+                        regulator-min-microvolt = <1200000>;
+                        regulator-max-microvolt = <1200000>;
+                        gpio = <&gpm4 1 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+        };
+};
+
+&buck9_reg {
+        maxim,ena-gpios = <&gpm1 0 GPIO_ACTIVE_HIGH>;
+};
+
+&cam_af_reg {
+        gpio = <&gpm1 1 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&cam_io_reg {
+        gpio = <&gpm0 7 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&i2c_3 {
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-slave-addr = <0x10>;
+        samsung,i2c-max-bus-freq = <400000>;
+        pinctrl-0 = <&i2c3_bus>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        mms152-touchscreen@48 {
+                compatible = "melfas,mms152";
+                reg = <0x48>;
+                interrupt-parent = <&gpm2>;
+                interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+                x-size = <720>;
+                y-size = <1280>;
+                avdd-supply = <&ldo23_reg>;
+                vdd-supply = <&ldo24_reg>;
+        };
+};
+
+&ldo13_reg {
+        regulator-name = "VCC_1.8V_LCD";
+        regulator-always-on;
+};
+
+&ldo25_reg {
+        regulator-name = "VCI_3.0V_LCD";
+        regulator-min-microvolt = <3000000>;
+        regulator-max-microvolt = <3000000>;
+};
+
+&s5c73m3 {
+        standby-gpios = <&gpm0 6 GPIO_ACTIVE_LOW>;   /* ISP_STANDBY */
+        vdda-supply = <&cam_vdda_reg>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 556ea78b8e32..d7ad07fd48f9 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -61,12 +61,6 @@
                 reset-gpios = <&gpk1 2 GPIO_ACTIVE_LOW>;
         };
 
-        camera {
-                status = "okay";
-                pinctrl-names = "default";
-                pinctrl-0 = <>;
-        };
-
         fixed-rate-clocks {
                 xxti {
                         compatible = "samsung,clock-xxti";
@@ -142,6 +136,12 @@
         status = "okay";
 };
 
+&camera {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <>;
+};
+
 &clock_audss {
         assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
                         <&clock_audss EXYNOS_MOUT_I2S>,
diff --git a/arch/arm/boot/dts/exynos4412-pinctrl.dtsi b/arch/arm/boot/dts/exynos4412-pinctrl.dtsi
index e8dd5f2d976f..d7d5fdc230d8 100644
--- a/arch/arm/boot/dts/exynos4412-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4412-pinctrl.dtsi
@@ -18,964 +18,962 @@
                 samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_ ##_pull>;       \
         }
 
-/ {
-        pinctrl_0: pinctrl@11400000 {
-                gpa0: gpa0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
+&pinctrl_0 {
+        gpa0: gpa0 {
+                gpio-controller;
+                #gpio-cells = <2>;
 
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpa1: gpa1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpb: gpb {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpc0: gpc0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpc1: gpc1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpd0: gpd0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpd1: gpd1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpf0: gpf0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpf1: gpf1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpf2: gpf2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpf3: gpf3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpj0: gpj0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpj1: gpj1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                uart0_data: uart0-data {
-                        samsung,pins = "gpa0-0", "gpa0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart0_fctl: uart0-fctl {
-                        samsung,pins = "gpa0-2", "gpa0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart1_data: uart1-data {
-                        samsung,pins = "gpa0-4", "gpa0-5";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart1_fctl: uart1-fctl {
-                        samsung,pins = "gpa0-6", "gpa0-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c2_bus: i2c2-bus {
-                        samsung,pins = "gpa0-6", "gpa0-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart2_data: uart2-data {
-                        samsung,pins = "gpa1-0", "gpa1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart2_fctl: uart2-fctl {
-                        samsung,pins = "gpa1-2", "gpa1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart_audio_a: uart-audio-a {
-                        samsung,pins = "gpa1-0", "gpa1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c3_bus: i2c3-bus {
-                        samsung,pins = "gpa1-2", "gpa1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart3_data: uart3-data {
-                        samsung,pins = "gpa1-4", "gpa1-5";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                uart_audio_b: uart-audio-b {
-                        samsung,pins = "gpa1-4", "gpa1-5";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                spi0_bus: spi0-bus {
-                        samsung,pins = "gpb-0", "gpb-2", "gpb-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c4_bus: i2c4-bus {
-                        samsung,pins = "gpb-0", "gpb-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                spi1_bus: spi1-bus {
-                        samsung,pins = "gpb-4", "gpb-6", "gpb-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c5_bus: i2c5-bus {
-                        samsung,pins = "gpb-2", "gpb-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2s1_bus: i2s1-bus {
-                        samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
-                                        "gpc0-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pcm1_bus: pcm1-bus {
-                        samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
-                                        "gpc0-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                ac97_bus: ac97-bus {
-                        samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
-                                        "gpc0-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2s2_bus: i2s2-bus {
-                        samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
-                                        "gpc1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pcm2_bus: pcm2-bus {
-                        samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
-                                        "gpc1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                spdif_bus: spdif-bus {
-                        samsung,pins = "gpc1-0", "gpc1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c6_bus: i2c6-bus {
-                        samsung,pins = "gpc1-3", "gpc1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                spi2_bus: spi2-bus {
-                        samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_5>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pwm0_out: pwm0-out {
-                        samsung,pins = "gpd0-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pwm1_out: pwm1-out {
-                        samsung,pins = "gpd0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_ctrl: lcd-ctrl {
-                        samsung,pins = "gpd0-0", "gpd0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c7_bus: i2c7-bus {
-                        samsung,pins = "gpd0-2", "gpd0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pwm2_out: pwm2-out {
-                        samsung,pins = "gpd0-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pwm3_out: pwm3-out {
-                        samsung,pins = "gpd0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c0_bus: i2c0-bus {
-                        samsung,pins = "gpd1-0", "gpd1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                mipi0_clk: mipi0-clk {
-                        samsung,pins = "gpd1-0", "gpd1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                i2c1_bus: i2c1-bus {
-                        samsung,pins = "gpd1-2", "gpd1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                mipi1_clk: mipi1-clk {
-                        samsung,pins = "gpd1-2", "gpd1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_clk: lcd-clk {
-                        samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_data16: lcd-data-width16 {
-                        samsung,pins = "gpf0-7", "gpf1-0", "gpf1-1", "gpf1-2",
-                                        "gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",
-                                        "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",
-                                        "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_data18: lcd-data-width18 {
-                        samsung,pins = "gpf0-6", "gpf0-7", "gpf1-0", "gpf1-1",
-                                        "gpf1-2", "gpf1-3", "gpf1-6", "gpf1-7",
-                                        "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
-                                        "gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",
-                                        "gpf3-2", "gpf3-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_data24: lcd-data-width24 {
-                        samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",
-                                        "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",
-                                        "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",
-                                        "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
-                                        "gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
-                                        "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                lcd_ldi: lcd-ldi {
-                        samsung,pins = "gpf3-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                cam_port_a_io: cam-port-a-io {
-                        samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
-                                        "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
-                                        "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                cam_port_a_clk_active: cam-port-a-clk-active {
-                        samsung,pins = "gpj1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                cam_port_a_clk_idle: cam-port-a-clk-idle {
-                        samsung,pins = "gpj1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-        };
-
-        pinctrl_1: pinctrl@11000000 {
-                gpk0: gpk0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpk1: gpk1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpk2: gpk2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpk3: gpk3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpl0: gpl0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpl1: gpl1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpl2: gpl2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpm0: gpm0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpm1: gpm1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpm2: gpm2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpm3: gpm3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpm4: gpm4 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpy0: gpy0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy1: gpy1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy2: gpy2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy3: gpy3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy4: gpy4 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy5: gpy5 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpy6: gpy6 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                };
-
-                gpx0: gpx0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        interrupt-parent = <&gic>;
-                        interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-                        #interrupt-cells = <2>;
-                };
-
-                gpx1: gpx1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        interrupt-parent = <&gic>;
-                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                        #interrupt-cells = <2>;
-                };
-
-                gpx2: gpx2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpx3: gpx3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                sd0_clk: sd0-clk {
-                        samsung,pins = "gpk0-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_cmd: sd0-cmd {
-                        samsung,pins = "gpk0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_cd: sd0-cd {
-                        samsung,pins = "gpk0-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_bus1: sd0-bus-width1 {
-                        samsung,pins = "gpk0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_bus4: sd0-bus-width4 {
-                        samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd0_bus8: sd0-bus-width8 {
-                        samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_clk: sd4-clk {
-                        samsung,pins = "gpk0-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_cmd: sd4-cmd {
-                        samsung,pins = "gpk0-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_cd: sd4-cd {
-                        samsung,pins = "gpk0-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_bus1: sd4-bus-width1 {
-                        samsung,pins = "gpk0-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_bus4: sd4-bus-width4 {
-                        samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd4_bus8: sd4-bus-width8 {
-                        samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_clk: sd1-clk {
-                        samsung,pins = "gpk1-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_cmd: sd1-cmd {
-                        samsung,pins = "gpk1-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_cd: sd1-cd {
-                        samsung,pins = "gpk1-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_bus1: sd1-bus-width1 {
-                        samsung,pins = "gpk1-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd1_bus4: sd1-bus-width4 {
-                        samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_clk: sd2-clk {
-                        samsung,pins = "gpk2-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_cmd: sd2-cmd {
-                        samsung,pins = "gpk2-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_cd: sd2-cd {
-                        samsung,pins = "gpk2-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_bus1: sd2-bus-width1 {
-                        samsung,pins = "gpk2-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_bus4: sd2-bus-width4 {
-                        samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd2_bus8: sd2-bus-width8 {
-                        samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_clk: sd3-clk {
-                        samsung,pins = "gpk3-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_cmd: sd3-cmd {
-                        samsung,pins = "gpk3-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_cd: sd3-cd {
-                        samsung,pins = "gpk3-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_bus1: sd3-bus-width1 {
-                        samsung,pins = "gpk3-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                sd3_bus4: sd3-bus-width4 {
-                        samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                cam_port_b_io: cam-port-b-io {
-                        samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
-                                        "gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
-                                        "gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                cam_port_b_clk_active: cam-port-b-clk-active {
-                        samsung,pins = "gpm2-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
-                };
-
-                cam_port_b_clk_idle: cam-port-b-clk-idle {
-                        samsung,pins = "gpm2-2";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint0: ext-int0 {
-                        samsung,pins = "gpx0-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint8: ext-int8 {
-                        samsung,pins = "gpx1-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint15: ext-int15 {
-                        samsung,pins = "gpx1-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint16: ext-int16 {
-                        samsung,pins = "gpx2-0";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                eint31: ext-int31 {
-                        samsung,pins = "gpx3-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                fimc_is_i2c0: fimc-is-i2c0 {
-                        samsung,pins = "gpm4-0", "gpm4-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                fimc_is_i2c1: fimc-is-i2c1 {
-                        samsung,pins = "gpm4-2", "gpm4-3";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                fimc_is_uart: fimc-is-uart {
-                        samsung,pins = "gpm3-5", "gpm3-7";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                hdmi_cec: hdmi-cec {
-                        samsung,pins = "gpx3-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-        };
-
-        pinctrl_2: pinctrl@3860000 {
-                gpz: gpz {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                i2s0_bus: i2s0-bus {
-                        samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
-                                        "gpz-4", "gpz-5", "gpz-6";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-
-                pcm0_bus: pcm0-bus {
-                        samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
-                                        "gpz-4";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
-        };
-
-        pinctrl_3: pinctrl@106e0000 {
-                gpv0: gpv0 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpv1: gpv1 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpv2: gpv2 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpv3: gpv3 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                gpv4: gpv4 {
-                        gpio-controller;
-                        #gpio-cells = <2>;
-
-                        interrupt-controller;
-                        #interrupt-cells = <2>;
-                };
-
-                c2c_bus: c2c-bus {
-                        samsung,pins = "gpv0-0", "gpv0-1", "gpv0-2", "gpv0-3",
-                                        "gpv0-4", "gpv0-5", "gpv0-6", "gpv0-7",
-                                        "gpv1-0", "gpv1-1", "gpv1-2", "gpv1-3",
-                                        "gpv1-4", "gpv1-5", "gpv1-6", "gpv1-7",
-                                        "gpv2-0", "gpv2-1", "gpv2-2", "gpv2-3",
-                                        "gpv2-4", "gpv2-5", "gpv2-6", "gpv2-7",
-                                        "gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",
-                                        "gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7",
-                                        "gpv4-0", "gpv4-1";
-                        samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                        samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-                        samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-                };
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpa1: gpa1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpb: gpb {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpc0: gpc0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpc1: gpc1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpd0: gpd0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpd1: gpd1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf0: gpf0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf1: gpf1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf2: gpf2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf3: gpf3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpj0: gpj0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpj1: gpj1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        uart0_data: uart0-data {
+                samsung,pins = "gpa0-0", "gpa0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart0_fctl: uart0-fctl {
+                samsung,pins = "gpa0-2", "gpa0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart1_data: uart1-data {
+                samsung,pins = "gpa0-4", "gpa0-5";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart1_fctl: uart1-fctl {
+                samsung,pins = "gpa0-6", "gpa0-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c2_bus: i2c2-bus {
+                samsung,pins = "gpa0-6", "gpa0-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart2_data: uart2-data {
+                samsung,pins = "gpa1-0", "gpa1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart2_fctl: uart2-fctl {
+                samsung,pins = "gpa1-2", "gpa1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart_audio_a: uart-audio-a {
+                samsung,pins = "gpa1-0", "gpa1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c3_bus: i2c3-bus {
+                samsung,pins = "gpa1-2", "gpa1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart3_data: uart3-data {
+                samsung,pins = "gpa1-4", "gpa1-5";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        uart_audio_b: uart-audio-b {
+                samsung,pins = "gpa1-4", "gpa1-5";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        spi0_bus: spi0-bus {
+                samsung,pins = "gpb-0", "gpb-2", "gpb-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c4_bus: i2c4-bus {
+                samsung,pins = "gpb-0", "gpb-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        spi1_bus: spi1-bus {
+                samsung,pins = "gpb-4", "gpb-6", "gpb-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c5_bus: i2c5-bus {
+                samsung,pins = "gpb-2", "gpb-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2s1_bus: i2s1-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pcm1_bus: pcm1-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        ac97_bus: ac97-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2s2_bus: i2s2-bus {
+                samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
+                                "gpc1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pcm2_bus: pcm2-bus {
+                samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
+                                "gpc1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        spdif_bus: spdif-bus {
+                samsung,pins = "gpc1-0", "gpc1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c6_bus: i2c6-bus {
+                samsung,pins = "gpc1-3", "gpc1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        spi2_bus: spi2-bus {
+                samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_5>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pwm0_out: pwm0-out {
+                samsung,pins = "gpd0-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pwm1_out: pwm1-out {
+                samsung,pins = "gpd0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_ctrl: lcd-ctrl {
+                samsung,pins = "gpd0-0", "gpd0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c7_bus: i2c7-bus {
+                samsung,pins = "gpd0-2", "gpd0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pwm2_out: pwm2-out {
+                samsung,pins = "gpd0-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pwm3_out: pwm3-out {
+                samsung,pins = "gpd0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c0_bus: i2c0-bus {
+                samsung,pins = "gpd1-0", "gpd1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        mipi0_clk: mipi0-clk {
+                samsung,pins = "gpd1-0", "gpd1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        i2c1_bus: i2c1-bus {
+                samsung,pins = "gpd1-2", "gpd1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        mipi1_clk: mipi1-clk {
+                samsung,pins = "gpd1-2", "gpd1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_clk: lcd-clk {
+                samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_data16: lcd-data-width16 {
+                samsung,pins = "gpf0-7", "gpf1-0", "gpf1-1", "gpf1-2",
+                                "gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0",
+                                "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7",
+                                "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_data18: lcd-data-width18 {
+                samsung,pins = "gpf0-6", "gpf0-7", "gpf1-0", "gpf1-1",
+                                "gpf1-2", "gpf1-3", "gpf1-6", "gpf1-7",
+                                "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
+                                "gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1",
+                                "gpf3-2", "gpf3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_data24: lcd-data-width24 {
+                samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",
+                                "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",
+                                "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",
+                                "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
+                                "gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
+                                "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        lcd_ldi: lcd-ldi {
+                samsung,pins = "gpf3-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        cam_port_a_io: cam-port-a-io {
+                samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
+                                "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
+                                "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        cam_port_a_clk_active: cam-port-a-clk-active {
+                samsung,pins = "gpj1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        cam_port_a_clk_idle: cam-port-a-clk-idle {
+                samsung,pins = "gpj1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+};
+
+&pinctrl_1 {
+        gpk0: gpk0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpk1: gpk1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpk2: gpk2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpk3: gpk3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpl0: gpl0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpl1: gpl1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpl2: gpl2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpm0: gpm0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpm1: gpm1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpm2: gpm2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpm3: gpm3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpm4: gpm4 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpy0: gpy0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy1: gpy1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy2: gpy2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy3: gpy3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy4: gpy4 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy5: gpy5 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpy6: gpy6 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gpx0: gpx0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                interrupt-parent = <&gic>;
+                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                #interrupt-cells = <2>;
+        };
+
+        gpx1: gpx1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                interrupt-parent = <&gic>;
+                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                #interrupt-cells = <2>;
+        };
+
+        gpx2: gpx2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpx3: gpx3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        sd0_clk: sd0-clk {
+                samsung,pins = "gpk0-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_cmd: sd0-cmd {
+                samsung,pins = "gpk0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_cd: sd0-cd {
+                samsung,pins = "gpk0-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_bus1: sd0-bus-width1 {
+                samsung,pins = "gpk0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_bus4: sd0-bus-width4 {
+                samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd0_bus8: sd0-bus-width8 {
+                samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_clk: sd4-clk {
+                samsung,pins = "gpk0-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_cmd: sd4-cmd {
+                samsung,pins = "gpk0-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_cd: sd4-cd {
+                samsung,pins = "gpk0-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_bus1: sd4-bus-width1 {
+                samsung,pins = "gpk0-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_bus4: sd4-bus-width4 {
+                samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd4_bus8: sd4-bus-width8 {
+                samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_clk: sd1-clk {
+                samsung,pins = "gpk1-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_cmd: sd1-cmd {
+                samsung,pins = "gpk1-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_cd: sd1-cd {
+                samsung,pins = "gpk1-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_bus1: sd1-bus-width1 {
+                samsung,pins = "gpk1-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd1_bus4: sd1-bus-width4 {
+                samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_clk: sd2-clk {
+                samsung,pins = "gpk2-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_cmd: sd2-cmd {
+                samsung,pins = "gpk2-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_cd: sd2-cd {
+                samsung,pins = "gpk2-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_bus1: sd2-bus-width1 {
+                samsung,pins = "gpk2-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_bus4: sd2-bus-width4 {
+                samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd2_bus8: sd2-bus-width8 {
+                samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_clk: sd3-clk {
+                samsung,pins = "gpk3-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_cmd: sd3-cmd {
+                samsung,pins = "gpk3-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_cd: sd3-cd {
+                samsung,pins = "gpk3-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_bus1: sd3-bus-width1 {
+                samsung,pins = "gpk3-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        sd3_bus4: sd3-bus-width4 {
+                samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        cam_port_b_io: cam-port-b-io {
+                samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
+                                "gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
+                                "gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        cam_port_b_clk_active: cam-port-b-clk-active {
+                samsung,pins = "gpm2-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV4>;
+        };
+
+        cam_port_b_clk_idle: cam-port-b-clk-idle {
+                samsung,pins = "gpm2-2";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint0: ext-int0 {
+                samsung,pins = "gpx0-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint8: ext-int8 {
+                samsung,pins = "gpx1-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint15: ext-int15 {
+                samsung,pins = "gpx1-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint16: ext-int16 {
+                samsung,pins = "gpx2-0";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        eint31: ext-int31 {
+                samsung,pins = "gpx3-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        fimc_is_i2c0: fimc-is-i2c0 {
+                samsung,pins = "gpm4-0", "gpm4-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        fimc_is_i2c1: fimc-is-i2c1 {
+                samsung,pins = "gpm4-2", "gpm4-3";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        fimc_is_uart: fimc-is-uart {
+                samsung,pins = "gpm3-5", "gpm3-7";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        hdmi_cec: hdmi-cec {
+                samsung,pins = "gpx3-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+};
+
+&pinctrl_2 {
+        gpz: gpz {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        i2s0_bus: i2s0-bus {
+                samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
+                                "gpz-4", "gpz-5", "gpz-6";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+
+        pcm0_bus: pcm0-bus {
+                samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3",
+                                "gpz-4";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
+        };
+};
+
+&pinctrl_3 {
+        gpv0: gpv0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpv1: gpv1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpv2: gpv2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpv3: gpv3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpv4: gpv4 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        c2c_bus: c2c-bus {
+                samsung,pins = "gpv0-0", "gpv0-1", "gpv0-2", "gpv0-3",
+                                "gpv0-4", "gpv0-5", "gpv0-6", "gpv0-7",
+                                "gpv1-0", "gpv1-1", "gpv1-2", "gpv1-3",
+                                "gpv1-4", "gpv1-5", "gpv1-6", "gpv1-7",
+                                "gpv2-0", "gpv2-1", "gpv2-2", "gpv2-3",
+                                "gpv2-4", "gpv2-5", "gpv2-6", "gpv2-7",
+                                "gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3",
+                                "gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7",
+                                "gpv4-0", "gpv4-1";
+                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
+                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
         };
 };
diff --git a/arch/arm/boot/dts/exynos4412-tiny4412.dts b/arch/arm/boot/dts/exynos4412-tiny4412.dts
index 5504398e6e37..01f37b5ac9c4 100644
--- a/arch/arm/boot/dts/exynos4412-tiny4412.dts
+++ b/arch/arm/boot/dts/exynos4412-tiny4412.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * FriendlyARM's Exynos4412 based TINY4412 board device tree source
  *
@@ -5,11 +6,7 @@
  *
  * Device tree source file for FriendlyARM's TINY4412 board which is based on
  * Samsung's Exynos4412 SoC.
- *
- * 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 "exynos4412.dtsi"
diff --git a/arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi b/arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi
index e3f7934d19d0..489b58c619ee 100644
--- a/arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi
+++ b/arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device tree sources for Exynos4412 TMU sensor configuration
  *
  * Copyright (c) 2014 Lukasz Majewski <l.majewski@samsung.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.
- *
  */
 
 #include <dt-bindings/thermal/thermal_exynos.h>
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index f285790e8e04..327ee980d3a5 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Samsung's Exynos4412 based Trats 2 board device tree source
  *
@@ -6,30 +7,14 @@
  *
  * Device tree source file for Samsung's Trats 2 board which is based on
  * Samsung's Exynos4412 SoC.
- *
- * 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 "exynos4412.dtsi"
-#include "exynos4412-ppmu-common.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/clock/maxim,max77686.h>
-#include <dt-bindings/pinctrl/samsung.h>
+#include "exynos4412-galaxy-s3.dtsi"
 
 / {
         model = "Samsung Trats 2 based on Exynos4412";
-        compatible = "samsung,trats2", "samsung,exynos4412", "samsung,exynos4";
-
-        aliases {
-                i2c9 = &i2c_ak8975;
-                i2c10 = &i2c_cm36651;
-                i2c11 = &i2c_max77693;
-                i2c12 = &i2c_max77693_fuel;
-        };
+        compatible = "samsung,trats2", "samsung,midas", "samsung,exynos4412", "samsung,exynos4";
 
         memory@40000000 {
                 device_type = "memory";
@@ -38,1378 +23,5 @@
 
         chosen {
                 bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
-                stdout-path = &serial_2;
-        };
-
-        firmware@204f000 {
-                compatible = "samsung,secure-firmware";
-                reg = <0x0204F000 0x1000>;
-        };
-
-        fixed-rate-clocks {
-                xxti {
-                        compatible = "samsung,clock-xxti", "fixed-clock";
-                        clock-frequency = <0>;
-                };
-
-                xusbxti {
-                        compatible = "samsung,clock-xusbxti", "fixed-clock";
-                        clock-frequency = <24000000>;
-                };
-        };
-
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                cam_io_reg: voltage-regulator-1 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "CAM_SENSOR_A";
-                        regulator-min-microvolt = <2800000>;
-                        regulator-max-microvolt = <2800000>;
-                        gpio = <&gpm0 2 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
-
-                lcd_vdd3_reg: voltage-regulator-2 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "LCD_VDD_2.2V";
-                        regulator-min-microvolt = <2200000>;
-                        regulator-max-microvolt = <2200000>;
-                        gpio = <&gpc0 1 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
-
-                cam_af_reg: voltage-regulator-3 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "CAM_AF";
-                        regulator-min-microvolt = <2800000>;
-                        regulator-max-microvolt = <2800000>;
-                        gpio = <&gpm0 4 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
-
-                ps_als_reg: voltage-regulator-5 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "LED_A_3.0V";
-                        regulator-min-microvolt = <3000000>;
-                        regulator-max-microvolt = <3000000>;
-                        gpio = <&gpj0 5 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
-
-                vsil12: voltage-regulator-6 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "VSIL_1.2V";
-                        regulator-min-microvolt = <1200000>;
-                        regulator-max-microvolt = <1200000>;
-                        gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                        vin-supply = <&buck7_reg>;
-                };
-
-                vcc33mhl: voltage-regulator-7 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "VCC_3.3_MHL";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
-
-                vcc18mhl: voltage-regulator-8 {
-                        compatible = "regulator-fixed";
-                        regulator-name = "VCC_1.8_MHL";
-                        regulator-min-microvolt = <1800000>;
-                        regulator-max-microvolt = <1800000>;
-                        gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
-        };
-
-        gpio-keys {
-                compatible = "gpio-keys";
-
-                key-down {
-                        gpios = <&gpx3 3 GPIO_ACTIVE_LOW>;
-                        linux,code = <114>;
-                        label = "volume down";
-                        debounce-interval = <10>;
-                };
-
-                key-up {
-                        gpios = <&gpx2 2 GPIO_ACTIVE_LOW>;
-                        linux,code = <115>;
-                        label = "volume up";
-                        debounce-interval = <10>;
-                };
-
-                key-power {
-                        gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
-                        linux,code = <116>;
-                        label = "power";
-                        debounce-interval = <10>;
-                        wakeup-source;
-                };
-
-                key-ok {
-                        gpios = <&gpx0 1 GPIO_ACTIVE_LOW>;
-                        linux,code = <139>;
-                        label = "ok";
-                        debounce-inteval = <10>;
-                        wakeup-source;
-                };
-        };
-
-        i2c_max77693: i2c-gpio-1 {
-                compatible = "i2c-gpio";
-                gpios = <&gpm2 0 GPIO_ACTIVE_HIGH>, <&gpm2 1 GPIO_ACTIVE_HIGH>;
-                i2c-gpio,delay-us = <2>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "okay";
-
-                max77693@66 {
-                        compatible = "maxim,max77693";
-                        interrupt-parent = <&gpx1>;
-                        interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
-                        reg = <0x66>;
-
-                        regulators {
-                                esafeout1_reg: ESAFEOUT1 {
-                                        regulator-name = "ESAFEOUT1";
-                                };
-                                esafeout2_reg: ESAFEOUT2 {
-                                        regulator-name = "ESAFEOUT2";
-                                };
-                                charger_reg: CHARGER {
-                                        regulator-name = "CHARGER";
-                                        regulator-min-microamp = <60000>;
-                                        regulator-max-microamp = <2580000>;
-                                };
-                        };
-
-                        max77693_haptic {
-                                compatible = "maxim,max77693-haptic";
-                                haptic-supply = <&ldo26_reg>;
-                                pwms = <&pwm 0 38022 0>;
-                        };
-
-                        charger {
-                                compatible = "maxim,max77693-charger";
-
-                                maxim,constant-microvolt = <4350000>;
-                                maxim,min-system-microvolt = <3600000>;
-                                maxim,thermal-regulation-celsius = <100>;
-                                maxim,battery-overcurrent-microamp = <3500000>;
-                                maxim,charge-input-threshold-microvolt = <4300000>;
-                        };
-                };
-        };
-
-        i2c_max77693_fuel: i2c-gpio-3 {
-                compatible = "i2c-gpio";
-                gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>, <&gpf1 4 GPIO_ACTIVE_HIGH>;
-                i2c-gpio,delay-us = <2>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "okay";
-
-                max77693-fuel-gauge@36 {
-                        compatible = "maxim,max17047";
-                        interrupt-parent = <&gpx2>;
-                        interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
-                        reg = <0x36>;
-
-                        maxim,over-heat-temp = <700>;
-                        maxim,over-volt = <4500>;
-                };
-        };
-
-        i2c_ak8975: i2c-gpio-0 {
-                compatible = "i2c-gpio";
-                gpios = <&gpy2 4 GPIO_ACTIVE_HIGH>, <&gpy2 5 GPIO_ACTIVE_HIGH>;
-                i2c-gpio,delay-us = <2>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "okay";
-
-                ak8975@c {
-                        compatible = "asahi-kasei,ak8975";
-                        reg = <0x0c>;
-                        gpios = <&gpj0 7 GPIO_ACTIVE_HIGH>;
-                };
-        };
-
-        i2c_cm36651: i2c-gpio-2 {
-                compatible = "i2c-gpio";
-                gpios = <&gpf0 0 GPIO_ACTIVE_LOW>, <&gpf0 1 GPIO_ACTIVE_LOW>;
-                i2c-gpio,delay-us = <2>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                cm36651@18 {
-                        compatible = "capella,cm36651";
-                        reg = <0x18>;
-                        interrupt-parent = <&gpx0>;
-                        interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
-                        vled-supply = <&ps_als_reg>;
-                };
-        };
-
-        i2c-mhl {
-                compatible = "i2c-gpio";
-                gpios = <&gpf0 4 GPIO_ACTIVE_HIGH>, <&gpf0 6 GPIO_ACTIVE_HIGH>;
-                i2c-gpio,delay-us = <100>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                pinctrl-0 = <&i2c_mhl_bus>;
-                pinctrl-names = "default";
-                status = "okay";
-
-                sii9234: hdmi-bridge@39 {
-                        compatible = "sil,sii9234";
-                        avcc33-supply = <&vcc33mhl>;
-                        iovcc18-supply = <&vcc18mhl>;
-                        avcc12-supply = <&vsil12>;
-                        cvcc12-supply = <&vsil12>;
-                        reset-gpios = <&gpf3 4 GPIO_ACTIVE_LOW>;
-                        interrupt-parent = <&gpf3>;
-                        interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
-                        reg = <0x39>;
-
-                        port {
-                                mhl_to_hdmi: endpoint {
-                                        remote-endpoint = <&hdmi_to_mhl>;
-                                };
-                        };
-                };
-        };
-
-        camera: camera {
-                pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>;
-                pinctrl-names = "default";
-                status = "okay";
-                assigned-clocks = <&clock CLK_MOUT_CAM0>,
-                                  <&clock CLK_MOUT_CAM1>;
-                assigned-clock-parents = <&clock CLK_XUSBXTI>,
-                                         <&clock CLK_XUSBXTI>;
-
-
-        };
-
-        wlan_pwrseq: sdhci3-pwrseq {
-                compatible = "mmc-pwrseq-simple";
-                reset-gpios = <&gpj0 0 GPIO_ACTIVE_LOW>;
-                clocks = <&max77686 MAX77686_CLK_PMIC>;
-                clock-names = "ext_clock";
-        };
-
-        sound {
-                compatible = "samsung,trats2-audio";
-                samsung,i2s-controller = <&i2s0>;
-                samsung,model = "Trats2";
-                samsung,audio-codec = <&wm1811>;
-                samsung,audio-routing =
-                        "SPK", "SPKOUTLN",
-                        "SPK", "SPKOUTLP",
-                        "SPK", "SPKOUTRN",
-                        "SPK", "SPKOUTRP";
-        };
-
-        thermistor-ap {
-                compatible = "murata,ncp15wb473";
-                pullup-uv = <1800000>;   /* VCC_1.8V_AP */
-                pullup-ohm = <100000>;   /* 100K */
-                pulldown-ohm = <100000>; /* 100K */
-                io-channels = <&adc 1>;  /* AP temperature */
-        };
-
-        thermistor-battery {
-                compatible = "murata,ncp15wb473";
-                pullup-uv = <1800000>;   /* VCC_1.8V_AP */
-                pullup-ohm = <100000>;   /* 100K */
-                pulldown-ohm = <100000>; /* 100K */
-                io-channels = <&adc 2>;  /* Battery temperature */
-        };
-
-        thermal-zones {
-                cpu_thermal: cpu-thermal {
-                        cooling-maps {
-                                map0 {
-                                     /* Corresponds to 800MHz at freq_table */
-                                     cooling-device = <&cpu0 7 7>;
-                                };
-                                map1 {
-                                     /* Corresponds to 200MHz at freq_table */
-                                     cooling-device = <&cpu0 13 13>;
-                               };
-                       };
-                };
-        };
-};
-
-&adc {
-        vdd-supply = <&ldo3_reg>;
-        status = "okay";
-};
-
-&bus_dmc {
-        devfreq-events = <&ppmu_dmc0_3>, <&ppmu_dmc1_3>;
-        vdd-supply = <&buck1_reg>;
-        status = "okay";
-};
-
-&bus_acp {
-        devfreq = <&bus_dmc>;
-        status = "okay";
-};
-
-&bus_c2c {
-        devfreq = <&bus_dmc>;
-        status = "okay";
-};
-
-&bus_leftbus {
-        devfreq-events = <&ppmu_leftbus_3>, <&ppmu_rightbus_3>;
-        vdd-supply = <&buck3_reg>;
-        status = "okay";
-};
-
-&bus_rightbus {
-        devfreq = <&bus_leftbus>;
-        status = "okay";
-};
-
-&bus_display {
-        devfreq = <&bus_leftbus>;
-        status = "okay";
-};
-
-&bus_fsys {
-        devfreq = <&bus_leftbus>;
-        status = "okay";
-};
-
-&bus_peri {
-        devfreq = <&bus_leftbus>;
-        status = "okay";
-};
-
-&bus_mfc {
-        devfreq = <&bus_leftbus>;
-        status = "okay";
-};
-
-&cpu0 {
-        cpu0-supply = <&buck2_reg>;
-};
-
-&csis_0 {
-        status = "okay";
-        vddcore-supply = <&ldo8_reg>;
-        vddio-supply = <&ldo10_reg>;
-        assigned-clocks = <&clock CLK_MOUT_CSIS0>,
-                        <&clock CLK_SCLK_CSIS0>;
-        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
-        assigned-clock-rates = <0>, <176000000>;
-
-        /* Camera C (3) MIPI CSI-2 (CSIS0) */
-        port@3 {
-                reg = <3>;
-                csis0_ep: endpoint {
-                        remote-endpoint = <&s5c73m3_ep>;
-                        data-lanes = <1 2 3 4>;
-                        samsung,csis-hs-settle = <12>;
-                };
-        };
-};
-
-&csis_1 {
-        status = "okay";
-        vddcore-supply = <&ldo8_reg>;
-        vddio-supply = <&ldo10_reg>;
-        assigned-clocks = <&clock CLK_MOUT_CSIS1>,
-                        <&clock CLK_SCLK_CSIS1>;
-        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
-        assigned-clock-rates = <0>, <176000000>;
-
-        /* Camera D (4) MIPI CSI-2 (CSIS1) */
-        port@4 {
-                reg = <4>;
-                csis1_ep: endpoint {
-                        remote-endpoint = <&is_s5k6a3_ep>;
-                        data-lanes = <1>;
-                        samsung,csis-hs-settle = <18>;
-                        samsung,csis-wclk;
-                };
-        };
-};
-
-&dsi_0 {
-        vddcore-supply = <&ldo8_reg>;
-        vddio-supply = <&ldo10_reg>;
-        samsung,burst-clock-frequency = <500000000>;
-        samsung,esc-clock-frequency = <20000000>;
-        samsung,pll-clock-frequency = <24000000>;
-        status = "okay";
-
-        panel@0 {
-                compatible = "samsung,s6e8aa0";
-                reg = <0>;
-                vdd3-supply = <&lcd_vdd3_reg>;
-                vci-supply = <&ldo25_reg>;
-                reset-gpios = <&gpf2 1 GPIO_ACTIVE_HIGH>;
-                power-on-delay= <50>;
-                reset-delay = <100>;
-                init-delay = <100>;
-                flip-horizontal;
-                flip-vertical;
-                panel-width-mm = <58>;
-                panel-height-mm = <103>;
-
-                display-timings {
-                        timing-0 {
-                                clock-frequency = <57153600>;
-                                hactive = <720>;
-                                vactive = <1280>;
-                                hfront-porch = <5>;
-                                hback-porch = <5>;
-                                hsync-len = <5>;
-                                vfront-porch = <13>;
-                                vback-porch = <1>;
-                                vsync-len = <2>;
-                        };
-                };
-        };
-};
-
-&exynos_usbphy {
-        vbus-supply = <&esafeout1_reg>;
-        status = "okay";
-};
-
-&fimc_0 {
-        status = "okay";
-        assigned-clocks = <&clock CLK_MOUT_FIMC0>,
-                        <&clock CLK_SCLK_FIMC0>;
-        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
-        assigned-clock-rates = <0>, <176000000>;
-};
-
-&fimc_1 {
-        status = "okay";
-        assigned-clocks = <&clock CLK_MOUT_FIMC1>,
-                        <&clock CLK_SCLK_FIMC1>;
-        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
-        assigned-clock-rates = <0>, <176000000>;
-};
-
-&fimc_2 {
-        status = "okay";
-        assigned-clocks = <&clock CLK_MOUT_FIMC2>,
-                        <&clock CLK_SCLK_FIMC2>;
-        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
-        assigned-clock-rates = <0>, <176000000>;
-};
-
-&fimc_3 {
-        status = "okay";
-        assigned-clocks = <&clock CLK_MOUT_FIMC3>,
-                        <&clock CLK_SCLK_FIMC3>;
-        assigned-clock-parents = <&clock CLK_MOUT_MPLL_USER_T>;
-        assigned-clock-rates = <0>, <176000000>;
-};
-
-&fimc_is {
-        pinctrl-0 = <&fimc_is_uart>;
-        pinctrl-names = "default";
-        status = "okay";
-
-        i2c1_isp: i2c-isp@12140000 {
-                pinctrl-0 = <&fimc_is_i2c1>;
-                pinctrl-names = "default";
-
-                s5k6a3@10 {
-                        compatible = "samsung,s5k6a3";
-                        reg = <0x10>;
-                        svdda-supply = <&cam_io_reg>;
-                        svddio-supply = <&ldo19_reg>;
-                        afvdd-supply = <&ldo19_reg>;
-                        clock-frequency = <24000000>;
-                        /* CAM_B_CLKOUT */
-                        clocks = <&camera 1>;
-                        clock-names = "extclk";
-                        samsung,camclk-out = <1>;
-                        gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>;
-
-                        port {
-                                is_s5k6a3_ep: endpoint {
-                                        remote-endpoint = <&csis1_ep>;
-                                        data-lanes = <1>;
-                                };
-                        };
-                };
-        };
-};
-
-&fimc_lite_0 {
-        status = "okay";
-};
-
-&fimc_lite_1 {
-        status = "okay";
-};
-
-&fimd {
-        status = "okay";
-};
-
-&hdmi {
-        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&hdmi_hpd>;
-        vdd-supply = <&ldo3_reg>;
-        vdd_osc-supply = <&ldo4_reg>;
-        vdd_pll-supply = <&ldo3_reg>;
-        ddc = <&i2c_5>;
-        status = "okay";
-
-        ports {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                port@1 {
-                        reg = <1>;
-                        hdmi_to_mhl: endpoint {
-                                remote-endpoint = <&mhl_to_hdmi>;
-                        };
-                };
-        };
-};
-
-&hsotg {
-        vusb_d-supply = <&ldo15_reg>;
-        vusb_a-supply = <&ldo12_reg>;
-        dr_mode = "peripheral";
-        status = "okay";
-};
-
-&i2c_0 {
-        samsung,i2c-sda-delay = <100>;
-        samsung,i2c-slave-addr = <0x10>;
-        samsung,i2c-max-bus-freq = <400000>;
-        pinctrl-0 = <&i2c0_bus>;
-        pinctrl-names = "default";
-        status = "okay";
-
-        s5c73m3@3c {
-                compatible = "samsung,s5c73m3";
-                reg = <0x3c>;
-                standby-gpios = <&gpm0 1 GPIO_ACTIVE_LOW>;   /* ISP_STANDBY */
-                xshutdown-gpios = <&gpf1 3 GPIO_ACTIVE_LOW>; /* ISP_RESET */
-                vdd-int-supply = <&buck9_reg>;
-                vddio-cis-supply = <&ldo9_reg>;
-                vdda-supply = <&ldo17_reg>;
-                vddio-host-supply = <&ldo18_reg>;
-                vdd-af-supply = <&cam_af_reg>;
-                vdd-reg-supply = <&cam_io_reg>;
-                clock-frequency = <24000000>;
-                /* CAM_A_CLKOUT */
-                clocks = <&camera 0>;
-                clock-names = "cis_extclk";
-                port {
-                        s5c73m3_ep: endpoint {
-                                remote-endpoint = <&csis0_ep>;
-                                data-lanes = <1 2 3 4>;
-                        };
-                };
-        };
-};
-
-&i2c_3 {
-        samsung,i2c-sda-delay = <100>;
-        samsung,i2c-slave-addr = <0x10>;
-        samsung,i2c-max-bus-freq = <400000>;
-        pinctrl-0 = <&i2c3_bus>;
-        pinctrl-names = "default";
-        status = "okay";
-
-        mms114-touchscreen@48 {
-                compatible = "melfas,mms114";
-                reg = <0x48>;
-                interrupt-parent = <&gpm2>;
-                interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
-                x-size = <720>;
-                y-size = <1280>;
-                avdd-supply = <&ldo23_reg>;
-                vdd-supply = <&ldo24_reg>;
-        };
-};
-
-&i2c_4 {
-        samsung,i2c-sda-delay = <100>;
-        samsung,i2c-slave-addr = <0x10>;
-        samsung,i2c-max-bus-freq = <100000>;
-        pinctrl-0 = <&i2c4_bus>;
-        pinctrl-names = "default";
-        status = "okay";
-
-        wm1811: wm1811@1a {
-                compatible = "wlf,wm1811";
-                reg = <0x1a>;
-                clocks = <&pmu_system_controller 0>;
-                clock-names = "MCLK1";
-                DCVDD-supply = <&ldo3_reg>;
-                DBVDD1-supply = <&ldo3_reg>;
-                wlf,ldo1ena = <&gpj0 4 0>;
         };
 };
-
-&i2c_5 {
-        status = "okay";
-};
-
-&i2c_7 {
-        samsung,i2c-sda-delay = <100>;
-        samsung,i2c-slave-addr = <0x10>;
-        samsung,i2c-max-bus-freq = <100000>;
-        pinctrl-0 = <&i2c7_bus>;
-        pinctrl-names = "default";
-        status = "okay";
-
-        max77686: max77686_pmic@9 {
-                compatible = "maxim,max77686";
-                interrupt-parent = <&gpx0>;
-                interrupts = <7 IRQ_TYPE_NONE>;
-                reg = <0x09>;
-                #clock-cells = <1>;
-
-                voltage-regulators {
-                        ldo1_reg: LDO1 {
-                                regulator-name = "VALIVE_1.0V_AP";
-                                regulator-min-microvolt = <1000000>;
-                                regulator-max-microvolt = <1000000>;
-                                regulator-always-on;
-                        };
-
-                        ldo2_reg: LDO2 {
-                                regulator-name = "VM1M2_1.2V_AP";
-                                regulator-min-microvolt = <1200000>;
-                                regulator-max-microvolt = <1200000>;
-                                regulator-always-on;
-                                regulator-state-mem {
-                                        regulator-on-in-suspend;
-                                };
-                        };
-
-                        ldo3_reg: LDO3 {
-                                regulator-name = "VCC_1.8V_AP";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                                regulator-always-on;
-                        };
-
-                        ldo4_reg: LDO4 {
-                                regulator-name = "VCC_2.8V_AP";
-                                regulator-min-microvolt = <2800000>;
-                                regulator-max-microvolt = <2800000>;
-                                regulator-always-on;
-                        };
-
-                        ldo5_reg: LDO5 {
-                                regulator-name = "VCC_1.8V_IO";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                                regulator-always-on;
-                        };
-
-                        ldo6_reg: LDO6 {
-                                regulator-name = "VMPLL_1.0V_AP";
-                                regulator-min-microvolt = <1000000>;
-                                regulator-max-microvolt = <1000000>;
-                                regulator-always-on;
-                                regulator-state-mem {
-                                        regulator-on-in-suspend;
-                                };
-                        };
-
-                        ldo7_reg: LDO7 {
-                                regulator-name = "VPLL_1.0V_AP";
-                                regulator-min-microvolt = <1000000>;
-                                regulator-max-microvolt = <1000000>;
-                                regulator-always-on;
-                                regulator-state-mem {
-                                        regulator-on-in-suspend;
-                                };
-                        };
-
-                        ldo8_reg: LDO8 {
-                                regulator-name = "VMIPI_1.0V";
-                                regulator-min-microvolt = <1000000>;
-                                regulator-max-microvolt = <1000000>;
-                                regulator-state-mem {
-                                        regulator-off-in-suspend;
-                                };
-                        };
-
-                        ldo9_reg: LDO9 {
-                                regulator-name = "CAM_ISP_MIPI_1.2V";
-                                regulator-min-microvolt = <1200000>;
-                                regulator-max-microvolt = <1200000>;
-                        };
-
-                        ldo10_reg: LDO10 {
-                                regulator-name = "VMIPI_1.8V";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                                regulator-state-mem {
-                                        regulator-off-in-suspend;
-                                };
-                        };
-
-                        ldo11_reg: LDO11 {
-                                regulator-name = "VABB1_1.95V";
-                                regulator-min-microvolt = <1950000>;
-                                regulator-max-microvolt = <1950000>;
-                                regulator-always-on;
-                                regulator-state-mem {
-                                        regulator-off-in-suspend;
-                                };
-                        };
-
-                        ldo12_reg: LDO12 {
-                                regulator-name = "VUOTG_3.0V";
-                                regulator-min-microvolt = <3000000>;
-                                regulator-max-microvolt = <3000000>;
-                                regulator-state-mem {
-                                        regulator-off-in-suspend;
-                                };
-                        };
-
-                        ldo13_reg: LDO13 {
-                                regulator-name = "NFC_AVDD_1.8V";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                        };
-
-                        ldo14_reg: LDO14 {
-                                regulator-name = "VABB2_1.95V";
-                                regulator-min-microvolt = <1950000>;
-                                regulator-max-microvolt = <1950000>;
-                                regulator-always-on;
-                                regulator-state-mem {
-                                        regulator-off-in-suspend;
-                                };
-                        };
-
-                        ldo15_reg: LDO15 {
-                                regulator-name = "VHSIC_1.0V";
-                                regulator-min-microvolt = <1000000>;
-                                regulator-max-microvolt = <1000000>;
-                                regulator-state-mem {
-                                        regulator-on-in-suspend;
-                                };
-                        };
-
-                        ldo16_reg: LDO16 {
-                                regulator-name = "VHSIC_1.8V";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                                regulator-state-mem {
-                                        regulator-on-in-suspend;
-                                };
-                        };
-
-                        ldo17_reg: LDO17 {
-                                regulator-name = "CAM_SENSOR_CORE_1.2V";
-                                regulator-min-microvolt = <1200000>;
-                                regulator-max-microvolt = <1200000>;
-                        };
-
-                        ldo18_reg: LDO18 {
-                                regulator-name = "CAM_ISP_SEN_IO_1.8V";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                        };
-
-                        ldo19_reg: LDO19 {
-                                regulator-name = "VT_CAM_1.8V";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                        };
-
-                        ldo20_reg: LDO20 {
-                                regulator-name = "VDDQ_PRE_1.8V";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                        };
-
-                        ldo21_reg: LDO21 {
-                                regulator-name = "VTF_2.8V";
-                                regulator-min-microvolt = <2800000>;
-                                regulator-max-microvolt = <2800000>;
-                                maxim,ena-gpios = <&gpy2 0 GPIO_ACTIVE_HIGH>;
-                        };
-
-                        ldo22_reg: LDO22 {
-                                regulator-name = "VMEM_VDD_2.8V";
-                                regulator-min-microvolt = <2800000>;
-                                regulator-max-microvolt = <2800000>;
-                                maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
-                        };
-
-                        ldo23_reg: LDO23 {
-                                regulator-name = "TSP_AVDD_3.3V";
-                                regulator-min-microvolt = <3300000>;
-                                regulator-max-microvolt = <3300000>;
-                        };
-
-                        ldo24_reg: LDO24 {
-                                regulator-name = "TSP_VDD_1.8V";
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                        };
-
-                        ldo25_reg: LDO25 {
-                                regulator-name = "LCD_VCC_3.3V";
-                                regulator-min-microvolt = <2800000>;
-                                regulator-max-microvolt = <2800000>;
-                        };
-
-                        ldo26_reg: LDO26 {
-                                regulator-name = "MOTOR_VCC_3.0V";
-                                regulator-min-microvolt = <3000000>;
-                                regulator-max-microvolt = <3000000>;
-                        };
-
-                        buck1_reg: BUCK1 {
-                                regulator-name = "vdd_mif";
-                                regulator-min-microvolt = <850000>;
-                                regulator-max-microvolt = <1100000>;
-                                regulator-always-on;
-                                regulator-boot-on;
-                                regulator-state-mem {
-                                        regulator-off-in-suspend;
-                                };
-                        };
-
-                        buck2_reg: BUCK2 {
-                                regulator-name = "vdd_arm";
-                                regulator-min-microvolt = <850000>;
-                                regulator-max-microvolt = <1500000>;
-                                regulator-always-on;
-                                regulator-boot-on;
-                                regulator-state-mem {
-                                        regulator-on-in-suspend;
-                                };
-                        };
-
-                        buck3_reg: BUCK3 {
-                                regulator-name = "vdd_int";
-                                regulator-min-microvolt = <850000>;
-                                regulator-max-microvolt = <1150000>;
-                                regulator-always-on;
-                                regulator-boot-on;
-                                regulator-state-mem {
-                                        regulator-off-in-suspend;
-                                };
-                        };
-
-                        buck4_reg: BUCK4 {
-                                regulator-name = "vdd_g3d";
-                                regulator-min-microvolt = <850000>;
-                                regulator-max-microvolt = <1150000>;
-                                regulator-boot-on;
-                                regulator-state-mem {
-                                        regulator-off-in-suspend;
-                                };
-                        };
-
-                        buck5_reg: BUCK5 {
-                                regulator-name = "VMEM_1.2V_AP";
-                                regulator-min-microvolt = <1200000>;
-                                regulator-max-microvolt = <1200000>;
-                                regulator-always-on;
-                        };
-
-                        buck6_reg: BUCK6 {
-                                regulator-name = "VCC_SUB_1.35V";
-                                regulator-min-microvolt = <1350000>;
-                                regulator-max-microvolt = <1350000>;
-                                regulator-always-on;
-                        };
-
-                        buck7_reg: BUCK7 {
-                                regulator-name = "VCC_SUB_2.0V";
-                                regulator-min-microvolt = <2000000>;
-                                regulator-max-microvolt = <2000000>;
-                                regulator-always-on;
-                        };
-
-                        buck8_reg: BUCK8 {
-                                regulator-name = "VMEM_VDDF_3.0V";
-                                regulator-min-microvolt = <2850000>;
-                                regulator-max-microvolt = <2850000>;
-                                maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
-                        };
-
-                        buck9_reg: BUCK9 {
-                                regulator-name = "CAM_ISP_CORE_1.2V";
-                                regulator-min-microvolt = <1000000>;
-                                regulator-max-microvolt = <1200000>;
-                                maxim,ena-gpios = <&gpm0 3 GPIO_ACTIVE_HIGH>;
-                        };
-                };
-        };
-};
-
-&i2c_8 {
-        status = "okay";
-};
-
-&i2s0 {
-        pinctrl-0 = <&i2s0_bus>;
-        pinctrl-names = "default";
-        status = "okay";
-};
-
-&mixer {
-        status = "okay";
-};
-
-&mshc_0 {
-        broken-cd;
-        non-removable;
-        card-detect-delay = <200>;
-        vmmc-supply = <&ldo22_reg>;
-        clock-frequency = <400000000>;
-        samsung,dw-mshc-ciu-div = <0>;
-        samsung,dw-mshc-sdr-timing = <2 3>;
-        samsung,dw-mshc-ddr-timing = <1 2>;
-        pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
-        pinctrl-names = "default";
-        status = "okay";
-        bus-width = <8>;
-        cap-mmc-highspeed;
-};
-
-&pmu_system_controller {
-        assigned-clocks = <&pmu_system_controller 0>;
-        assigned-clock-parents =  <&clock CLK_XUSBXTI>;
-};
-
-&pinctrl_0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&sleep0>;
-
-        mhl_int: mhl-int {
-                samsung,pins = "gpf3-5";
-                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-        };
-
-        i2c_mhl_bus: i2c-mhl-bus {
-                samsung,pins = "gpf0-4", "gpf0-6";
-                samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
-                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-                samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
-        };
-
-        sleep0: sleep-states {
-                PIN_SLP(gpa0-0, INPUT, NONE);
-                PIN_SLP(gpa0-1, OUT0, NONE);
-                PIN_SLP(gpa0-2, INPUT, NONE);
-                PIN_SLP(gpa0-3, INPUT, UP);
-                PIN_SLP(gpa0-4, INPUT, NONE);
-                PIN_SLP(gpa0-5, INPUT, DOWN);
-                PIN_SLP(gpa0-6, INPUT, DOWN);
-                PIN_SLP(gpa0-7, INPUT, UP);
-
-                PIN_SLP(gpa1-0, INPUT, DOWN);
-                PIN_SLP(gpa1-1, INPUT, DOWN);
-                PIN_SLP(gpa1-2, INPUT, DOWN);
-                PIN_SLP(gpa1-3, INPUT, DOWN);
-                PIN_SLP(gpa1-4, INPUT, DOWN);
-                PIN_SLP(gpa1-5, INPUT, DOWN);
-
-                PIN_SLP(gpb-0, INPUT, NONE);
-                PIN_SLP(gpb-1, INPUT, NONE);
-                PIN_SLP(gpb-2, INPUT, NONE);
-                PIN_SLP(gpb-3, INPUT, NONE);
-                PIN_SLP(gpb-4, INPUT, DOWN);
-                PIN_SLP(gpb-5, INPUT, UP);
-                PIN_SLP(gpb-6, INPUT, DOWN);
-                PIN_SLP(gpb-7, INPUT, DOWN);
-
-                PIN_SLP(gpc0-0, INPUT, DOWN);
-                PIN_SLP(gpc0-1, INPUT, DOWN);
-                PIN_SLP(gpc0-2, INPUT, DOWN);
-                PIN_SLP(gpc0-3, INPUT, DOWN);
-                PIN_SLP(gpc0-4, INPUT, DOWN);
-
-                PIN_SLP(gpc1-0, INPUT, NONE);
-                PIN_SLP(gpc1-1, PREV, NONE);
-                PIN_SLP(gpc1-2, INPUT, NONE);
-                PIN_SLP(gpc1-3, INPUT, NONE);
-                PIN_SLP(gpc1-4, INPUT, NONE);
-
-                PIN_SLP(gpd0-0, INPUT, DOWN);
-                PIN_SLP(gpd0-1, INPUT, DOWN);
-                PIN_SLP(gpd0-2, INPUT, NONE);
-                PIN_SLP(gpd0-3, INPUT, NONE);
-
-                PIN_SLP(gpd1-0, INPUT, DOWN);
-                PIN_SLP(gpd1-1, INPUT, DOWN);
-                PIN_SLP(gpd1-2, INPUT, NONE);
-                PIN_SLP(gpd1-3, INPUT, NONE);
-
-                PIN_SLP(gpf0-0, INPUT, NONE);
-                PIN_SLP(gpf0-1, INPUT, NONE);
-                PIN_SLP(gpf0-2, INPUT, DOWN);
-                PIN_SLP(gpf0-3, INPUT, DOWN);
-                PIN_SLP(gpf0-4, INPUT, NONE);
-                PIN_SLP(gpf0-5, INPUT, DOWN);
-                PIN_SLP(gpf0-6, INPUT, NONE);
-                PIN_SLP(gpf0-7, INPUT, DOWN);
-
-                PIN_SLP(gpf1-0, INPUT, DOWN);
-                PIN_SLP(gpf1-1, INPUT, DOWN);
-                PIN_SLP(gpf1-2, INPUT, DOWN);
-                PIN_SLP(gpf1-3, INPUT, DOWN);
-                PIN_SLP(gpf1-4, INPUT, NONE);
-                PIN_SLP(gpf1-5, INPUT, NONE);
-                PIN_SLP(gpf1-6, INPUT, DOWN);
-                PIN_SLP(gpf1-7, PREV, NONE);
-
-                PIN_SLP(gpf2-0, PREV, NONE);
-                PIN_SLP(gpf2-1, INPUT, DOWN);
-                PIN_SLP(gpf2-2, INPUT, DOWN);
-                PIN_SLP(gpf2-3, INPUT, DOWN);
-                PIN_SLP(gpf2-4, INPUT, DOWN);
-                PIN_SLP(gpf2-5, INPUT, DOWN);
-                PIN_SLP(gpf2-6, INPUT, NONE);
-                PIN_SLP(gpf2-7, INPUT, NONE);
-
-                PIN_SLP(gpf3-0, INPUT, NONE);
-                PIN_SLP(gpf3-1, PREV, NONE);
-                PIN_SLP(gpf3-2, PREV, NONE);
-                PIN_SLP(gpf3-3, PREV, NONE);
-                PIN_SLP(gpf3-4, OUT1, NONE);
-                PIN_SLP(gpf3-5, INPUT, DOWN);
-
-                PIN_SLP(gpj0-0, PREV, NONE);
-                PIN_SLP(gpj0-1, PREV, NONE);
-                PIN_SLP(gpj0-2, PREV, NONE);
-                PIN_SLP(gpj0-3, INPUT, DOWN);
-                PIN_SLP(gpj0-4, PREV, NONE);
-                PIN_SLP(gpj0-5, PREV, NONE);
-                PIN_SLP(gpj0-6, INPUT, DOWN);
-                PIN_SLP(gpj0-7, INPUT, DOWN);
-
-                PIN_SLP(gpj1-0, INPUT, DOWN);
-                PIN_SLP(gpj1-1, PREV, NONE);
-                PIN_SLP(gpj1-2, PREV, NONE);
-                PIN_SLP(gpj1-3, INPUT, DOWN);
-                PIN_SLP(gpj1-4, INPUT, DOWN);
-        };
-};
-
-&pinctrl_1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&sleep1>;
-
-        hdmi_hpd: hdmi-hpd {
-                samsung,pins = "gpx3-7";
-                samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-        };
-
-        sleep1: sleep-states {
-                PIN_SLP(gpk0-0, PREV, NONE);
-                PIN_SLP(gpk0-1, PREV, NONE);
-                PIN_SLP(gpk0-2, OUT0, NONE);
-                PIN_SLP(gpk0-3, PREV, NONE);
-                PIN_SLP(gpk0-4, PREV, NONE);
-                PIN_SLP(gpk0-5, PREV, NONE);
-                PIN_SLP(gpk0-6, PREV, NONE);
-
-                PIN_SLP(gpk1-0, INPUT, DOWN);
-                PIN_SLP(gpk1-1, INPUT, DOWN);
-                PIN_SLP(gpk1-2, INPUT, DOWN);
-                PIN_SLP(gpk1-3, PREV, NONE);
-                PIN_SLP(gpk1-4, PREV, NONE);
-                PIN_SLP(gpk1-5, PREV, NONE);
-                PIN_SLP(gpk1-6, PREV, NONE);
-
-                PIN_SLP(gpk2-0, INPUT, DOWN);
-                PIN_SLP(gpk2-1, INPUT, DOWN);
-                PIN_SLP(gpk2-2, INPUT, DOWN);
-                PIN_SLP(gpk2-3, INPUT, DOWN);
-                PIN_SLP(gpk2-4, INPUT, DOWN);
-                PIN_SLP(gpk2-5, INPUT, DOWN);
-                PIN_SLP(gpk2-6, INPUT, DOWN);
-
-                PIN_SLP(gpk3-0, OUT0, NONE);
-                PIN_SLP(gpk3-1, INPUT, NONE);
-                PIN_SLP(gpk3-2, INPUT, DOWN);
-                PIN_SLP(gpk3-3, INPUT, NONE);
-                PIN_SLP(gpk3-4, INPUT, NONE);
-                PIN_SLP(gpk3-5, INPUT, NONE);
-                PIN_SLP(gpk3-6, INPUT, NONE);
-
-                PIN_SLP(gpl0-0, INPUT, DOWN);
-                PIN_SLP(gpl0-1, INPUT, DOWN);
-                PIN_SLP(gpl0-2, INPUT, DOWN);
-                PIN_SLP(gpl0-3, INPUT, DOWN);
-                PIN_SLP(gpl0-4, PREV, NONE);
-                PIN_SLP(gpl0-6, PREV, NONE);
-
-                PIN_SLP(gpl1-0, INPUT, DOWN);
-                PIN_SLP(gpl1-1, INPUT, DOWN);
-                PIN_SLP(gpl2-0, INPUT, DOWN);
-                PIN_SLP(gpl2-1, INPUT, DOWN);
-                PIN_SLP(gpl2-2, INPUT, DOWN);
-                PIN_SLP(gpl2-3, INPUT, DOWN);
-                PIN_SLP(gpl2-4, INPUT, DOWN);
-                PIN_SLP(gpl2-5, INPUT, DOWN);
-                PIN_SLP(gpl2-6, PREV, NONE);
-                PIN_SLP(gpl2-7, INPUT, DOWN);
-
-                PIN_SLP(gpm0-0, INPUT, DOWN);
-                PIN_SLP(gpm0-1, INPUT, DOWN);
-                PIN_SLP(gpm0-2, INPUT, DOWN);
-                PIN_SLP(gpm0-3, INPUT, DOWN);
-                PIN_SLP(gpm0-4, INPUT, DOWN);
-                PIN_SLP(gpm0-5, INPUT, DOWN);
-                PIN_SLP(gpm0-6, INPUT, DOWN);
-                PIN_SLP(gpm0-7, INPUT, DOWN);
-
-                PIN_SLP(gpm1-0, INPUT, DOWN);
-                PIN_SLP(gpm1-1, INPUT, DOWN);
-                PIN_SLP(gpm1-2, INPUT, NONE);
-                PIN_SLP(gpm1-3, INPUT, NONE);
-                PIN_SLP(gpm1-4, INPUT, NONE);
-                PIN_SLP(gpm1-5, INPUT, NONE);
-                PIN_SLP(gpm1-6, INPUT, DOWN);
-
-                PIN_SLP(gpm2-0, INPUT, NONE);
-                PIN_SLP(gpm2-1, INPUT, NONE);
-                PIN_SLP(gpm2-2, INPUT, DOWN);
-                PIN_SLP(gpm2-3, INPUT, DOWN);
-                PIN_SLP(gpm2-4, INPUT, DOWN);
-
-                PIN_SLP(gpm3-0, PREV, NONE);
-                PIN_SLP(gpm3-1, PREV, NONE);
-                PIN_SLP(gpm3-2, PREV, NONE);
-                PIN_SLP(gpm3-3, OUT1, NONE);
-                PIN_SLP(gpm3-4, INPUT, DOWN);
-                PIN_SLP(gpm3-5, INPUT, DOWN);
-                PIN_SLP(gpm3-6, INPUT, DOWN);
-                PIN_SLP(gpm3-7, INPUT, DOWN);
-
-                PIN_SLP(gpm4-0, INPUT, DOWN);
-                PIN_SLP(gpm4-1, INPUT, DOWN);
-                PIN_SLP(gpm4-2, INPUT, DOWN);
-                PIN_SLP(gpm4-3, INPUT, DOWN);
-                PIN_SLP(gpm4-4, INPUT, DOWN);
-                PIN_SLP(gpm4-5, INPUT, DOWN);
-                PIN_SLP(gpm4-6, INPUT, DOWN);
-                PIN_SLP(gpm4-7, INPUT, DOWN);
-
-                PIN_SLP(gpy0-0, INPUT, DOWN);
-                PIN_SLP(gpy0-1, INPUT, DOWN);
-                PIN_SLP(gpy0-2, INPUT, DOWN);
-                PIN_SLP(gpy0-3, INPUT, DOWN);
-                PIN_SLP(gpy0-4, INPUT, DOWN);
-                PIN_SLP(gpy0-5, INPUT, DOWN);
-
-                PIN_SLP(gpy1-0, INPUT, DOWN);
-                PIN_SLP(gpy1-1, INPUT, DOWN);
-                PIN_SLP(gpy1-2, INPUT, DOWN);
-                PIN_SLP(gpy1-3, INPUT, DOWN);
-
-                PIN_SLP(gpy2-0, PREV, NONE);
-                PIN_SLP(gpy2-1, INPUT, DOWN);
-                PIN_SLP(gpy2-2, INPUT, NONE);
-                PIN_SLP(gpy2-3, INPUT, NONE);
-                PIN_SLP(gpy2-4, INPUT, NONE);
-                PIN_SLP(gpy2-5, INPUT, NONE);
-
-                PIN_SLP(gpy3-0, INPUT, DOWN);
-                PIN_SLP(gpy3-1, INPUT, DOWN);
-                PIN_SLP(gpy3-2, INPUT, DOWN);
-                PIN_SLP(gpy3-3, INPUT, DOWN);
-                PIN_SLP(gpy3-4, INPUT, DOWN);
-                PIN_SLP(gpy3-5, INPUT, DOWN);
-                PIN_SLP(gpy3-6, INPUT, DOWN);
-                PIN_SLP(gpy3-7, INPUT, DOWN);
-
-                PIN_SLP(gpy4-0, INPUT, DOWN);
-                PIN_SLP(gpy4-1, INPUT, DOWN);
-                PIN_SLP(gpy4-2, INPUT, DOWN);
-                PIN_SLP(gpy4-3, INPUT, DOWN);
-                PIN_SLP(gpy4-4, INPUT, DOWN);
-                PIN_SLP(gpy4-5, INPUT, DOWN);
-                PIN_SLP(gpy4-6, INPUT, DOWN);
-                PIN_SLP(gpy4-7, INPUT, DOWN);
-
-                PIN_SLP(gpy5-0, INPUT, DOWN);
-                PIN_SLP(gpy5-1, INPUT, DOWN);
-                PIN_SLP(gpy5-2, INPUT, DOWN);
-                PIN_SLP(gpy5-3, INPUT, DOWN);
-                PIN_SLP(gpy5-4, INPUT, DOWN);
-                PIN_SLP(gpy5-5, INPUT, DOWN);
-                PIN_SLP(gpy5-6, INPUT, DOWN);
-                PIN_SLP(gpy5-7, INPUT, DOWN);
-
-                PIN_SLP(gpy6-0, INPUT, DOWN);
-                PIN_SLP(gpy6-1, INPUT, DOWN);
-                PIN_SLP(gpy6-2, INPUT, DOWN);
-                PIN_SLP(gpy6-3, INPUT, DOWN);
-                PIN_SLP(gpy6-4, INPUT, DOWN);
-                PIN_SLP(gpy6-5, INPUT, DOWN);
-                PIN_SLP(gpy6-6, INPUT, DOWN);
-                PIN_SLP(gpy6-7, INPUT, DOWN);
-        };
-};
-
-&pinctrl_2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&sleep2>;
-
-        sleep2: sleep-states {
-                PIN_SLP(gpz-0, INPUT, DOWN);
-                PIN_SLP(gpz-1, INPUT, DOWN);
-                PIN_SLP(gpz-2, INPUT, DOWN);
-                PIN_SLP(gpz-3, INPUT, DOWN);
-                PIN_SLP(gpz-4, INPUT, DOWN);
-                PIN_SLP(gpz-5, INPUT, DOWN);
-                PIN_SLP(gpz-6, INPUT, DOWN);
-        };
-};
-
-&pinctrl_3 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&sleep3>;
-
-        sleep3: sleep-states {
-                PIN_SLP(gpv0-0, INPUT, DOWN);
-                PIN_SLP(gpv0-1, INPUT, DOWN);
-                PIN_SLP(gpv0-2, INPUT, DOWN);
-                PIN_SLP(gpv0-3, INPUT, DOWN);
-                PIN_SLP(gpv0-4, INPUT, DOWN);
-                PIN_SLP(gpv0-5, INPUT, DOWN);
-                PIN_SLP(gpv0-6, INPUT, DOWN);
-                PIN_SLP(gpv0-7, INPUT, DOWN);
-
-                PIN_SLP(gpv1-0, INPUT, DOWN);
-                PIN_SLP(gpv1-1, INPUT, DOWN);
-                PIN_SLP(gpv1-2, INPUT, DOWN);
-                PIN_SLP(gpv1-3, INPUT, DOWN);
-                PIN_SLP(gpv1-4, INPUT, DOWN);
-                PIN_SLP(gpv1-5, INPUT, DOWN);
-                PIN_SLP(gpv1-6, INPUT, DOWN);
-                PIN_SLP(gpv1-7, INPUT, DOWN);
-
-                PIN_SLP(gpv2-0, INPUT, DOWN);
-                PIN_SLP(gpv2-1, INPUT, DOWN);
-                PIN_SLP(gpv2-2, INPUT, DOWN);
-                PIN_SLP(gpv2-3, INPUT, DOWN);
-                PIN_SLP(gpv2-4, INPUT, DOWN);
-                PIN_SLP(gpv2-5, INPUT, DOWN);
-                PIN_SLP(gpv2-6, INPUT, DOWN);
-                PIN_SLP(gpv2-7, INPUT, DOWN);
-
-                PIN_SLP(gpv3-0, INPUT, DOWN);
-                PIN_SLP(gpv3-1, INPUT, DOWN);
-                PIN_SLP(gpv3-2, INPUT, DOWN);
-                PIN_SLP(gpv3-3, INPUT, DOWN);
-                PIN_SLP(gpv3-4, INPUT, DOWN);
-                PIN_SLP(gpv3-5, INPUT, DOWN);
-                PIN_SLP(gpv3-6, INPUT, DOWN);
-                PIN_SLP(gpv3-7, INPUT, DOWN);
-
-                PIN_SLP(gpv4-0, INPUT, DOWN);
-        };
-};
-
-&pwm {
-        pinctrl-0 = <&pwm0_out>;
-        pinctrl-names = "default";
-        samsung,pwm-outputs = <0>;
-        status = "okay";
-};
-
-&rtc {
-        status = "okay";
-        clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
-        clock-names = "rtc", "rtc_src";
-};
-
-&sdhci_2 {
-        bus-width = <4>;
-        cd-gpios = <&gpx3 4 GPIO_ACTIVE_HIGH>;
-        cd-inverted;
-        pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;
-        pinctrl-names = "default";
-        vmmc-supply = <&ldo21_reg>;
-        status = "okay";
-};
-
-&sdhci_3 {
-        #address-cells = <1>;
-        #size-cells = <0>;
-        non-removable;
-        bus-width = <4>;
-
-        mmc-pwrseq = <&wlan_pwrseq>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
-        status = "okay";
-
-        brcmf: wifi@1 {
-                reg = <1>;
-                compatible = "brcm,bcm4329-fmac";
-                interrupt-parent = <&gpx2>;
-                interrupts = <5 IRQ_TYPE_NONE>;
-                interrupt-names = "host-wake";
-        };
-};
-
-&serial_0 {
-        status = "okay";
-};
-
-&serial_1 {
-        status = "okay";
-};
-
-&serial_2 {
-        status = "okay";
-};
-
-&serial_3 {
-        status = "okay";
-};
-
-&spi_1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&spi1_bus>;
-        cs-gpios = <&gpb 5 GPIO_ACTIVE_HIGH>;
-        status = "okay";
-
-        s5c73m3_spi: s5c73m3@0 {
-                compatible = "samsung,s5c73m3";
-                spi-max-frequency = <50000000>;
-                reg = <0>;
-                controller-data {
-                        samsung,spi-feedback-delay = <2>;
-                };
-        };
-};
-
-&tmu {
-        vtmu-supply = <&ldo10_reg>;
-        status = "okay";
-};
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index e4ad2fc0329e..2ae1ab602f4b 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -15,7 +15,7 @@
  */
 
 #include "exynos4.dtsi"
-#include "exynos4412-pinctrl.dtsi"
+
 #include "exynos4-cpu-thermal.dtsi"
 
 / {
@@ -42,8 +42,6 @@
                         clocks = <&clock CLK_ARM_CLK>;
                         clock-names = "cpu";
                         operating-points-v2 = <&cpu0_opp_table>;
-                        cooling-min-level = <13>;
-                        cooling-max-level = <7>;
                         #cooling-cells = <2>; /* min followed by max */
                 };
 
@@ -147,463 +145,410 @@
                 };
         };
 
-        sysram@2020000 {
-                compatible = "mmio-sram";
-                reg = <0x02020000 0x40000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges = <0 0x02020000 0x40000>;
 
-                smp-sysram@0 {
-                        compatible = "samsung,exynos4210-sysram";
-                        reg = <0x0 0x1000>;
-                };
+        soc: soc {
 
-                smp-sysram@2f000 {
-                        compatible = "samsung,exynos4210-sysram-ns";
-                        reg = <0x2f000 0x1000>;
+                pinctrl_0: pinctrl@11400000 {
+                        compatible = "samsung,exynos4x12-pinctrl";
+                        reg = <0x11400000 0x1000>;
+                        interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
                 };
-        };
-
-        pd_isp: isp-power-domain@10023ca0 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x10023CA0 0x20>;
-                #power-domain-cells = <0>;
-                label = "ISP";
-        };
-
-        l2c: l2-cache-controller@10502000 {
-                compatible = "arm,pl310-cache";
-                reg = <0x10502000 0x1000>;
-                cache-unified;
-                cache-level = <2>;
-                arm,tag-latency = <2 2 1>;
-                arm,data-latency = <3 2 1>;
-                arm,double-linefill = <1>;
-                arm,double-linefill-incr = <0>;
-                arm,double-linefill-wrap = <1>;
-                arm,prefetch-drop = <1>;
-                arm,prefetch-offset = <7>;
-        };
 
-        clock: clock-controller@10030000 {
-                compatible = "samsung,exynos4412-clock";
-                reg = <0x10030000 0x18000>;
-                #clock-cells = <1>;
-        };
-
-        isp_clock: clock-controller@10048000 {
-                compatible = "samsung,exynos4412-isp-clock";
-                reg = <0x10048000 0x1000>;
-                #clock-cells = <1>;
-                power-domains = <&pd_isp>;
-                clocks = <&clock CLK_ACLK200>, <&clock CLK_ACLK400_MCUISP>;
-                clock-names = "aclk200", "aclk400_mcuisp";
-        };
+                pinctrl_1: pinctrl@11000000 {
+                        compatible = "samsung,exynos4x12-pinctrl";
+                        reg = <0x11000000 0x1000>;
+                        interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
 
-        mct@10050000 {
-                compatible = "samsung,exynos4412-mct";
-                reg = <0x10050000 0x800>;
-                interrupt-parent = <&mct_map>;
-                interrupts = <0>, <1>, <2>, <3>, <4>;
-                clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
-                clock-names = "fin_pll", "mct";
-
-                mct_map: mct-map {
-                        #interrupt-cells = <1>;
-                        #address-cells = <0>;
-                        #size-cells = <0>;
-                        interrupt-map = <0 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>,
-                                        <1 &combiner 12 5>,
-                                        <2 &combiner 12 6>,
-                                        <3 &combiner 12 7>,
-                                        <4 &gic 1 12 IRQ_TYPE_LEVEL_HIGH>;
+                        wakup_eint: wakeup-interrupt-controller {
+                                compatible = "samsung,exynos4210-wakeup-eint";
+                                interrupt-parent = <&gic>;
+                                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+                        };
                 };
-        };
-
-        watchdog: watchdog@10060000 {
-                compatible = "samsung,exynos5250-wdt";
-                reg = <0x10060000 0x100>;
-                interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_WDT>;
-                clock-names = "watchdog";
-                samsung,syscon-phandle = <&pmu_system_controller>;
-        };
-
-        adc: adc@126c0000 {
-                compatible = "samsung,exynos-adc-v1";
-                reg = <0x126C0000 0x100>;
-                interrupt-parent = <&combiner>;
-                interrupts = <10 3>;
-                clocks = <&clock CLK_TSADC>;
-                clock-names = "adc";
-                #io-channel-cells = <1>;
-                io-channel-ranges;
-                samsung,syscon-phandle = <&pmu_system_controller>;
-                status = "disabled";
-        };
-
-        g2d: g2d@10800000 {
-                compatible = "samsung,exynos4212-g2d";
-                reg = <0x10800000 0x1000>;
-                interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
-                clock-names = "sclk_fimg2d", "fimg2d";
-                iommus = <&sysmmu_g2d>;
-        };
-
-        camera {
-                clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
-                         <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
-                clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
 
-                /* fimc_[0-3] are configured outside, under phandles */
-                fimc_lite_0: fimc-lite@12390000 {
-                        compatible = "samsung,exynos4212-fimc-lite";
-                        reg = <0x12390000 0x1000>;
-                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-                        power-domains = <&pd_isp>;
-                        clocks = <&isp_clock CLK_ISP_FIMC_LITE0>;
-                        clock-names = "flite";
-                        iommus = <&sysmmu_fimc_lite0>;
-                        status = "disabled";
+                pinctrl_2: pinctrl@3860000 {
+                        compatible = "samsung,exynos4x12-pinctrl";
+                        reg = <0x03860000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <10 0>;
                 };
 
-                fimc_lite_1: fimc-lite@123a0000 {
-                        compatible = "samsung,exynos4212-fimc-lite";
-                        reg = <0x123A0000 0x1000>;
-                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
-                        power-domains = <&pd_isp>;
-                        clocks = <&isp_clock CLK_ISP_FIMC_LITE1>;
-                        clock-names = "flite";
-                        iommus = <&sysmmu_fimc_lite1>;
-                        status = "disabled";
+                pinctrl_3: pinctrl@106e0000 {
+                        compatible = "samsung,exynos4x12-pinctrl";
+                        reg = <0x106E0000 0x1000>;
+                        interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
                 };
 
-                fimc_is: fimc-is@12000000 {
-                        compatible = "samsung,exynos4212-fimc-is";
-                        reg = <0x12000000 0x260000>;
-                        interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                        power-domains = <&pd_isp>;
-                        clocks = <&isp_clock CLK_ISP_FIMC_LITE0>,
-                                 <&isp_clock CLK_ISP_FIMC_LITE1>,
-                                 <&isp_clock CLK_ISP_PPMUISPX>,
-                                 <&isp_clock CLK_ISP_PPMUISPMX>,
-                                 <&isp_clock CLK_ISP_FIMC_ISP>,
-                                 <&isp_clock CLK_ISP_FIMC_DRC>,
-                                 <&isp_clock CLK_ISP_FIMC_FD>,
-                                 <&isp_clock CLK_ISP_MCUISP>,
-                                 <&isp_clock CLK_ISP_GICISP>,
-                                 <&isp_clock CLK_ISP_MCUCTL_ISP>,
-                                 <&isp_clock CLK_ISP_PWM_ISP>,
-                                 <&isp_clock CLK_ISP_DIV_ISP0>,
-                                 <&isp_clock CLK_ISP_DIV_ISP1>,
-                                 <&isp_clock CLK_ISP_DIV_MCUISP0>,
-                                 <&isp_clock CLK_ISP_DIV_MCUISP1>,
-                                 <&clock CLK_MOUT_MPLL_USER_T>,
-                                 <&clock CLK_ACLK200>,
-                                 <&clock CLK_ACLK400_MCUISP>,
-                                 <&clock CLK_DIV_ACLK200>,
-                                 <&clock CLK_DIV_ACLK400_MCUISP>,
-                                 <&clock CLK_UART_ISP_SCLK>;
-                        clock-names = "lite0", "lite1", "ppmuispx",
-                                      "ppmuispmx", "isp",
-                                      "drc", "fd", "mcuisp",
-                                      "gicisp", "mcuctl_isp", "pwm_isp",
-                                      "ispdiv0", "ispdiv1", "mcuispdiv0",
-                                      "mcuispdiv1", "mpll", "aclk200",
-                                      "aclk400mcuisp", "div_aclk200",
-                                      "div_aclk400mcuisp", "uart";
-                        iommus = <&sysmmu_fimc_isp>, <&sysmmu_fimc_drc>,
-                                 <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>;
-                        iommu-names = "isp", "drc", "fd", "mcuctl";
+                sysram@2020000 {
+                        compatible = "mmio-sram";
+                        reg = <0x02020000 0x40000>;
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges;
-                        status = "disabled";
+                        ranges = <0 0x02020000 0x40000>;
 
-                        pmu@10020000 {
-                                reg = <0x10020000 0x3000>;
+                        smp-sysram@0 {
+                                compatible = "samsung,exynos4210-sysram";
+                                reg = <0x0 0x1000>;
                         };
 
-                        i2c1_isp: i2c-isp@12140000 {
-                                compatible = "samsung,exynos4212-i2c-isp";
-                                reg = <0x12140000 0x100>;
-                                clocks = <&isp_clock CLK_ISP_I2C1_ISP>;
-                                clock-names = "i2c_isp";
-                                #address-cells = <1>;
-                                #size-cells = <0>;
+                        smp-sysram@2f000 {
+                                compatible = "samsung,exynos4210-sysram-ns";
+                                reg = <0x2f000 0x1000>;
                         };
                 };
-        };
-
-        mshc_0: mmc@12550000 {
-                compatible = "samsung,exynos4412-dw-mshc";
-                reg = <0x12550000 0x1000>;
-                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                fifo-depth = <0x80>;
-                clocks = <&clock CLK_SDMMC4>, <&clock CLK_SCLK_MMC4>;
-                clock-names = "biu", "ciu";
-                status = "disabled";
-        };
-
-        sysmmu_g2d: sysmmu@10A40000{
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x10A40000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <4 7>;
-                clock-names = "sysmmu", "master";
-                clocks = <&clock CLK_SMMU_G2D>, <&clock CLK_G2D>;
-                #iommu-cells = <0>;
-        };
-
-        sysmmu_fimc_isp: sysmmu@12260000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x12260000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <16 2>;
-                power-domains = <&pd_isp>;
-                clock-names = "sysmmu";
-                clocks = <&isp_clock CLK_ISP_SMMU_ISP>;
-                #iommu-cells = <0>;
-        };
-
-        sysmmu_fimc_drc: sysmmu@12270000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x12270000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <16 3>;
-                power-domains = <&pd_isp>;
-                clock-names = "sysmmu";
-                clocks = <&isp_clock CLK_ISP_SMMU_DRC>;
-                #iommu-cells = <0>;
-        };
-
-        sysmmu_fimc_fd: sysmmu@122a0000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x122A0000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <16 4>;
-                power-domains = <&pd_isp>;
-                clock-names = "sysmmu";
-                clocks = <&isp_clock CLK_ISP_SMMU_FD>;
-                #iommu-cells = <0>;
-        };
-
-        sysmmu_fimc_mcuctl: sysmmu@122b0000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x122B0000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <16 5>;
-                power-domains = <&pd_isp>;
-                clock-names = "sysmmu";
-                clocks = <&isp_clock CLK_ISP_SMMU_ISPCX>;
-                #iommu-cells = <0>;
-        };
 
-        sysmmu_fimc_lite0: sysmmu@123b0000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x123B0000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <16 0>;
-                power-domains = <&pd_isp>;
-                clock-names = "sysmmu", "master";
-                clocks = <&isp_clock CLK_ISP_SMMU_LITE0>,
-                         <&isp_clock CLK_ISP_FIMC_LITE0>;
-                #iommu-cells = <0>;
-        };
+                pd_isp: isp-power-domain@10023ca0 {
+                        compatible = "samsung,exynos4210-pd";
+                        reg = <0x10023CA0 0x20>;
+                        #power-domain-cells = <0>;
+                        label = "ISP";
+                };
 
-        sysmmu_fimc_lite1: sysmmu@123c0000 {
-                compatible = "samsung,exynos-sysmmu";
-                reg = <0x123C0000 0x1000>;
-                interrupt-parent = <&combiner>;
-                interrupts = <16 1>;
-                power-domains = <&pd_isp>;
-                clock-names = "sysmmu", "master";
-                clocks = <&isp_clock CLK_ISP_SMMU_LITE1>,
-                         <&isp_clock CLK_ISP_FIMC_LITE1>;
-                #iommu-cells = <0>;
-        };
+                l2c: l2-cache-controller@10502000 {
+                        compatible = "arm,pl310-cache";
+                        reg = <0x10502000 0x1000>;
+                        cache-unified;
+                        cache-level = <2>;
+                        arm,tag-latency = <2 2 1>;
+                        arm,data-latency = <3 2 1>;
+                        arm,double-linefill = <1>;
+                        arm,double-linefill-incr = <0>;
+                        arm,double-linefill-wrap = <1>;
+                        arm,prefetch-drop = <1>;
+                        arm,prefetch-offset = <7>;
+                };
 
-        bus_dmc: bus_dmc {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_DMC>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_dmc_opp_table>;
-                status = "disabled";
-        };
+                clock: clock-controller@10030000 {
+                        compatible = "samsung,exynos4412-clock";
+                        reg = <0x10030000 0x18000>;
+                        #clock-cells = <1>;
+                };
 
-        bus_acp: bus_acp {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_ACP>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_acp_opp_table>;
-                status = "disabled";
-        };
+                isp_clock: clock-controller@10048000 {
+                        compatible = "samsung,exynos4412-isp-clock";
+                        reg = <0x10048000 0x1000>;
+                        #clock-cells = <1>;
+                        power-domains = <&pd_isp>;
+                        clocks = <&clock CLK_ACLK200>,
+                                 <&clock CLK_ACLK400_MCUISP>;
+                        clock-names = "aclk200", "aclk400_mcuisp";
+                };
+
+                mct@10050000 {
+                        compatible = "samsung,exynos4412-mct";
+                        reg = <0x10050000 0x800>;
+                        interrupt-parent = <&mct_map>;
+                        interrupts = <0>, <1>, <2>, <3>, <4>;
+                        clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
+                        clock-names = "fin_pll", "mct";
+
+                        mct_map: mct-map {
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map =
+                                        <0 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>,
+                                        <1 &combiner 12 5>,
+                                        <2 &combiner 12 6>,
+                                        <3 &combiner 12 7>,
+                                        <4 &gic 1 12 IRQ_TYPE_LEVEL_HIGH>;
+                        };
+                };
 
-        bus_c2c: bus_c2c {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_C2C>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_dmc_opp_table>;
-                status = "disabled";
-        };
+                watchdog: watchdog@10060000 {
+                        compatible = "samsung,exynos5250-wdt";
+                        reg = <0x10060000 0x100>;
+                        interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_WDT>;
+                        clock-names = "watchdog";
+                        samsung,syscon-phandle = <&pmu_system_controller>;
+                };
+
+                adc: adc@126c0000 {
+                        compatible = "samsung,exynos-adc-v1";
+                        reg = <0x126C0000 0x100>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <10 3>;
+                        clocks = <&clock CLK_TSADC>;
+                        clock-names = "adc";
+                        #io-channel-cells = <1>;
+                        io-channel-ranges;
+                        samsung,syscon-phandle = <&pmu_system_controller>;
+                        status = "disabled";
+                };
 
-        bus_dmc_opp_table: opp_table1 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                g2d: g2d@10800000 {
+                        compatible = "samsung,exynos4212-g2d";
+                        reg = <0x10800000 0x1000>;
+                        interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;
+                        clock-names = "sclk_fimg2d", "fimg2d";
+                        iommus = <&sysmmu_g2d>;
+                };
 
-                opp-100000000 {
-                        opp-hz = /bits/ 64 <100000000>;
-                        opp-microvolt = <900000>;
+                mshc_0: mmc@12550000 {
+                        compatible = "samsung,exynos4412-dw-mshc";
+                        reg = <0x12550000 0x1000>;
+                        interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        fifo-depth = <0x80>;
+                        clocks = <&clock CLK_SDMMC4>, <&clock CLK_SCLK_MMC4>;
+                        clock-names = "biu", "ciu";
+                        status = "disabled";
                 };
-                opp-134000000 {
-                        opp-hz = /bits/ 64 <134000000>;
-                        opp-microvolt = <900000>;
+
+                sysmmu_g2d: sysmmu@10A40000{
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x10A40000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <4 7>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&clock CLK_SMMU_G2D>, <&clock CLK_G2D>;
+                        #iommu-cells = <0>;
                 };
-                opp-160000000 {
-                        opp-hz = /bits/ 64 <160000000>;
-                        opp-microvolt = <900000>;
+
+                sysmmu_fimc_isp: sysmmu@12260000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x12260000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <16 2>;
+                        power-domains = <&pd_isp>;
+                        clock-names = "sysmmu";
+                        clocks = <&isp_clock CLK_ISP_SMMU_ISP>;
+                        #iommu-cells = <0>;
                 };
-                opp-267000000 {
-                        opp-hz = /bits/ 64 <267000000>;
-                        opp-microvolt = <950000>;
+
+                sysmmu_fimc_drc: sysmmu@12270000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x12270000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <16 3>;
+                        power-domains = <&pd_isp>;
+                        clock-names = "sysmmu";
+                        clocks = <&isp_clock CLK_ISP_SMMU_DRC>;
+                        #iommu-cells = <0>;
                 };
-                opp-400000000 {
-                        opp-hz = /bits/ 64 <400000000>;
-                        opp-microvolt = <1050000>;
+
+                sysmmu_fimc_fd: sysmmu@122a0000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x122A0000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <16 4>;
+                        power-domains = <&pd_isp>;
+                        clock-names = "sysmmu";
+                        clocks = <&isp_clock CLK_ISP_SMMU_FD>;
+                        #iommu-cells = <0>;
                 };
-        };
 
-        bus_acp_opp_table: opp_table2 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                sysmmu_fimc_mcuctl: sysmmu@122b0000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x122B0000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <16 5>;
+                        power-domains = <&pd_isp>;
+                        clock-names = "sysmmu";
+                        clocks = <&isp_clock CLK_ISP_SMMU_ISPCX>;
+                        #iommu-cells = <0>;
+                };
 
-                opp-100000000 {
-                        opp-hz = /bits/ 64 <100000000>;
+                sysmmu_fimc_lite0: sysmmu@123b0000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x123B0000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <16 0>;
+                        power-domains = <&pd_isp>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&isp_clock CLK_ISP_SMMU_LITE0>,
+                                 <&isp_clock CLK_ISP_FIMC_LITE0>;
+                        #iommu-cells = <0>;
                 };
-                opp-134000000 {
-                        opp-hz = /bits/ 64 <134000000>;
+
+                sysmmu_fimc_lite1: sysmmu@123c0000 {
+                        compatible = "samsung,exynos-sysmmu";
+                        reg = <0x123C0000 0x1000>;
+                        interrupt-parent = <&combiner>;
+                        interrupts = <16 1>;
+                        power-domains = <&pd_isp>;
+                        clock-names = "sysmmu", "master";
+                        clocks = <&isp_clock CLK_ISP_SMMU_LITE1>,
+                                 <&isp_clock CLK_ISP_FIMC_LITE1>;
+                        #iommu-cells = <0>;
                 };
-                opp-160000000 {
-                        opp-hz = /bits/ 64 <160000000>;
+
+                bus_dmc: bus_dmc {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_DMC>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_dmc_opp_table>;
+                        status = "disabled";
                 };
-                opp-267000000 {
-                        opp-hz = /bits/ 64 <267000000>;
+
+                bus_acp: bus_acp {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_ACP>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_acp_opp_table>;
+                        status = "disabled";
                 };
-        };
 
-        bus_leftbus: bus_leftbus {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_GDL>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_leftbus_opp_table>;
-                status = "disabled";
-        };
+                bus_c2c: bus_c2c {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_C2C>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_dmc_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_rightbus: bus_rightbus {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_DIV_GDR>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_leftbus_opp_table>;
-                status = "disabled";
-        };
+                bus_dmc_opp_table: opp_table1 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-        bus_display: bus_display {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_ACLK160>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_display_opp_table>;
-                status = "disabled";
-        };
+                        opp-100000000 {
+                                opp-hz = /bits/ 64 <100000000>;
+                                opp-microvolt = <900000>;
+                        };
+                        opp-134000000 {
+                                opp-hz = /bits/ 64 <134000000>;
+                                opp-microvolt = <900000>;
+                        };
+                        opp-160000000 {
+                                opp-hz = /bits/ 64 <160000000>;
+                                opp-microvolt = <900000>;
+                        };
+                        opp-267000000 {
+                                opp-hz = /bits/ 64 <267000000>;
+                                opp-microvolt = <950000>;
+                        };
+                        opp-400000000 {
+                                opp-hz = /bits/ 64 <400000000>;
+                                opp-microvolt = <1050000>;
+                        };
+                };
 
-        bus_fsys: bus_fsys {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_ACLK133>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_fsys_opp_table>;
-                status = "disabled";
-        };
+                bus_acp_opp_table: opp_table2 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-        bus_peri: bus_peri {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_ACLK100>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_peri_opp_table>;
-                status = "disabled";
-        };
+                        opp-100000000 {
+                                opp-hz = /bits/ 64 <100000000>;
+                        };
+                        opp-134000000 {
+                                opp-hz = /bits/ 64 <134000000>;
+                        };
+                        opp-160000000 {
+                                opp-hz = /bits/ 64 <160000000>;
+                        };
+                        opp-267000000 {
+                                opp-hz = /bits/ 64 <267000000>;
+                        };
+                };
 
-        bus_mfc: bus_mfc {
-                compatible = "samsung,exynos-bus";
-                clocks = <&clock CLK_SCLK_MFC>;
-                clock-names = "bus";
-                operating-points-v2 = <&bus_leftbus_opp_table>;
-                status = "disabled";
-        };
+                bus_leftbus: bus_leftbus {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_GDL>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_leftbus_opp_table>;
+                        status = "disabled";
+                };
 
-        bus_leftbus_opp_table: opp_table3 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_rightbus: bus_rightbus {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_DIV_GDR>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_leftbus_opp_table>;
+                        status = "disabled";
+                };
 
-                opp-100000000 {
-                        opp-hz = /bits/ 64 <100000000>;
-                        opp-microvolt = <900000>;
+                bus_display: bus_display {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_ACLK160>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_display_opp_table>;
+                        status = "disabled";
                 };
-                opp-134000000 {
-                        opp-hz = /bits/ 64 <134000000>;
-                        opp-microvolt = <925000>;
+
+                bus_fsys: bus_fsys {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_ACLK133>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_fsys_opp_table>;
+                        status = "disabled";
                 };
-                opp-160000000 {
-                        opp-hz = /bits/ 64 <160000000>;
-                        opp-microvolt = <950000>;
+
+                bus_peri: bus_peri {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_ACLK100>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_peri_opp_table>;
+                        status = "disabled";
                 };
-                opp-200000000 {
-                        opp-hz = /bits/ 64 <200000000>;
-                        opp-microvolt = <1000000>;
+
+                bus_mfc: bus_mfc {
+                        compatible = "samsung,exynos-bus";
+                        clocks = <&clock CLK_SCLK_MFC>;
+                        clock-names = "bus";
+                        operating-points-v2 = <&bus_leftbus_opp_table>;
+                        status = "disabled";
                 };
-        };
 
-        bus_display_opp_table: opp_table4 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_leftbus_opp_table: opp_table3 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-                opp-160000000 {
-                        opp-hz = /bits/ 64 <160000000>;
-                };
-                opp-200000000 {
-                        opp-hz = /bits/ 64 <200000000>;
+                        opp-100000000 {
+                                opp-hz = /bits/ 64 <100000000>;
+                                opp-microvolt = <900000>;
+                        };
+                        opp-134000000 {
+                                opp-hz = /bits/ 64 <134000000>;
+                                opp-microvolt = <925000>;
+                        };
+                        opp-160000000 {
+                                opp-hz = /bits/ 64 <160000000>;
+                                opp-microvolt = <950000>;
+                        };
+                        opp-200000000 {
+                                opp-hz = /bits/ 64 <200000000>;
+                                opp-microvolt = <1000000>;
+                        };
                 };
-        };
 
-        bus_fsys_opp_table: opp_table5 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_display_opp_table: opp_table4 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-                opp-100000000 {
-                        opp-hz = /bits/ 64 <100000000>;
-                };
-                opp-134000000 {
-                        opp-hz = /bits/ 64 <134000000>;
+                        opp-160000000 {
+                                opp-hz = /bits/ 64 <160000000>;
+                        };
+                        opp-200000000 {
+                                opp-hz = /bits/ 64 <200000000>;
+                        };
                 };
-        };
 
-        bus_peri_opp_table: opp_table6 {
-                compatible = "operating-points-v2";
-                opp-shared;
+                bus_fsys_opp_table: opp_table5 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
 
-                opp-50000000 {
-                        opp-hz = /bits/ 64 <50000000>;
-                };
-                opp-100000000 {
-                        opp-hz = /bits/ 64 <100000000>;
+                        opp-100000000 {
+                                opp-hz = /bits/ 64 <100000000>;
+                        };
+                        opp-134000000 {
+                                opp-hz = /bits/ 64 <134000000>;
+                        };
                 };
-        };
 
-        pmu {
-                interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
+                bus_peri_opp_table: opp_table6 {
+                        compatible = "operating-points-v2";
+                        opp-shared;
+
+                        opp-50000000 {
+                                opp-hz = /bits/ 64 <50000000>;
+                        };
+                        opp-100000000 {
+                                opp-hz = /bits/ 64 <100000000>;
+                        };
+                };
         };
 };
 
@@ -631,6 +576,92 @@
                      <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
 };
 
+&camera {
+        clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>,
+                 <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>;
+        clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
+
+        /* fimc_[0-3] are configured outside, under phandles */
+        fimc_lite_0: fimc-lite@12390000 {
+                compatible = "samsung,exynos4212-fimc-lite";
+                reg = <0x12390000 0x1000>;
+                interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+                power-domains = <&pd_isp>;
+                clocks = <&isp_clock CLK_ISP_FIMC_LITE0>;
+                clock-names = "flite";
+                iommus = <&sysmmu_fimc_lite0>;
+                status = "disabled";
+        };
+
+        fimc_lite_1: fimc-lite@123a0000 {
+                compatible = "samsung,exynos4212-fimc-lite";
+                reg = <0x123A0000 0x1000>;
+                interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                power-domains = <&pd_isp>;
+                clocks = <&isp_clock CLK_ISP_FIMC_LITE1>;
+                clock-names = "flite";
+                iommus = <&sysmmu_fimc_lite1>;
+                status = "disabled";
+        };
+
+        fimc_is: fimc-is@12000000 {
+                compatible = "samsung,exynos4212-fimc-is";
+                reg = <0x12000000 0x260000>;
+                interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+                power-domains = <&pd_isp>;
+                clocks = <&isp_clock CLK_ISP_FIMC_LITE0>,
+                         <&isp_clock CLK_ISP_FIMC_LITE1>,
+                         <&isp_clock CLK_ISP_PPMUISPX>,
+                         <&isp_clock CLK_ISP_PPMUISPMX>,
+                         <&isp_clock CLK_ISP_FIMC_ISP>,
+                         <&isp_clock CLK_ISP_FIMC_DRC>,
+                         <&isp_clock CLK_ISP_FIMC_FD>,
+                         <&isp_clock CLK_ISP_MCUISP>,
+                         <&isp_clock CLK_ISP_GICISP>,
+                         <&isp_clock CLK_ISP_MCUCTL_ISP>,
+                         <&isp_clock CLK_ISP_PWM_ISP>,
+                         <&isp_clock CLK_ISP_DIV_ISP0>,
+                         <&isp_clock CLK_ISP_DIV_ISP1>,
+                         <&isp_clock CLK_ISP_DIV_MCUISP0>,
+                         <&isp_clock CLK_ISP_DIV_MCUISP1>,
+                         <&clock CLK_MOUT_MPLL_USER_T>,
+                         <&clock CLK_ACLK200>,
+                         <&clock CLK_ACLK400_MCUISP>,
+                         <&clock CLK_DIV_ACLK200>,
+                         <&clock CLK_DIV_ACLK400_MCUISP>,
+                         <&clock CLK_UART_ISP_SCLK>;
+                clock-names = "lite0", "lite1", "ppmuispx",
+                              "ppmuispmx", "isp",
+                              "drc", "fd", "mcuisp",
+                              "gicisp", "mcuctl_isp", "pwm_isp",
+                              "ispdiv0", "ispdiv1", "mcuispdiv0",
+                              "mcuispdiv1", "mpll", "aclk200",
+                              "aclk400mcuisp", "div_aclk200",
+                              "div_aclk400mcuisp", "uart";
+                iommus = <&sysmmu_fimc_isp>, <&sysmmu_fimc_drc>,
+                         <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>;
+                iommu-names = "isp", "drc", "fd", "mcuctl";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                status = "disabled";
+
+                pmu@10020000 {
+                        reg = <0x10020000 0x3000>;
+                };
+
+                i2c1_isp: i2c-isp@12140000 {
+                        compatible = "samsung,exynos4212-i2c-isp";
+                        reg = <0x12140000 0x100>;
+                        clocks = <&isp_clock CLK_ISP_I2C1_ISP>;
+                        clock-names = "i2c_isp";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+        };
+};
+
 &exynos_usbphy {
         compatible = "samsung,exynos4x12-usb2-phy";
         samsung,sysreg-phandle = <&sys_reg>;
@@ -693,35 +724,8 @@
                  <&clock CLK_SCLK_HDMI>, <&clock CLK_VP>;
 };
 
-&pinctrl_0 {
-        compatible = "samsung,exynos4x12-pinctrl";
-        reg = <0x11400000 0x1000>;
-        interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
-};
-
-&pinctrl_1 {
-        compatible = "samsung,exynos4x12-pinctrl";
-        reg = <0x11000000 0x1000>;
-        interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
-
-        wakup_eint: wakeup-interrupt-controller {
-                compatible = "samsung,exynos4210-wakeup-eint";
-                interrupt-parent = <&gic>;
-                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
-        };
-};
-
-&pinctrl_2 {
-        compatible = "samsung,exynos4x12-pinctrl";
-        reg = <0x03860000 0x1000>;
-        interrupt-parent = <&combiner>;
-        interrupts = <10 0>;
-};
-
-&pinctrl_3 {
-        compatible = "samsung,exynos4x12-pinctrl";
-        reg = <0x106E0000 0x1000>;
-        interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
+&pmu {
+        interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
 };
 
 &pmu_system_controller {
@@ -743,3 +747,5 @@
         clock-names = "tmu_apbif";
         status = "disabled";
 };
+
+#include "exynos4412-pinctrl.dtsi"
diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 59cf1b202849..fd9226d3b207 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -9,6 +9,7 @@
 #include <dt-bindings/clock/maxim,max77686.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/sound/samsung-i2s.h>
 #include "exynos5250.dtsi"
 
 / {
@@ -225,6 +226,16 @@
         };
 };
 
+&clock {
+        assigned-clocks = <&clock CLK_FOUT_EPLL>;
+        assigned-clock-rates = <49152000>;
+};
+
+&clock_audss {
+        assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>;
+        assigned-clock-parents = <&clock CLK_FOUT_EPLL>;
+};
+
 &cpu0 {
         cpu0-supply = <&buck2_reg>;
 };
@@ -513,6 +524,8 @@
 };
 
 &i2s0 {
+        assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
+        assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>;
         status = "okay";
 };
 
@@ -649,6 +662,11 @@
         };
 };
 
+&pmu_system_controller {
+        assigned-clocks = <&pmu_system_controller 0>;
+        assigned-clock-parents = <&clock CLK_FIN_PLL>;
+};
+
 &rtc {
         status = "okay";
         clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 4827cb506fa3..75fdc5e6d423 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -18,6 +18,14 @@
 
                 samsung,model = "Snow-I2S-MAX98095";
                 samsung,audio-codec = <&max98095>;
+
+                cpu {
+                        sound-dai = <&i2s0 0>;
+                };
+
+                codec {
+                        sound-dai = <&max98095 0>, <&hdmi>;
+                };
         };
 };
 
@@ -27,6 +35,9 @@
                 reg = <0x11>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&max98095_en>;
+                clocks = <&pmu_system_controller 0>;
+                clock-names = "mclk";
+                #sound-dai-cells = <1>;
         };
 };
 
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 56626d1a4235..45283a6c5eee 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -77,8 +77,6 @@
                                  300000  937500
                                  200000  925000
                         >;
-                        cooling-min-level = <15>;
-                        cooling-max-level = <9>;
                         #cooling-cells = <2>; /* min followed by max */
                 };
                 cpu@1 {
@@ -500,6 +498,8 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2s0_bus>;
                         power-domains = <&pd_mau>;
+                        #clock-cells = <1>;
+                        #sound-dai-cells = <1>;
                 };
 
                 i2s1: i2s@12d60000 {
@@ -514,6 +514,7 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2s1_bus>;
                         power-domains = <&pd_mau>;
+                        #sound-dai-cells = <1>;
                 };
 
                 i2s2: i2s@12d70000 {
@@ -528,6 +529,7 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2s2_bus>;
                         power-domains = <&pd_mau>;
+                        #sound-dai-cells = <1>;
                 };
 
                 usb_dwc3 {
@@ -655,7 +657,7 @@
                         power-domains = <&pd_gsc>;
                         clocks = <&clock CLK_GSCL0>;
                         clock-names = "gscl";
-                        iommu = <&sysmmu_gsc0>;
+                        iommus = <&sysmmu_gsc0>;
                 };
 
                 gsc_1:  gsc@13e10000 {
@@ -665,7 +667,7 @@
                         power-domains = <&pd_gsc>;
                         clocks = <&clock CLK_GSCL1>;
                         clock-names = "gscl";
-                        iommu = <&sysmmu_gsc1>;
+                        iommus = <&sysmmu_gsc1>;
                 };
 
                 gsc_2:  gsc@13e20000 {
@@ -675,7 +677,7 @@
                         power-domains = <&pd_gsc>;
                         clocks = <&clock CLK_GSCL2>;
                         clock-names = "gscl";
-                        iommu = <&sysmmu_gsc2>;
+                        iommus = <&sysmmu_gsc2>;
                 };
 
                 gsc_3:  gsc@13e30000 {
@@ -685,7 +687,7 @@
                         power-domains = <&pd_gsc>;
                         clocks = <&clock CLK_GSCL3>;
                         clock-names = "gscl";
-                        iommu = <&sysmmu_gsc3>;
+                        iommus = <&sysmmu_gsc3>;
                 };
 
                 hdmi: hdmi@14530000 {
@@ -700,6 +702,7 @@
                                         "sclk_hdmiphy", "mout_hdmi";
                         samsung,syscon-phandle = <&pmu_system_controller>;
                         phy = <&hdmiphy>;
+                        #sound-dai-cells = <0>;
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts
index 442eb0353f29..fa19c59b2fb6 100644
--- a/arch/arm/boot/dts/exynos5260-xyref5260.dts
+++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts
@@ -65,7 +65,6 @@
 &mmc_0 {
         status = "okay";
         broken-cd;
-        bypass-smu;
         cap-mmc-highspeed;
         supports-hs200-mode; /* 200 MHz */
         card-detect-delay = <200>;
diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi
index 1886aa00b2db..55509c690328 100644
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@ -11,7 +11,6 @@
  */
 
 #include "exynos54xx.dtsi"
-#include "exynos-syscon-restart.dtsi"
 #include <dt-bindings/clock/exynos5410.h>
 #include <dt-bindings/clock/exynos-audss-clk.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -197,9 +196,9 @@
                         interrupt-parent = <&gic>;
                         ranges;
 
-                        pdma0: pdma@12680000 {
+                        pdma0: pdma@121a0000 {
                                 compatible = "arm,pl330", "arm,primecell";
-                                reg = <0x121A0000 0x1000>;
+                                reg = <0x121a0000 0x1000>;
                                 interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clock CLK_PDMA0>;
                                 clock-names = "apb_pclk";
@@ -208,9 +207,9 @@
                                 #dma-requests = <32>;
                         };
 
-                        pdma1: pdma@12690000 {
+                        pdma1: pdma@121b0000 {
                                 compatible = "arm,pl330", "arm,primecell";
-                                reg = <0x121B0000 0x1000>;
+                                reg = <0x121b0000 0x1000>;
                                 interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clock CLK_PDMA1>;
                                 clock-names = "apb_pclk";
diff --git a/arch/arm/boot/dts/exynos5420-cpus.dtsi b/arch/arm/boot/dts/exynos5420-cpus.dtsi
index 123f0cef658d..a8e449471304 100644
--- a/arch/arm/boot/dts/exynos5420-cpus.dtsi
+++ b/arch/arm/boot/dts/exynos5420-cpus.dtsi
@@ -30,8 +30,6 @@
                         clock-frequency = <1800000000>;
                         cci-control-port = <&cci_control1>;
                         operating-points-v2 = <&cluster_a15_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <11>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <1024>;
                 };
@@ -43,8 +41,6 @@
                         clock-frequency = <1800000000>;
                         cci-control-port = <&cci_control1>;
                         operating-points-v2 = <&cluster_a15_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <11>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <1024>;
                 };
@@ -56,8 +52,6 @@
                         clock-frequency = <1800000000>;
                         cci-control-port = <&cci_control1>;
                         operating-points-v2 = <&cluster_a15_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <11>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <1024>;
                 };
@@ -69,8 +63,6 @@
                         clock-frequency = <1800000000>;
                         cci-control-port = <&cci_control1>;
                         operating-points-v2 = <&cluster_a15_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <11>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <1024>;
                 };
@@ -83,8 +75,6 @@
                         clock-frequency = <1000000000>;
                         cci-control-port = <&cci_control0>;
                         operating-points-v2 = <&cluster_a7_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <7>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <539>;
                 };
@@ -96,8 +86,6 @@
                         clock-frequency = <1000000000>;
                         cci-control-port = <&cci_control0>;
                         operating-points-v2 = <&cluster_a7_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <7>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <539>;
                 };
@@ -109,8 +97,6 @@
                         clock-frequency = <1000000000>;
                         cci-control-port = <&cci_control0>;
                         operating-points-v2 = <&cluster_a7_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <7>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <539>;
                 };
@@ -122,8 +108,6 @@
                         clock-frequency = <1000000000>;
                         cci-control-port = <&cci_control0>;
                         operating-points-v2 = <&cluster_a7_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <7>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <539>;
                 };
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 5a76ed77dda1..244f0091c21f 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -11,6 +11,7 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/clock/maxim,max77802.h>
 #include <dt-bindings/regulator/maxim,max77802.h>
+#include <dt-bindings/sound/samsung-i2s.h>
 #include "exynos5420.dtsi"
 #include "exynos5420-cpus.dtsi"
 
@@ -86,6 +87,14 @@
                 samsung,model = "Peach-Pit-I2S-MAX98090";
                 samsung,i2s-controller = <&i2s0>;
                 samsung,audio-codec = <&max98090>;
+
+                cpu {
+                        sound-dai = <&i2s0 0>;
+                };
+
+                codec {
+                        sound-dai = <&max98090>, <&hdmi>;
+                };
         };
 
         usb300_vbus_reg: regulator-usb300 {
@@ -142,6 +151,11 @@
         vdd-supply = <&ldo9_reg>;
 };
 
+&clock_audss {
+        assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>;
+        assigned-clock-parents = <&clock CLK_FOUT_EPLL>;
+};
+
 &cpu0 {
         cpu-supply = <&buck2_reg>;
 };
@@ -606,6 +620,7 @@
                 pinctrl-0 = <&max98090_irq>;
                 clocks = <&pmu_system_controller 0>;
                 clock-names = "mclk";
+                #sound-dai-cells = <0>;
         };
 
         light-sensor@44 {
@@ -690,6 +705,8 @@
 };
 
 &i2s0 {
+        assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
+        assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/exynos5422-cpus.dtsi b/arch/arm/boot/dts/exynos5422-cpus.dtsi
index c593809c7f08..7c130a00d1a8 100644
--- a/arch/arm/boot/dts/exynos5422-cpus.dtsi
+++ b/arch/arm/boot/dts/exynos5422-cpus.dtsi
@@ -29,8 +29,6 @@
                         clock-frequency = <1000000000>;
                         cci-control-port = <&cci_control0>;
                         operating-points-v2 = <&cluster_a7_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <11>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <539>;
                 };
@@ -42,8 +40,6 @@
                         clock-frequency = <1000000000>;
                         cci-control-port = <&cci_control0>;
                         operating-points-v2 = <&cluster_a7_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <11>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <539>;
                 };
@@ -55,8 +51,6 @@
                         clock-frequency = <1000000000>;
                         cci-control-port = <&cci_control0>;
                         operating-points-v2 = <&cluster_a7_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <11>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <539>;
                 };
@@ -68,8 +62,6 @@
                         clock-frequency = <1000000000>;
                         cci-control-port = <&cci_control0>;
                         operating-points-v2 = <&cluster_a7_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <11>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <539>;
                 };
@@ -82,8 +74,6 @@
                         clock-frequency = <1800000000>;
                         cci-control-port = <&cci_control1>;
                         operating-points-v2 = <&cluster_a15_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <15>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <1024>;
                 };
@@ -95,8 +85,6 @@
                         clock-frequency = <1800000000>;
                         cci-control-port = <&cci_control1>;
                         operating-points-v2 = <&cluster_a15_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <15>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <1024>;
                 };
@@ -108,8 +96,6 @@
                         clock-frequency = <1800000000>;
                         cci-control-port = <&cci_control1>;
                         operating-points-v2 = <&cluster_a15_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <15>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <1024>;
                 };
@@ -121,8 +107,6 @@
                         clock-frequency = <1800000000>;
                         cci-control-port = <&cci_control1>;
                         operating-points-v2 = <&cluster_a15_opp_table>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <15>;
                         #cooling-cells = <2>; /* min followed by max */
                         capacity-dmips-mhz = <1024>;
                 };
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index fce9e26b5930..f3abecc44657 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -26,24 +26,6 @@
                 tmuctrl2 = &tmuctrl_2;
         };
 
-        clock: clock-controller@160000 {
-                compatible = "samsung,exynos5440-clock";
-                reg = <0x160000 0x1000>;
-                #clock-cells = <1>;
-        };
-
-        gic: interrupt-controller@2e0000 {
-                compatible = "arm,cortex-a15-gic";
-                #interrupt-cells = <3>;
-                interrupt-controller;
-                reg =   <0x2E1000 0x1000>,
-                        <0x2E2000 0x2000>,
-                        <0x2E4000 0x2000>,
-                        <0x2E6000 0x2000>;
-                interrupts = <GIC_PPI 9
-                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
-        };
-
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -70,182 +52,290 @@
                 };
         };
 
-        arm-pmu {
-                compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";
-                interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-        };
+        soc: soc {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
 
-        timer {
-                compatible = "arm,cortex-a15-timer",
-                             "arm,armv7-timer";
-                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)>;
-                clock-frequency = <50000000>;
-        };
+                clock: clock-controller@160000 {
+                        compatible = "samsung,exynos5440-clock";
+                        reg = <0x160000 0x1000>;
+                        #clock-cells = <1>;
+                };
 
-        cpufreq@160000 {
-                compatible = "samsung,exynos5440-cpufreq";
-                reg = <0x160000 0x1000>;
-                interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
-                operating-points = <
-                                /* KHz    uV */
-                                1500000 1100000
-                                1400000 1075000
-                                1300000 1050000
-                                1200000 1025000
-                                1100000 1000000
-                                1000000 975000
-                                900000  950000
-                                800000  925000
-                >;
-        };
+                gic: interrupt-controller@2e0000 {
+                        compatible = "arm,cortex-a15-gic";
+                        #interrupt-cells = <3>;
+                        interrupt-controller;
+                        reg =   <0x2E1000 0x1000>,
+                                <0x2E2000 0x2000>,
+                                <0x2E4000 0x2000>,
+                                <0x2E6000 0x2000>;
+                        interrupts = <GIC_PPI 9
+                                        (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+                };
 
-        serial_0: serial@b0000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0xB0000 0x1000>;
-                interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_B_125>, <&clock CLK_B_125>;
-                clock-names = "uart", "clk_uart_baud0";
-        };
 
-        serial_1: serial@c0000 {
-                compatible = "samsung,exynos4210-uart";
-                reg = <0xC0000 0x1000>;
-                interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_B_125>, <&clock CLK_B_125>;
-                clock-names = "uart", "clk_uart_baud0";
-        };
+                arm-pmu {
+                        compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";
+                        interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+                };
 
-        spi_0: spi@d0000 {
-                compatible = "samsung,exynos5440-spi";
-                reg = <0xD0000 0x100>;
-                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                samsung,spi-src-clk = <0>;
-                num-cs = <1>;
-                clocks = <&clock CLK_B_125>, <&clock CLK_SPI_BAUD>;
-                clock-names = "spi", "spi_busclk0";
-        };
+                timer {
+                        compatible = "arm,cortex-a15-timer",
+                                     "arm,armv7-timer";
+                        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)>;
+                        clock-frequency = <50000000>;
+                };
 
-        pin_ctrl: pinctrl@e0000 {
-                compatible = "samsung,exynos5440-pinctrl";
-                reg = <0xE0000 0x1000>;
-                interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-controller;
-                #interrupt-cells = <2>;
-                #gpio-cells = <2>;
+                cpufreq@160000 {
+                        compatible = "samsung,exynos5440-cpufreq";
+                        reg = <0x160000 0x1000>;
+                        interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+                        operating-points = <
+                                        /* KHz    uV */
+                                        1500000 1100000
+                                        1400000 1075000
+                                        1300000 1050000
+                                        1200000 1025000
+                                        1100000 1000000
+                                        1000000 975000
+                                        900000  950000
+                                        800000  925000
+                        >;
+                };
 
-                fan: fan {
-                        samsung,exynos5440-pin-function = <1>;
+                serial_0: serial@b0000 {
+                        compatible = "samsung,exynos4210-uart";
+                        reg = <0xB0000 0x1000>;
+                        interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_B_125>, <&clock CLK_B_125>;
+                        clock-names = "uart", "clk_uart_baud0";
                 };
 
-                hdd_led0: hdd_led0 {
-                        samsung,exynos5440-pin-function = <2>;
+                serial_1: serial@c0000 {
+                        compatible = "samsung,exynos4210-uart";
+                        reg = <0xC0000 0x1000>;
+                        interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_B_125>, <&clock CLK_B_125>;
+                        clock-names = "uart", "clk_uart_baud0";
                 };
 
-                hdd_led1: hdd_led1 {
-                        samsung,exynos5440-pin-function = <3>;
+                spi_0: spi@d0000 {
+                        compatible = "samsung,exynos5440-spi";
+                        reg = <0xD0000 0x100>;
+                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        samsung,spi-src-clk = <0>;
+                        num-cs = <1>;
+                        clocks = <&clock CLK_B_125>, <&clock CLK_SPI_BAUD>;
+                        clock-names = "spi", "spi_busclk0";
                 };
 
-                uart1: uart1 {
-                        samsung,exynos5440-pin-function = <4>;
+                pin_ctrl: pinctrl@e0000 {
+                        compatible = "samsung,exynos5440-pinctrl";
+                        reg = <0xE0000 0x1000>;
+                        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        #gpio-cells = <2>;
+
+                        fan: fan {
+                                samsung,exynos5440-pin-function = <1>;
+                        };
+
+                        hdd_led0: hdd_led0 {
+                                samsung,exynos5440-pin-function = <2>;
+                        };
+
+                        hdd_led1: hdd_led1 {
+                                samsung,exynos5440-pin-function = <3>;
+                        };
+
+                        uart1: uart1 {
+                                samsung,exynos5440-pin-function = <4>;
+                        };
                 };
-        };
 
-        i2c@f0000 {
-                compatible = "samsung,exynos5440-i2c";
-                reg = <0xF0000 0x1000>;
-                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                clocks = <&clock CLK_B_125>;
-                clock-names = "i2c";
-        };
+                i2c@f0000 {
+                        compatible = "samsung,exynos5440-i2c";
+                        reg = <0xF0000 0x1000>;
+                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&clock CLK_B_125>;
+                        clock-names = "i2c";
+                };
 
-        i2c@100000 {
-                compatible = "samsung,exynos5440-i2c";
-                reg = <0x100000 0x1000>;
-                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                clocks = <&clock CLK_B_125>;
-                clock-names = "i2c";
-        };
+                i2c@100000 {
+                        compatible = "samsung,exynos5440-i2c";
+                        reg = <0x100000 0x1000>;
+                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&clock CLK_B_125>;
+                        clock-names = "i2c";
+                };
 
-        watchdog@110000 {
-                compatible = "samsung,s3c6410-wdt";
-                reg = <0x110000 0x1000>;
-                interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_B_125>;
-                clock-names = "watchdog";
-        };
+                watchdog@110000 {
+                        compatible = "samsung,s3c6410-wdt";
+                        reg = <0x110000 0x1000>;
+                        interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_B_125>;
+                        clock-names = "watchdog";
+                };
 
-        gmac: ethernet@230000 {
-                compatible = "snps,dwmac-3.70a", "snps,dwmac";
-                reg = <0x00230000 0x8000>;
-                interrupt-parent = <&gic>;
-                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "macirq";
-                phy-mode = "sgmii";
-                clocks = <&clock CLK_GMAC0>;
-                clock-names = "stmmaceth";
-        };
+                gmac: ethernet@230000 {
+                        compatible = "snps,dwmac-3.70a", "snps,dwmac";
+                        reg = <0x00230000 0x8000>;
+                        interrupt-parent = <&gic>;
+                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "macirq";
+                        phy-mode = "sgmii";
+                        clocks = <&clock CLK_GMAC0>;
+                        clock-names = "stmmaceth";
+                };
 
-        amba {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                compatible = "simple-bus";
-                interrupt-parent = <&gic>;
-                ranges;
-        };
+                amba {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "simple-bus";
+                        interrupt-parent = <&gic>;
+                        ranges;
+                };
 
-        rtc@130000 {
-                compatible = "samsung,s3c6410-rtc";
-                reg = <0x130000 0x1000>;
-                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_B_125>;
-                clock-names = "rtc";
-        };
+                rtc@130000 {
+                        compatible = "samsung,s3c6410-rtc";
+                        reg = <0x130000 0x1000>;
+                        interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_B_125>;
+                        clock-names = "rtc";
+                };
 
-        tmuctrl_0: tmuctrl@160118 {
-                compatible = "samsung,exynos5440-tmu";
-                reg = <0x160118 0x230>, <0x160368 0x10>;
-                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_B_125>;
-                clock-names = "tmu_apbif";
-                #include "exynos5440-tmu-sensor-conf.dtsi"
-        };
+                tmuctrl_0: tmuctrl@160118 {
+                        compatible = "samsung,exynos5440-tmu";
+                        reg = <0x160118 0x230>, <0x160368 0x10>;
+                        interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_B_125>;
+                        clock-names = "tmu_apbif";
+                        #include "exynos5440-tmu-sensor-conf.dtsi"
+                };
 
-        tmuctrl_1: tmuctrl@16011c {
-                compatible = "samsung,exynos5440-tmu";
-                reg = <0x16011C 0x230>, <0x160368 0x10>;
-                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_B_125>;
-                clock-names = "tmu_apbif";
-                #include "exynos5440-tmu-sensor-conf.dtsi"
-        };
+                tmuctrl_1: tmuctrl@16011c {
+                        compatible = "samsung,exynos5440-tmu";
+                        reg = <0x16011C 0x230>, <0x160368 0x10>;
+                        interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_B_125>;
+                        clock-names = "tmu_apbif";
+                        #include "exynos5440-tmu-sensor-conf.dtsi"
+                };
+
+                tmuctrl_2: tmuctrl@160120 {
+                        compatible = "samsung,exynos5440-tmu";
+                        reg = <0x160120 0x230>, <0x160368 0x10>;
+                        interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_B_125>;
+                        clock-names = "tmu_apbif";
+                        #include "exynos5440-tmu-sensor-conf.dtsi"
+                };
 
-        tmuctrl_2: tmuctrl@160120 {
-                compatible = "samsung,exynos5440-tmu";
-                reg = <0x160120 0x230>, <0x160368 0x10>;
-                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_B_125>;
-                clock-names = "tmu_apbif";
-                #include "exynos5440-tmu-sensor-conf.dtsi"
+                sata@210000 {
+                        compatible = "snps,exynos5440-ahci";
+                        reg = <0x210000 0x10000>;
+                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_SATA>;
+                        clock-names = "sata";
+                };
+
+                ohci@220000 {
+                        compatible = "samsung,exynos5440-ohci";
+                        reg = <0x220000 0x1000>;
+                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_USB>;
+                        clock-names = "usbhost";
+                };
+
+                ehci@221000 {
+                        compatible = "samsung,exynos5440-ehci";
+                        reg = <0x221000 0x1000>;
+                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_USB>;
+                        clock-names = "usbhost";
+                };
+
+                pcie_phy0: pcie-phy@270000 {
+                        #phy-cells = <0>;
+                        compatible = "samsung,exynos5440-pcie-phy";
+                        reg = <0x270000 0x1000>, <0x271000 0x40>;
+                };
+
+                pcie_phy1: pcie-phy@272000 {
+                        #phy-cells = <0>;
+                        compatible = "samsung,exynos5440-pcie-phy";
+                        reg = <0x272000 0x1000>, <0x271040 0x40>;
+                };
+
+                pcie_0: pcie@290000 {
+                        compatible = "samsung,exynos5440-pcie", "snps,dw-pcie";
+                        reg = <0x290000 0x1000>, <0x40000000 0x1000>;
+                        reg-names = "elbi", "config";
+                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_PR0_250_O>, <&clock CLK_PB0_250_O>;
+                        clock-names = "pcie", "pcie_bus";
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        device_type = "pci";
+                        phys = <&pcie_phy0>;
+                        ranges = <0x81000000 0 0          0x40001000 0 0x00010000   /* downstream I/O */
+                                  0x82000000 0 0x40011000 0x40011000 0 0x1ffef000>; /* non-prefetchable memory */
+                        bus-range = <0x00 0xff>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0x0 0 &gic 53>;
+                        num-lanes = <4>;
+                        status = "disabled";
+                };
+
+                pcie_1: pcie@2a0000 {
+                        compatible = "samsung,exynos5440-pcie", "snps,dw-pcie";
+                        reg = <0x2a0000 0x1000>, <0x60000000 0x1000>;
+                        reg-names = "elbi", "config";
+                        interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clock CLK_PR1_250_O>, <&clock CLK_PB0_250_O>;
+                        clock-names = "pcie", "pcie_bus";
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        device_type = "pci";
+                        phys = <&pcie_phy1>;
+                        ranges = <0x81000000 0 0          0x60001000 0 0x00010000   /* downstream I/O */
+                                  0x82000000 0 0x60011000 0x60011000 0 0x1ffef000>; /* non-prefetchable memory */
+                        bus-range = <0x00 0xff>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0x0 0 &gic 56>;
+                        num-lanes = <4>;
+                        status = "disabled";
+                };
         };
 
         thermal-zones {
@@ -262,86 +352,4 @@
                        #include "exynos5440-trip-points.dtsi"
                 };
         };
-
-        sata@210000 {
-                compatible = "snps,exynos5440-ahci";
-                reg = <0x210000 0x10000>;
-                interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_SATA>;
-                clock-names = "sata";
-        };
-
-        ohci@220000 {
-                compatible = "samsung,exynos5440-ohci";
-                reg = <0x220000 0x1000>;
-                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_USB>;
-                clock-names = "usbhost";
-        };
-
-        ehci@221000 {
-                compatible = "samsung,exynos5440-ehci";
-                reg = <0x221000 0x1000>;
-                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_USB>;
-                clock-names = "usbhost";
-        };
-
-        pcie_phy0: pcie-phy@270000 {
-                #phy-cells = <0>;
-                compatible = "samsung,exynos5440-pcie-phy";
-                reg = <0x270000 0x1000>, <0x271000 0x40>;
-        };
-
-        pcie_phy1: pcie-phy@272000 {
-                #phy-cells = <0>;
-                compatible = "samsung,exynos5440-pcie-phy";
-                reg = <0x272000 0x1000>, <0x271040 0x40>;
-        };
-
-        pcie_0: pcie@290000 {
-                compatible = "samsung,exynos5440-pcie", "snps,dw-pcie";
-                reg = <0x290000 0x1000>, <0x40000000 0x1000>;
-                reg-names = "elbi", "config";
-                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_PR0_250_O>, <&clock CLK_PB0_250_O>;
-                clock-names = "pcie", "pcie_bus";
-                #address-cells = <3>;
-                #size-cells = <2>;
-                device_type = "pci";
-                phys = <&pcie_phy0>;
-                ranges = <0x81000000 0 0          0x40001000 0 0x00010000   /* downstream I/O */
-                          0x82000000 0 0x40011000 0x40011000 0 0x1ffef000>; /* non-prefetchable memory */
-                bus-range = <0x00 0xff>;
-                #interrupt-cells = <1>;
-                interrupt-map-mask = <0 0 0 0>;
-                interrupt-map = <0x0 0 &gic 53>;
-                num-lanes = <4>;
-                status = "disabled";
-        };
-
-        pcie_1: pcie@2a0000 {
-                compatible = "samsung,exynos5440-pcie", "snps,dw-pcie";
-                reg = <0x2a0000 0x1000>, <0x60000000 0x1000>;
-                reg-names = "elbi", "config";
-                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&clock CLK_PR1_250_O>, <&clock CLK_PB0_250_O>;
-                clock-names = "pcie", "pcie_bus";
-                #address-cells = <3>;
-                #size-cells = <2>;
-                device_type = "pci";
-                phys = <&pcie_phy1>;
-                ranges = <0x81000000 0 0          0x60001000 0 0x00010000   /* downstream I/O */
-                          0x82000000 0 0x60011000 0x60011000 0 0x1ffef000>; /* non-prefetchable memory */
-                bus-range = <0x00 0xff>;
-                #interrupt-cells = <1>;
-                interrupt-map-mask = <0 0 0 0>;
-                interrupt-map = <0x0 0 &gic 56>;
-                num-lanes = <4>;
-                status = "disabled";
-        };
 };
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 0029ec27819c..2f8df9244f72 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Google Peach Pi Rev 10+ board device tree source
  *
  * Copyright (c) 2014 Google, Inc
- *
- * 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/;
@@ -14,6 +11,7 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/clock/maxim,max77802.h>
 #include <dt-bindings/regulator/maxim,max77802.h>
+#include <dt-bindings/sound/samsung-i2s.h>
 #include "exynos5800.dtsi"
 #include "exynos5420-cpus.dtsi"
 
@@ -89,6 +87,14 @@
                 samsung,model = "Peach-Pi-I2S-MAX98091";
                 samsung,i2s-controller = <&i2s0>;
                 samsung,audio-codec = <&max98091>;
+
+                cpu {
+                        sound-dai = <&i2s0 0>;
+                };
+
+                codec {
+                        sound-dai = <&max98091>, <&hdmi>;
+                };
         };
 
         usb300_vbus_reg: regulator-usb300 {
@@ -145,6 +151,11 @@
         vdd-supply = <&ldo9_reg>;
 };
 
+&clock_audss {
+        assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>;
+        assigned-clock-parents = <&clock CLK_FOUT_EPLL>;
+};
+
 &cpu0 {
         cpu-supply = <&buck2_reg>;
 };
@@ -609,6 +620,7 @@
                 pinctrl-0 = <&max98091_irq>;
                 clocks = <&pmu_system_controller 0>;
                 clock-names = "mclk";
+                #sound-dai-cells = <0>;
         };
 
         light-sensor@44 {
@@ -661,6 +673,8 @@
 };
 
 &i2s0 {
+        assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
+        assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/exynos5800.dtsi b/arch/arm/boot/dts/exynos5800.dtsi
index 9ddb6bacac5a..57d3b319fd65 100644
--- a/arch/arm/boot/dts/exynos5800.dtsi
+++ b/arch/arm/boot/dts/exynos5800.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SAMSUNG EXYNOS5800 SoC device tree source
  *
@@ -7,10 +8,6 @@
  * SAMSUNG EXYNOS5800 SoC device nodes are listed in this file.
  * EXYNOS5800 based board files can include this file and provide
  * values for board specfic bindings.
- *
- * 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.
  */
 
 #include "exynos5420.dtsi"
diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
index da8bb9d60f99..403364a7aab9 100644
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -78,8 +78,6 @@
                 gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
                         <&gpio0 12 GPIO_ACTIVE_HIGH>;
                 gpio-fan,speed-map = <0 0>, <3000 1>, <6000 2>;
-                cooling-min-level = <0>;
-                cooling-max-level = <2>;
                 #cooling-cells = <2>;
         };
 
diff --git a/arch/arm/boot/dts/imx1-ads.dts b/arch/arm/boot/dts/imx1-ads.dts
index 5ea28ee07cf4..6354e4c87313 100644
--- a/arch/arm/boot/dts/imx1-ads.dts
+++ b/arch/arm/boot/dts/imx1-ads.dts
@@ -20,7 +20,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@8000000 {
                 reg = <0x08000000 0x04000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx1-apf9328.dts b/arch/arm/boot/dts/imx1-apf9328.dts
index e8b4b52c2418..11515c0cb195 100644
--- a/arch/arm/boot/dts/imx1-apf9328.dts
+++ b/arch/arm/boot/dts/imx1-apf9328.dts
@@ -20,7 +20,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@8000000 {
                 reg = <0x08000000 0x00800000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi
index 20f6565c337d..f7b9edf93f5e 100644
--- a/arch/arm/boot/dts/imx1.dtsi
+++ b/arch/arm/boot/dts/imx1.dtsi
@@ -25,7 +25,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 gpio0 = &gpio1;
diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
index 57e29977ba06..9d92ece82560 100644
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -16,7 +16,7 @@
         model = "Freescale i.MX23 Evaluation Kit";
         compatible = "fsl,imx23-evk", "fsl,imx23";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
index a8b1c53ebe46..e9351774c619 100644
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -19,7 +19,7 @@
         model = "i.MX23 Olinuxino Low Cost Board";
         compatible = "olimex,imx23-olinuxino", "fsl,imx23";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x04000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx23-sansa.dts b/arch/arm/boot/dts/imx23-sansa.dts
index 221fd55e967e..67de7863ad79 100644
--- a/arch/arm/boot/dts/imx23-sansa.dts
+++ b/arch/arm/boot/dts/imx23-sansa.dts
@@ -49,7 +49,7 @@
         model = "SanDisk Sansa Fuze+";
         compatible = "sandisk,sansa_fuze_plus", "fsl,imx23";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x04000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx23-stmp378x_devb.dts b/arch/arm/boot/dts/imx23-stmp378x_devb.dts
index 455169e99d49..95c7b918f6d6 100644
--- a/arch/arm/boot/dts/imx23-stmp378x_devb.dts
+++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts
@@ -16,7 +16,7 @@
         model = "Freescale STMP378x Development Board";
         compatible = "fsl,stmp378x-devb", "fsl,imx23";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x04000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx23-xfi3.dts b/arch/arm/boot/dts/imx23-xfi3.dts
index 025cf949662d..9616e500b996 100644
--- a/arch/arm/boot/dts/imx23-xfi3.dts
+++ b/arch/arm/boot/dts/imx23-xfi3.dts
@@ -48,7 +48,7 @@
         model = "Creative ZEN X-Fi3";
         compatible = "creative,x-fi3", "fsl,imx23";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x04000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 10d57f9cbb42..cb0a3fe32718 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -23,7 +23,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 gpio0 = &gpio0;
@@ -222,7 +222,8 @@
                                         fsl,pull-up = <MXS_PULL_DISABLE>;
                                 };
 
-                                gpmi_pins_fixup: gpmi-pins-fixup {
+                                gpmi_pins_fixup: gpmi-pins-fixup@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX23_PAD_GPMI_WPN__GPMI_WPN
                                                 MX23_PAD_GPMI_WRN__GPMI_WRN
@@ -266,7 +267,8 @@
                                         fsl,pull-up = <MXS_PULL_ENABLE>;
                                 };
 
-                                mmc0_pins_fixup: mmc0-pins-fixup {
+                                mmc0_pins_fixup: mmc0-pins-fixup@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX23_PAD_SSP1_DETECT__SSP1_DETECT
                                                 MX23_PAD_SSP1_SCK__SSP1_SCK
diff --git a/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
index d6f27641c0ef..e316fe08837a 100644
--- a/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
+++ b/arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
@@ -17,7 +17,7 @@
         model = "Eukrea CPUIMX25";
         compatible = "eukrea,cpuimx25", "fsl,imx25";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x4000000>; /* 64M */
         };
 };
diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
index 0f053721d80f..6273a1f243ed 100644
--- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
+++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
@@ -88,12 +88,12 @@
 
                 pinctrl_esdhc1: esdhc1grp {
                         fsl,pins = <
-                                MX25_PAD_SD1_CMD__SD1_CMD               0x400000c0
-                                MX25_PAD_SD1_CLK__SD1_CLK               0x400000c0
-                                MX25_PAD_SD1_DATA0__SD1_DATA0           0x400000c0
-                                MX25_PAD_SD1_DATA1__SD1_DATA1           0x400000c0
-                                MX25_PAD_SD1_DATA2__SD1_DATA2           0x400000c0
-                                MX25_PAD_SD1_DATA3__SD1_DATA3           0x400000c0
+                                MX25_PAD_SD1_CMD__ESDHC1_CMD            0x400000c0
+                                MX25_PAD_SD1_CLK__ESDHC1_CLK            0x400000c0
+                                MX25_PAD_SD1_DATA0__ESDHC1_DAT0         0x400000c0
+                                MX25_PAD_SD1_DATA1__ESDHC1_DAT1         0x400000c0
+                                MX25_PAD_SD1_DATA2__ESDHC1_DAT2         0x400000c0
+                                MX25_PAD_SD1_DATA3__ESDHC1_DAT3         0x400000c0
                         >;
                 };
 
diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
index 30a62d4be8d9..5cb6967866c0 100644
--- a/arch/arm/boot/dts/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
@@ -36,7 +36,7 @@
                 };
         };
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
index 2d15ce72d006..7f9bd052b84e 100644
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@@ -18,7 +18,7 @@
         model = "Freescale i.MX25 Product Development Kit";
         compatible = "fsl,imx25-pdk", "fsl,imx25";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x4000000>;
         };
 
@@ -165,12 +165,12 @@
 
                 pinctrl_esdhc1: esdhc1grp {
                         fsl,pins = <
-                                MX25_PAD_SD1_CMD__SD1_CMD               0x80000000
-                                MX25_PAD_SD1_CLK__SD1_CLK               0x80000000
-                                MX25_PAD_SD1_DATA0__SD1_DATA0           0x80000000
-                                MX25_PAD_SD1_DATA1__SD1_DATA1           0x80000000
-                                MX25_PAD_SD1_DATA2__SD1_DATA2           0x80000000
-                                MX25_PAD_SD1_DATA3__SD1_DATA3           0x80000000
+                                MX25_PAD_SD1_CMD__ESDHC1_CMD            0x80000000
+                                MX25_PAD_SD1_CLK__ESDHC1_CLK            0x80000000
+                                MX25_PAD_SD1_DATA0__ESDHC1_DAT0         0x80000000
+                                MX25_PAD_SD1_DATA1__ESDHC1_DAT1         0x80000000
+                                MX25_PAD_SD1_DATA2__ESDHC1_DAT2         0x80000000
+                                MX25_PAD_SD1_DATA3__ESDHC1_DAT3         0x80000000
                                 MX25_PAD_A14__GPIO_2_0                  0x80000000
                                 MX25_PAD_A15__GPIO_2_1                  0x80000000
                         >;
diff --git a/arch/arm/boot/dts/imx25-pinfunc.h b/arch/arm/boot/dts/imx25-pinfunc.h
index 6c63dca1b9b8..a4807062a90f 100644
--- a/arch/arm/boot/dts/imx25-pinfunc.h
+++ b/arch/arm/boot/dts/imx25-pinfunc.h
@@ -151,21 +151,21 @@
 #define MX25_PAD_D15__D15                       0x088 0x280 0x000 0x00 0x000
 #define MX25_PAD_D15__LD16                      0x088 0x280 0x000 0x01 0x000
 #define MX25_PAD_D15__GPIO_4_5                  0x088 0x280 0x000 0x05 0x000
-#define MX25_PAD_D15__SDHC1_DAT7                0x088 0x280 0x4d8 0x06 0x000
+#define MX25_PAD_D15__ESDHC1_DAT7               0x088 0x280 0x4d8 0x06 0x000
 
 #define MX25_PAD_D14__D14                       0x08c 0x284 0x000 0x00 0x000
 #define MX25_PAD_D14__LD17                      0x08c 0x284 0x000 0x01 0x000
 #define MX25_PAD_D14__GPIO_4_6                  0x08c 0x284 0x000 0x05 0x000
-#define MX25_PAD_D14__SDHC1_DAT6                0x08c 0x284 0x4d4 0x06 0x000
+#define MX25_PAD_D14__ESDHC1_DAT6               0x08c 0x284 0x4d4 0x06 0x000
 
 #define MX25_PAD_D13__D13                       0x090 0x288 0x000 0x00 0x000
 #define MX25_PAD_D13__LD18                      0x090 0x288 0x000 0x01 0x000
 #define MX25_PAD_D13__GPIO_4_7                  0x090 0x288 0x000 0x05 0x000
-#define MX25_PAD_D13__SDHC1_DAT5                0x090 0x288 0x4d0 0x06 0x000
+#define MX25_PAD_D13__ESDHC1_DAT5               0x090 0x288 0x4d0 0x06 0x000
 
 #define MX25_PAD_D12__D12                       0x094 0x28c 0x000 0x00 0x000
 #define MX25_PAD_D12__GPIO_4_8                  0x094 0x28c 0x000 0x05 0x000
-#define MX25_PAD_D12__SDHC1_DAT4                0x094 0x28c 0x4cc 0x06 0x000
+#define MX25_PAD_D12__ESDHC1_DAT4               0x094 0x28c 0x4cc 0x06 0x000
 
 #define MX25_PAD_D11__D11                       0x098 0x290 0x000 0x00 0x000
 #define MX25_PAD_D11__GPIO_4_9                  0x098 0x290 0x000 0x05 0x000
@@ -236,12 +236,13 @@
 #define MX25_PAD_LD8__LD8                       0x0e8 0x2e0 0x000 0x00 0x000
 #define MX25_PAD_LD8__UART4_RXD                 0x0e8 0x2e0 0x570 0x02 0x000
 #define MX25_PAD_LD8__FEC_TX_ERR                0x0e8 0x2e0 0x000 0x05 0x000
-#define MX25_PAD_LD8__SDHC2_CMD                 0x0e8 0x2e0 0x4e0 0x06 0x000
+/* SION must be set; see the comment for MX25_PAD_SD1_CMD__ESDHC1_CMD. */
+#define MX25_PAD_LD8__ESDHC2_CMD                0x0e8 0x2e0 0x4e0 0x16 0x000
 
 #define MX25_PAD_LD9__LD9                       0x0ec 0x2e4 0x000 0x00 0x000
 #define MX25_PAD_LD9__UART4_TXD                 0x0ec 0x2e4 0x000 0x02 0x000
 #define MX25_PAD_LD9__FEC_COL                   0x0ec 0x2e4 0x504 0x05 0x001
-#define MX25_PAD_LD9__SDHC2_CLK                 0x0ec 0x2e4 0x4dc 0x06 0x000
+#define MX25_PAD_LD9__ESDHC2_CLK                0x0ec 0x2e4 0x4dc 0x06 0x000
 
 #define MX25_PAD_LD10__LD10                     0x0f0 0x2e8 0x000 0x00 0x000
 #define MX25_PAD_LD10__UART4_RTS                0x0f0 0x2e8 0x56c 0x02 0x000
@@ -250,7 +251,7 @@
 #define MX25_PAD_LD11__LD11                     0x0f4 0x2ec 0x000 0x00 0x000
 #define MX25_PAD_LD11__UART4_CTS                0x0f4 0x2ec 0x000 0x02 0x000
 #define MX25_PAD_LD11__FEC_RDATA2               0x0f4 0x2ec 0x50c 0x05 0x001
-#define MX25_PAD_LD11__SDHC2_DAT1               0x0f4 0x2ec 0x4e8 0x06 0x000
+#define MX25_PAD_LD11__ESDHC2_DAT1              0x0f4 0x2ec 0x4e8 0x06 0x000
 
 #define MX25_PAD_LD12__LD12                     0x0f8 0x2f0 0x000 0x00 0x000
 #define MX25_PAD_LD12__CSPI2_MOSI               0x0f8 0x2f0 0x4a0 0x02 0x000
@@ -316,12 +317,13 @@
 #define MX25_PAD_CSI_D5__CSPI3_RDY              0x12c 0x324 0x000 0x07 0x000
 
 #define MX25_PAD_CSI_D6__CSI_D6                 0x130 0x328 0x000 0x00 0x000
-#define MX25_PAD_CSI_D6__SDHC2_CMD              0x130 0x328 0x4e0 0x02 0x001
+/* SION must be set; see the comment for MX25_PAD_SD1_CMD__ESDHC1_CMD. */
+#define MX25_PAD_CSI_D6__ESDHC2_CMD             0x130 0x328 0x4e0 0x12 0x001
 #define MX25_PAD_CSI_D6__SIM1_PD0               0x130 0x328 0x000 0x04 0x000
 #define MX25_PAD_CSI_D6__GPIO_1_31              0x130 0x328 0x000 0x05 0x000
 
 #define MX25_PAD_CSI_D7__CSI_D7                 0x134 0x32c 0x000 0x00 0x000
-#define MX25_PAD_CSI_D7__SDHC2_DAT_CLK          0x134 0x32C 0x4dc 0x02 0x001
+#define MX25_PAD_CSI_D7__ESDHC2_CLK             0x134 0x32C 0x4dc 0x02 0x001
 #define MX25_PAD_CSI_D7__GPIO_1_6               0x134 0x32c 0x000 0x05 0x000
 
 #define MX25_PAD_CSI_D8__CSI_D8                 0x138 0x330 0x000 0x00 0x000
@@ -336,22 +338,22 @@
 
 #define MX25_PAD_CSI_MCLK__CSI_MCLK             0x140 0x338 0x000 0x00 0x000
 #define MX25_PAD_CSI_MCLK__AUD6_TXD             0x140 0x338 0x000 0x01 0x000
-#define MX25_PAD_CSI_MCLK__SDHC2_DAT0           0x140 0x338 0x4e4 0x02 0x001
+#define MX25_PAD_CSI_MCLK__ESDHC2_DAT0          0x140 0x338 0x4e4 0x02 0x001
 #define MX25_PAD_CSI_MCLK__GPIO_1_8             0x140 0x338 0x000 0x05 0x000
 
 #define MX25_PAD_CSI_VSYNC__CSI_VSYNC           0x144 0x33c 0x000 0x00 0x000
 #define MX25_PAD_CSI_VSYNC__AUD6_RXD            0x144 0x33c 0x000 0x01 0x000
-#define MX25_PAD_CSI_VSYNC__SDHC2_DAT1          0x144 0x33c 0x4e8 0x02 0x001
+#define MX25_PAD_CSI_VSYNC__ESDHC2_DAT1         0x144 0x33c 0x4e8 0x02 0x001
 #define MX25_PAD_CSI_VSYNC__GPIO_1_9            0x144 0x33c 0x000 0x05 0x000
 
 #define MX25_PAD_CSI_HSYNC__CSI_HSYNC           0x148 0x340 0x000 0x00 0x000
 #define MX25_PAD_CSI_HSYNC__AUD6_TXC            0x148 0x340 0x000 0x01 0x000
-#define MX25_PAD_CSI_HSYNC__SDHC2_DAT2          0x148 0x340 0x4ec 0x02 0x001
+#define MX25_PAD_CSI_HSYNC__ESDHC2_DAT2         0x148 0x340 0x4ec 0x02 0x001
 #define MX25_PAD_CSI_HSYNC__GPIO_1_10           0x148 0x340 0x000 0x05 0x000
 
 #define MX25_PAD_CSI_PIXCLK__CSI_PIXCLK         0x14c 0x344 0x000 0x00 0x000
 #define MX25_PAD_CSI_PIXCLK__AUD6_TXFS          0x14c 0x344 0x000 0x01 0x000
-#define MX25_PAD_CSI_PIXCLK__SDHC2_DAT3         0x14c 0x344 0x4f0 0x02 0x001
+#define MX25_PAD_CSI_PIXCLK__ESDHC2_DAT3        0x14c 0x344 0x4f0 0x02 0x001
 #define MX25_PAD_CSI_PIXCLK__GPIO_1_11          0x14c 0x344 0x000 0x05 0x000
 
 #define MX25_PAD_I2C1_CLK__I2C1_CLK             0x150 0x348 0x000 0x00 0x000
@@ -419,37 +421,37 @@
 #define MX25_PAD_UART2_CTS__GPIO_4_29           0x18c 0x384 0x000 0x05 0x000
 
 /*
- * Removing the SION bit from MX25_PAD_SD1_CMD__SD1_CMD breaks detecting an SD
+ * Removing the SION bit from MX25_PAD_*__ESDHCn_CMD breaks detecting an SD
  * card. According to the i.MX25 reference manual (e.g. Figure 23-2 in IMX25RM
  * Rev. 2 from 01/2011) this pin is bidirectional. So it seems to be a silicon
- * bug that configuring the SD1_CMD function doesn't enable the input path for
- * this pin.
+ * bug that configuring the ESDHCn_CMD function doesn't enable the input path
+ * for this pin.
  * This might have side effects for other hardware units that are connected to
  * that pin and use the respective function as input.
  */
-#define MX25_PAD_SD1_CMD__SD1_CMD               0x190 0x388 0x000 0x10 0x000
+#define MX25_PAD_SD1_CMD__ESDHC1_CMD            0x190 0x388 0x000 0x10 0x000
 #define MX25_PAD_SD1_CMD__CSPI2_MOSI            0x190 0x388 0x4a0 0x01 0x001
 #define MX25_PAD_SD1_CMD__FEC_RDATA2            0x190 0x388 0x50c 0x02 0x002
 #define MX25_PAD_SD1_CMD__GPIO_2_23             0x190 0x388 0x000 0x05 0x000
 
-#define MX25_PAD_SD1_CLK__SD1_CLK               0x194 0x38c 0x000 0x00 0x000
+#define MX25_PAD_SD1_CLK__ESDHC1_CLK            0x194 0x38c 0x000 0x00 0x000
 #define MX25_PAD_SD1_CLK__CSPI2_MISO            0x194 0x38c 0x49c 0x01 0x001
 #define MX25_PAD_SD1_CLK__FEC_RDATA3            0x194 0x38c 0x510 0x02 0x002
 #define MX25_PAD_SD1_CLK__GPIO_2_24             0x194 0x38c 0x000 0x05 0x000
 
-#define MX25_PAD_SD1_DATA0__SD1_DATA0           0x198 0x390 0x000 0x00 0x000
+#define MX25_PAD_SD1_DATA0__ESDHC1_DAT0         0x198 0x390 0x000 0x00 0x000
 #define MX25_PAD_SD1_DATA0__CSPI2_SCLK          0x198 0x390 0x494 0x01 0x001
 #define MX25_PAD_SD1_DATA0__GPIO_2_25           0x198 0x390 0x000 0x05 0x000
 
-#define MX25_PAD_SD1_DATA1__SD1_DATA1           0x19c 0x394 0x000 0x00 0x000
+#define MX25_PAD_SD1_DATA1__ESDHC1_DAT1         0x19c 0x394 0x000 0x00 0x000
 #define MX25_PAD_SD1_DATA1__AUD7_RXD            0x19c 0x394 0x478 0x03 0x000
 #define MX25_PAD_SD1_DATA1__GPIO_2_26           0x19c 0x394 0x000 0x05 0x000
 
-#define MX25_PAD_SD1_DATA2__SD1_DATA2           0x1a0 0x398 0x000 0x00 0x000
+#define MX25_PAD_SD1_DATA2__ESDHC1_DAT2         0x1a0 0x398 0x000 0x00 0x000
 #define MX25_PAD_SD1_DATA2__FEC_RX_CLK          0x1a0 0x398 0x514 0x02 0x002
 #define MX25_PAD_SD1_DATA2__GPIO_2_27           0x1a0 0x398 0x000 0x05 0x000
 
-#define MX25_PAD_SD1_DATA3__SD1_DATA3           0x1a4 0x39c 0x000 0x00 0x000
+#define MX25_PAD_SD1_DATA3__ESDHC1_DAT3         0x1a4 0x39c 0x000 0x00 0x000
 #define MX25_PAD_SD1_DATA3__FEC_CRS             0x1a4 0x39c 0x508 0x02 0x002
 #define MX25_PAD_SD1_DATA3__GPIO_2_28           0x1a4 0x39c 0x000 0x05 0x000
 
@@ -496,6 +498,8 @@
 #define MX25_PAD_KPP_COL3__GPIO_3_4             0x1c4 0x3bc 0x000 0x05 0x000
 
 #define MX25_PAD_FEC_MDC__FEC_MDC               0x1c8 0x3c0 0x000 0x00 0x000
+/* SION must be set; see the comment for MX25_PAD_SD1_CMD__ESDHC1_CMD. */
+#define MX25_PAD_FEC_MDC__ESDHC2_CMD            0x1c8 0x3c0 0x4e0 0x11 0x002
 #define MX25_PAD_FEC_MDC__AUD4_TXD              0x1c8 0x3c0 0x464 0x02 0x001
 #define MX25_PAD_FEC_MDC__GPIO_3_5              0x1c8 0x3c0 0x000 0x05 0x000
 
@@ -601,4 +605,28 @@
 #define MX25_PAD_BOOT_MODE1__BOOT_MODE1         0x228 0x000 0x000 0x00 0x000
 #define MX25_PAD_BOOT_MODE1__GPIO_4_31          0x228 0x000 0x000 0x05 0x000
 
+/*
+ * Compatibility defines for out-of-tree users. You should update if you make
+ * use of one of them.
+ */
+#define MX25_PAD_D15__SDHC1_DAT7                MX25_PAD_D15__ESDHC1_DAT7
+#define MX25_PAD_D14__SDHC1_DAT6                MX25_PAD_D14__ESDHC1_DAT6
+#define MX25_PAD_D13__SDHC1_DAT5                MX25_PAD_D13__ESDHC1_DAT5
+#define MX25_PAD_D12__SDHC1_DAT4                MX25_PAD_D12__ESDHC1_DAT4
+#define MX25_PAD_LD8__SDHC2_CMD                 MX25_PAD_LD8__ESDHC2_CMD
+#define MX25_PAD_LD9__SDHC2_CLK                 MX25_PAD_LD9__ESDHC2_CLK
+#define MX25_PAD_LD11__SDHC2_DAT1               MX25_PAD_LD11__ESDHC2_DAT1
+#define MX25_PAD_CSI_D6__SDHC2_CMD              MX25_PAD_CSI_D6__ESDHC2_CMD
+#define MX25_PAD_CSI_D7__SDHC2_DAT_CLK          MX25_PAD_CSI_D7__ESDHC2_CLK
+#define MX25_PAD_CSI_MCLK__SDHC2_DAT0           MX25_PAD_CSI_MCLK__ESDHC2_DAT0
+#define MX25_PAD_CSI_VSYNC__SDHC2_DAT1          MX25_PAD_CSI_VSYNC__ESDHC2_DAT1
+#define MX25_PAD_CSI_HSYNC__SDHC2_DAT2          MX25_PAD_CSI_HSYNC__ESDHC2_DAT2
+#define MX25_PAD_CSI_PIXCLK__SDHC2_DAT3         MX25_PAD_CSI_PIXCLK__ESDHC2_DAT3
+#define MX25_PAD_SD1_CMD__SD1_CMD               MX25_PAD_SD1_CMD__ESDHC1_CMD
+#define MX25_PAD_SD1_CLK__SD1_CLK               MX25_PAD_SD1_CLK__ESDHC1_CLK
+#define MX25_PAD_SD1_DATA0__SD1_DATA0           MX25_PAD_SD1_DATA0__ESDHC1_DAT0
+#define MX25_PAD_SD1_DATA1__SD1_DATA1           MX25_PAD_SD1_DATA1__ESDHC1_DAT1
+#define MX25_PAD_SD1_DATA2__SD1_DATA2           MX25_PAD_SD1_DATA2__ESDHC1_DAT2
+#define MX25_PAD_SD1_DATA3__SD1_DATA3           MX25_PAD_SD1_DATA3__ESDHC1_DAT3
+
 #endif /* __DTS_IMX25_PINFUNC_H */
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 9445f8e1473c..cf70df20b19c 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -22,7 +22,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec;
@@ -269,6 +269,7 @@
                                 dmas = <&sdma 24 1 0>,
                                        <&sdma 25 1 0>;
                                 dma-names = "rx", "tx";
+                                fsl,fifo-depth = <15>;
                                 status = "disabled";
                         };
 
@@ -329,6 +330,7 @@
                                 dmas = <&sdma 28 1 0>,
                                        <&sdma 29 1 0>;
                                 dma-names = "rx", "tx";
+                                fsl,fifo-depth = <15>;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/imx27-apf27.dts b/arch/arm/boot/dts/imx27-apf27.dts
index 73aae4f5e539..66941cdbf244 100644
--- a/arch/arm/boot/dts/imx27-apf27.dts
+++ b/arch/arm/boot/dts/imx27-apf27.dts
@@ -19,7 +19,7 @@
         model = "Armadeus Systems APF27 module";
         compatible = "armadeus,imx27-apf27", "fsl,imx27";
 
-        memory {
+        memory@a0000000 {
                 reg = <0xa0000000 0x04000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
index 2cf896c505f9..9c455dcbe6eb 100644
--- a/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
+++ b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
@@ -16,21 +16,14 @@
         model = "Eukrea CPUIMX27";
         compatible = "eukrea,cpuimx27", "fsl,imx27";
 
-        memory {
+        memory@a0000000 {
                 reg = <0xa0000000 0x04000000>;
         };
 
-        clocks {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "simple-bus";
-
-                clk14745600: clock@0 {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <14745600>;
-                        reg = <0>;
-                };
+        clk14745600: clk-uart {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <14745600>;
         };
 };
 
diff --git a/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts b/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
index f56535768ee8..15145e7f9778 100644
--- a/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
+++ b/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
@@ -84,7 +84,7 @@
         cs-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
         status = "okay";
 
-        ads7846 {
+        ads7846@0 {
                 compatible = "ti,ads7846";
                 pinctrl-names = "default";
                 pinctrl-0 = <&pinctrl_touch>;
diff --git a/arch/arm/boot/dts/imx27-pdk.dts b/arch/arm/boot/dts/imx27-pdk.dts
index 2a140c8ae6d2..924b90c9985d 100644
--- a/arch/arm/boot/dts/imx27-pdk.dts
+++ b/arch/arm/boot/dts/imx27-pdk.dts
@@ -16,7 +16,7 @@
         model = "Freescale i.MX27 Product Development Kit";
         compatible = "fsl,imx27-pdk", "fsl,imx27";
 
-        memory {
+        memory@a0000000 {
                 reg = <0xa0000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
index 0b8490b21a38..cbad7c88c58c 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi
@@ -17,7 +17,7 @@
         model = "Phytec pca100";
         compatible = "phytec,imx27-pca100", "fsl,imx27";
 
-        memory {
+        memory@a0000000 {
                 reg = <0xa0000000 0x08000000>; /* 128MB */
         };
 };
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
index c9095b7654c6..ec466b4bfd41 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@@ -16,7 +16,7 @@
         model = "Phytec pcm038";
         compatible = "phytec,imx27-pcm038", "fsl,imx27";
 
-        memory {
+        memory@a0000000 {
                 reg = <0xa0000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 15d85f1f85fd..6585b00c3917 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -26,7 +26,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx28-apf28.dts b/arch/arm/boot/dts/imx28-apf28.dts
index 070e59cbdd8b..bab78346fa9f 100644
--- a/arch/arm/boot/dts/imx28-apf28.dts
+++ b/arch/arm/boot/dts/imx28-apf28.dts
@@ -16,7 +16,7 @@
         model = "Armadeus Systems APF28 module";
         compatible = "armadeus,imx28-apf28", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-apx4devkit.dts b/arch/arm/boot/dts/imx28-apx4devkit.dts
index ae078341fb60..96faa53ba44c 100644
--- a/arch/arm/boot/dts/imx28-apx4devkit.dts
+++ b/arch/arm/boot/dts/imx28-apx4devkit.dts
@@ -6,7 +6,7 @@
         model = "Bluegiga APX4 Development Kit";
         compatible = "bluegiga,apx4devkit", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x04000000>;
         };
 
@@ -82,7 +82,8 @@
                                         fsl,pull-up = <MXS_PULL_ENABLE>;
                                 };
 
-                                mmc2_sck_cfg_apx4: mmc2-sck-cfg-apx4 {
+                                mmc2_sck_cfg_apx4: mmc2-sck-cfg-apx4@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX28_PAD_SSP0_DATA7__SSP2_SCK
                                         >;
@@ -146,6 +147,7 @@
                                 sgtl5000: codec@a {
                                         compatible = "fsl,sgtl5000";
                                         reg = <0x0a>;
+                                        #sound-dai-cells = <0>;
                                         VDDA-supply = <&reg_3p3v>;
                                         VDDIO-supply = <&reg_3p3v>;
                                         clocks = <&saif0>;
diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts
index 570aa339a05e..e54f5aba7091 100644
--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@@ -16,7 +16,7 @@
         model = "Crystalfontz CFA-10036 Board";
         compatible = "crystalfontz,cfa10036", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index 4cd52d53cf00..60e5c7fd5035 100644
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -19,6 +19,71 @@
         model = "Crystalfontz CFA-10049 Board";
         compatible = "crystalfontz,cfa10049", "crystalfontz,cfa10036", "fsl,imx28";
 
+        i2cmux {
+                compatible = "i2c-mux-gpio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2cmux_pins_cfa10049>;
+                mux-gpios = <&gpio1 22 0 &gpio1 23 0>;
+                i2c-parent = <&i2c1>;
+
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+
+                        adc0: nau7802@2a {
+                                compatible = "nuvoton,nau7802";
+                                reg = <0x2a>;
+                                nuvoton,vldo = <3000>;
+                        };
+                };
+
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+
+                        adc1: nau7802@2a {
+                                compatible = "nuvoton,nau7802";
+                                reg = <0x2a>;
+                                nuvoton,vldo = <3000>;
+                        };
+                };
+
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+
+                                adc2: nau7802@2a {
+                                compatible = "nuvoton,nau7802";
+                                reg = <0x2a>;
+                                nuvoton,vldo = <3000>;
+                        };
+                };
+
+                i2c@3 {
+                        reg = <3>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        pca9555: pca9555@20 {
+                                compatible = "nxp,pca9555";
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pca_pins_cfa10049>;
+                                interrupt-parent = <&gpio2>;
+                                interrupts = <19 0x2>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x20>;
+                        };
+                };
+        };
+
         apb@80000000 {
                 apbh@80000000 {
                         pinctrl@80018000 {
@@ -219,71 +284,6 @@
                                 status = "okay";
                         };
 
-                        i2cmux {
-                                compatible = "i2c-mux-gpio";
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                pinctrl-names = "default";
-                                pinctrl-0 = <&i2cmux_pins_cfa10049>;
-                                mux-gpios = <&gpio1 22 0 &gpio1 23 0>;
-                                i2c-parent = <&i2c1>;
-
-                                i2c@0 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <0>;
-
-                                        adc0: nau7802@2a {
-                                                compatible = "nuvoton,nau7802";
-                                                reg = <0x2a>;
-                                                nuvoton,vldo = <3000>;
-                                        };
-                                };
-
-                                i2c@1 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <1>;
-
-                                        adc1: nau7802@2a {
-                                                compatible = "nuvoton,nau7802";
-                                                reg = <0x2a>;
-                                                nuvoton,vldo = <3000>;
-                                        };
-                                };
-
-                                i2c@2 {
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-                                        reg = <2>;
-
-                                        adc2: nau7802@2a {
-                                                compatible = "nuvoton,nau7802";
-                                                reg = <0x2a>;
-                                                nuvoton,vldo = <3000>;
-                                        };
-                                };
-
-                                i2c@3 {
-                                        reg = <3>;
-                                        #address-cells = <1>;
-                                        #size-cells = <0>;
-
-                                        pca9555: pca9555@20 {
-                                                compatible = "nxp,pca9555";
-                                                pinctrl-names = "default";
-                                                pinctrl-0 = <&pca_pins_cfa10049>;
-                                                interrupt-parent = <&gpio2>;
-                                                interrupts = <19 0x2>;
-                                                gpio-controller;
-                                                #gpio-cells = <2>;
-                                                interrupt-controller;
-                                                #interrupt-cells = <2>;
-                                                reg = <0x20>;
-                                        };
-                                };
-                        };
-
                         usbphy1: usbphy@8007e000 {
                                 status = "okay";
                         };
diff --git a/arch/arm/boot/dts/imx28-duckbill-2-485.dts b/arch/arm/boot/dts/imx28-duckbill-2-485.dts
index bd3fd470f9c3..97084e463d7c 100644
--- a/arch/arm/boot/dts/imx28-duckbill-2-485.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-485.dts
@@ -19,7 +19,7 @@
         model = "I2SE Duckbill 2 485";
         compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
index 4450047885eb..7f8d40a9c67e 100644
--- a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts
@@ -20,7 +20,7 @@
         model = "I2SE Duckbill 2 EnOcean";
         compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-duckbill-2-spi.dts b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts
index 927732efca98..13e7b134da9e 100644
--- a/arch/arm/boot/dts/imx28-duckbill-2-spi.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts
@@ -23,7 +23,7 @@
                 ethernet1 = &qca7000;
         };
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-duckbill-2.dts b/arch/arm/boot/dts/imx28-duckbill-2.dts
index 7fa3d759505c..88556c93b00f 100644
--- a/arch/arm/boot/dts/imx28-duckbill-2.dts
+++ b/arch/arm/boot/dts/imx28-duckbill-2.dts
@@ -19,7 +19,7 @@
         model = "I2SE Duckbill 2";
         compatible = "i2se,duckbill-2", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-duckbill.dts b/arch/arm/boot/dts/imx28-duckbill.dts
index 3e4385d4ed78..f286bfe699be 100644
--- a/arch/arm/boot/dts/imx28-duckbill.dts
+++ b/arch/arm/boot/dts/imx28-duckbill.dts
@@ -18,7 +18,7 @@
         model = "I2SE Duckbill";
         compatible = "i2se,duckbill", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts b/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
index 7c1572c5a4fb..b70f3349c350 100644
--- a/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
@@ -23,7 +23,7 @@
         model = "Eukrea Electromatique MBMX283LC";
         compatible = "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x04000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts b/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
index b61fd61eb1c7..65efb78ac040 100644
--- a/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
@@ -22,7 +22,7 @@
         model = "Eukrea Electromatique MBMX287LC";
         compatible = "eukrea,mbmx287lc", "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi b/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
index 49ab40838e69..ff1328ce7d37 100644
--- a/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
+++ b/arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
@@ -151,6 +151,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 VDDA-supply = <&reg_3p3v>;
                 VDDIO-supply = <&reg_3p3v>;
                 clocks = <&saif0>;
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 7f5b80402c54..b0d39654aeb3 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -16,7 +16,7 @@
         model = "Freescale i.MX28 Evaluation Kit";
         compatible = "fsl,imx28-evk", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
@@ -197,6 +197,7 @@
                                 sgtl5000: codec@a {
                                         compatible = "fsl,sgtl5000";
                                         reg = <0x0a>;
+                                        #sound-dai-cells = <0>;
                                         VDDA-supply = <&reg_3p3v>;
                                         VDDIO-supply = <&reg_3p3v>;
                                         clocks = <&saif0>;
diff --git a/arch/arm/boot/dts/imx28-m28.dtsi b/arch/arm/boot/dts/imx28-m28.dtsi
index a69856e41ba4..0ec415e1ff58 100644
--- a/arch/arm/boot/dts/imx28-m28.dtsi
+++ b/arch/arm/boot/dts/imx28-m28.dtsi
@@ -15,7 +15,7 @@
         model = "Aries/DENX M28";
         compatible = "aries,m28", "denx,m28", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-m28cu3.dts b/arch/arm/boot/dts/imx28-m28cu3.dts
index 9d6c8fe28d74..3bb5ffc644d6 100644
--- a/arch/arm/boot/dts/imx28-m28cu3.dts
+++ b/arch/arm/boot/dts/imx28-m28cu3.dts
@@ -16,7 +16,7 @@
         model = "MSR M28CU3";
         compatible = "msr,m28cu3", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index 22aa025cab1e..7d97a0ce74a3 100644
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -140,6 +140,7 @@
                                 sgtl5000: codec@a {
                                         compatible = "fsl,sgtl5000";
                                         reg = <0x0a>;
+                                        #sound-dai-cells = <0>;
                                         VDDA-supply = <&reg_3p3v>;
                                         VDDIO-supply = <&reg_3p3v>;
                                         clocks = <&saif0>;
diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts
index 0ce3cb8e7914..2393e83979e0 100644
--- a/arch/arm/boot/dts/imx28-sps1.dts
+++ b/arch/arm/boot/dts/imx28-sps1.dts
@@ -16,7 +16,7 @@
         model = "SchulerControl GmbH, SC SPS 1";
         compatible = "schulercontrol,imx28-sps1", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x08000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx28-ts4600.dts b/arch/arm/boot/dts/imx28-ts4600.dts
index 1e391c9f1b7a..f8a09a8c2c36 100644
--- a/arch/arm/boot/dts/imx28-ts4600.dts
+++ b/arch/arm/boot/dts/imx28-ts4600.dts
@@ -19,7 +19,7 @@
         model = "Technologic Systems i.MX28 TS-4600";
         compatible = "technologic,imx28-ts4600", "fsl,imx28";
 
-        memory {
+        memory@40000000 {
                 reg = <0x40000000 0x10000000>;   /* 256MB */
         };
 
diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index 152621ea37db..687186358c18 100644
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -65,8 +65,8 @@
                 usbotg = &usb0;
         };
 
-        memory {
-                reg = <0 0>; /* will be filled in by U-Boot */
+        memory@40000000 {
+                reg = <0x40000000 0>; /* will be filled in by U-Boot */
         };
 
         onewire {
@@ -531,7 +531,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_edt_ft5x06_pins: tx28-edt-ft5x06-pins {
+        tx28_edt_ft5x06_pins: tx28-edt-ft5x06-pins@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_SSP0_DATA6__GPIO_2_6 /* RESET */
                         MX28_PAD_SSP0_DATA5__GPIO_2_5 /* IRQ */
@@ -542,7 +543,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_flexcan_xcvr_pins: tx28-flexcan-xcvr-pins {
+        tx28_flexcan_xcvr_pins: tx28-flexcan-xcvr-pins@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_LCD_D00__GPIO_1_0
                 >;
@@ -551,7 +553,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_lcdif_23bit_pins: tx28-lcdif-23bit {
+        tx28_lcdif_23bit_pins: tx28-lcdif-23bit@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         /* LCD_D00 may be used as Flexcan Transceiver Enable on STK5-V5 */
                         MX28_PAD_LCD_D01__LCD_D1
@@ -583,7 +586,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_lcdif_ctrl_pins: tx28-lcdif-ctrl {
+        tx28_lcdif_ctrl_pins: tx28-lcdif-ctrl@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_LCD_ENABLE__GPIO_1_31 /* Enable */
                         MX28_PAD_LCD_RESET__GPIO_3_30  /* Reset */
@@ -593,7 +597,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_mac0_pins_gpio: tx28-mac0-gpio-pins {
+        tx28_mac0_pins_gpio: tx28-mac0-gpio-pins@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_ENET0_MDC__GPIO_4_0
                         MX28_PAD_ENET0_MDIO__GPIO_4_1
@@ -610,7 +615,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_pca9554_pins: tx28-pca9554-pins {
+        tx28_pca9554_pins: tx28-pca9554-pins@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_PWM3__GPIO_3_28
                 >;
@@ -619,7 +625,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_spi_gpio_pins: spi-gpiogrp {
+        tx28_spi_gpio_pins: spi-gpiogrp@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_AUART2_RX__GPIO_3_8
                         MX28_PAD_AUART2_TX__GPIO_3_9
@@ -633,7 +640,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_tsc2007_pins: tx28-tsc2007-pins {
+        tx28_tsc2007_pins: tx28-tsc2007-pins@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_SAIF0_MCLK__GPIO_3_20 /* TSC2007 IRQ */
                 >;
@@ -643,7 +651,8 @@
         };
 
 
-        tx28_usbphy0_pins: tx28-usbphy0-pins {
+        tx28_usbphy0_pins: tx28-usbphy0-pins@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_GPMI_CE2N__GPIO_0_18 /* USBOTG_VBUSEN */
                         MX28_PAD_GPMI_CE3N__GPIO_0_19 /* USBOTH_OC */
@@ -653,7 +662,8 @@
                 fsl,pull-up = <MXS_PULL_DISABLE>;
         };
 
-        tx28_usbphy1_pins: tx28-usbphy1-pins {
+        tx28_usbphy1_pins: tx28-usbphy1-pins@0 {
+                reg = <0>;
                 fsl,pinmux-ids = <
                         MX28_PAD_SPDIF__GPIO_3_27 /* USBH_VBUSEN */
                         MX28_PAD_JTAG_RTCK__GPIO_4_20 /* USBH_OC */
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index e52e05c0fe56..9ad8d3556859 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -24,7 +24,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &mac0;
@@ -283,7 +283,8 @@
                                         fsl,pull-up = <MXS_PULL_DISABLE>;
                                 };
 
-                                gpmi_status_cfg: gpmi-status-cfg {
+                                gpmi_status_cfg: gpmi-status-cfg@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX28_PAD_GPMI_RDN__GPMI_RDN
                                                 MX28_PAD_GPMI_WRN__GPMI_WRN
@@ -527,14 +528,16 @@
                                         fsl,pull-up = <MXS_PULL_ENABLE>;
                                 };
 
-                                mmc0_cd_cfg: mmc0-cd-cfg {
+                                mmc0_cd_cfg: mmc0-cd-cfg@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT
                                         >;
                                         fsl,pull-up = <MXS_PULL_DISABLE>;
                                 };
 
-                                mmc0_sck_cfg: mmc0-sck-cfg {
+                                mmc0_sck_cfg: mmc0-sck-cfg@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX28_PAD_SSP0_SCK__SSP0_SCK
                                         >;
@@ -558,14 +561,16 @@
                                         fsl,pull-up = <MXS_PULL_ENABLE>;
                                 };
 
-                                mmc1_cd_cfg: mmc1-cd-cfg {
+                                mmc1_cd_cfg: mmc1-cd-cfg@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX28_PAD_GPMI_RDY0__SSP1_CARD_DETECT
                                         >;
                                         fsl,pull-up = <MXS_PULL_DISABLE>;
                                 };
 
-                                mmc1_sck_cfg: mmc1-sck-cfg {
+                                mmc1_sck_cfg: mmc1-sck-cfg@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX28_PAD_GPMI_WRN__SSP1_SCK
                                         >;
@@ -606,7 +611,8 @@
                                         fsl,pull-up = <MXS_PULL_ENABLE>;
                                 };
 
-                                mmc2_cd_cfg: mmc2-cd-cfg {
+                                mmc2_cd_cfg: mmc2-cd-cfg@0 {
+                                        reg = <0>;
                                         fsl,pinmux-ids = <
                                                 MX28_PAD_AUART1_RX__SSP2_CARD_DETECT
                                         >;
diff --git a/arch/arm/boot/dts/imx31-bug.dts b/arch/arm/boot/dts/imx31-bug.dts
index ae6cebbed84b..6ee4ff8e4e8f 100644
--- a/arch/arm/boot/dts/imx31-bug.dts
+++ b/arch/arm/boot/dts/imx31-bug.dts
@@ -16,7 +16,7 @@
         model = "Buglabs i.MX31 Bug 1.x";
         compatible = "buglabs,imx31-bug", "fsl,imx31";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x8000000>; /* 128M */
         };
 };
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index a72031407ebd..ebc3f2dbb6fd 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -19,7 +19,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 serial0 = &uart1;
diff --git a/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi b/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
index 9c2b715ab8bf..ba39d938f289 100644
--- a/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
+++ b/arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi
@@ -17,7 +17,7 @@
         model = "Eukrea CPUIMX35";
         compatible = "eukrea,cpuimx35", "fsl,imx35";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x8000000>; /* 128M */
         };
 };
diff --git a/arch/arm/boot/dts/imx35-pdk.dts b/arch/arm/boot/dts/imx35-pdk.dts
index 9bb628f22502..646b1257bba2 100644
--- a/arch/arm/boot/dts/imx35-pdk.dts
+++ b/arch/arm/boot/dts/imx35-pdk.dts
@@ -17,7 +17,7 @@
         model = "Freescale i.MX35 Product Development Kit";
         compatible = "fsl,imx35-pdk", "fsl,imx35";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x8000000>,
                       <0x90000000 0x8000000>;
         };
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index e08c0c193767..bf343195697e 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -20,7 +20,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx50-evk.dts b/arch/arm/boot/dts/imx50-evk.dts
index 98b5faa06e27..23f1833e23fa 100644
--- a/arch/arm/boot/dts/imx50-evk.dts
+++ b/arch/arm/boot/dts/imx50-evk.dts
@@ -18,7 +18,7 @@
         model = "Freescale i.MX50 Evaluation Kit";
         compatible = "fsl,imx50-evk", "fsl,imx50";
 
-        memory {
+        memory@70000000 {
                 reg = <0x70000000 0x80000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 35955e63d6c5..7954e79d0a16 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -25,7 +25,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts
index c83ac1600322..79d80036f74d 100644
--- a/arch/arm/boot/dts/imx51-apf51.dts
+++ b/arch/arm/boot/dts/imx51-apf51.dts
@@ -21,7 +21,7 @@
         model = "Armadeus Systems APF51 module";
         compatible = "armadeus,imx51-apf51", "fsl,imx51";
 
-        memory {
+        memory@90000000 {
                 reg = <0x90000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 4ac5ab614a7f..cf7a1963df25 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -21,7 +21,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@90000000 {
                 reg = <0x90000000 0x20000000>;
         };
 
@@ -369,6 +369,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 clocks = <&clk_audio>;
                 VDDA-supply = <&vdig_reg>;
                 VDDIO-supply = <&vvideo_reg>;
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts b/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts
index 1db517d3d497..2967a748d859 100644
--- a/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts
@@ -17,7 +17,7 @@
                      "digi,connectcore-ccxmx51-som", "fsl,imx51";
 
         chosen {
-                linux,stdout-path = &uart1;
+                stdout-path = &uart1;
         };
 };
 
diff --git a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
index b821066a0d2a..5761a66e8a0d 100644
--- a/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+++ b/arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
@@ -16,7 +16,7 @@
         model = "Digi ConnectCore CC(W)-MX51";
         compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51";
 
-        memory {
+        memory@90000000 {
                 reg = <0x90000000 0x08000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
index 63164266af83..f8902a338e49 100644
--- a/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
+++ b/arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
@@ -22,7 +22,7 @@
         model = "Eukrea CPUIMX51";
         compatible = "eukrea,cpuimx51", "fsl,imx51";
 
-        memory {
+        memory@90000000 {
                 reg = <0x90000000 0x10000000>; /* 256M */
         };
 };
diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts
index f59b02bae68d..39eb067904c3 100644
--- a/arch/arm/boot/dts/imx51-ts4800.dts
+++ b/arch/arm/boot/dts/imx51-ts4800.dts
@@ -17,7 +17,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@90000000 {
                 reg = <0x90000000 0x10000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index 5306b78de0ca..0c99ac04ad08 100644
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -51,6 +51,11 @@
                 stdout-path = &uart1;
         };
 
+        /* Will be filled by the bootloader */
+        memory@90000000 {
+                reg = <0x90000000 0>;
+        };
+
         aliases {
                 mdio-gpio0 = &mdio_gpio;
                 rtc0 = &ds1341;
@@ -568,6 +573,15 @@
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_uart3>;
         status = "okay";
+
+        rave-sp {
+                compatible = "zii,rave-sp-rdu1";
+                current-speed = <38400>;
+
+                watchdog {
+                        compatible = "zii,rave-sp-watchdog";
+                };
+        };
 };
 
 &usbh1 {
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 00d30bd70068..5d390a64e976 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -26,7 +26,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 4486bc47d140..80fc00705d92 100644
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -17,7 +17,7 @@
         model = "Freescale i.MX53 Automotive Reference Design Board";
         compatible = "fsl,imx53-ard", "fsl,imx53";
 
-        memory {
+        memory@70000000 {
                 reg = <0x70000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx53-cx9020.dts b/arch/arm/boot/dts/imx53-cx9020.dts
index 5e67e43004e7..cf70ebc4399a 100644
--- a/arch/arm/boot/dts/imx53-cx9020.dts
+++ b/arch/arm/boot/dts/imx53-cx9020.dts
@@ -21,7 +21,7 @@
                 stdout-path = &uart2;
         };
 
-        memory {
+        memory@70000000 {
                 reg = <0x70000000 0x20000000>,
                       <0xb0000000 0x20000000>;
         };
diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi
index 7ce69c63510c..3da6dd5edb79 100644
--- a/arch/arm/boot/dts/imx53-m53.dtsi
+++ b/arch/arm/boot/dts/imx53-m53.dtsi
@@ -15,7 +15,7 @@
         model = "Aries/DENX M53";
         compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53";
 
-        memory {
+        memory@70000000 {
                 reg = <0x70000000 0x20000000>,
                       <0xb0000000 0x20000000>;
         };
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index e48525763b1b..3935fe6490ed 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -153,6 +153,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 VDDA-supply = <&reg_3p2v>;
                 VDDIO-supply = <&reg_3p2v>;
                 clocks = <&clks IMX5_CLK_SSI_EXT1_GATE>;
diff --git a/arch/arm/boot/dts/imx53-ppd.dts b/arch/arm/boot/dts/imx53-ppd.dts
index cce959438a79..d5628af2e301 100644
--- a/arch/arm/boot/dts/imx53-ppd.dts
+++ b/arch/arm/boot/dts/imx53-ppd.dts
@@ -132,6 +132,14 @@
                 enable-active-high;
         };
 
+        reg_tsiref: regulator-tsiref {
+                compatible = "regulator-fixed";
+                regulator-name = "tsiref";
+                regulator-min-microvolt = <2500000>;
+                regulator-max-microvolt = <2500000>;
+                regulator-always-on;
+        };
+
         pwm_bl: backlight {
                 compatible = "pwm-backlight";
                 pwms = <&pwm2 0 50000>;
@@ -294,6 +302,8 @@
                 interrupt-parent = <&gpio3>;
                 interrupts = <12 0x8>;
                 spi-max-frequency = <1000000>;
+                dlg,tsi-as-adc;
+                tsiref-supply = <&reg_tsiref>;
 
                 regulators {
                         buck1_reg: buck1 {
@@ -436,6 +446,7 @@
                         sgtl5000: codec@a {
                                 compatible = "fsl,sgtl5000";
                                 reg = <0xa>;
+                                #sound-dai-cells = <0>;
                                 VDDA-supply = <&reg_sgtl5k>;
                                 VDDIO-supply = <&reg_sgtl5k>;
                                 clocks = <&cko2_11M>;
@@ -525,6 +536,7 @@
 
         touchscreen@4b {
                 compatible = "atmel,maxtouch";
+                reset-gpio = <&gpio5 19 GPIO_ACTIVE_HIGH>;
                 reg = <0x4b>;
                 interrupt-parent = <&gpio5>;
                 interrupts = <4 0x8>;
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 41a2e2a2b079..485a69d45e1c 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -17,7 +17,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@70000000 {
                 reg = <0x70000000 0x20000000>,
                       <0xb0000000 0x20000000>;
         };
@@ -317,6 +317,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 VDDA-supply = <&reg_3p2v>;
                 VDDIO-supply = <&reg_3p2v>;
                 clocks = <&clks IMX5_CLK_SSI_EXT1_GATE>;
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index 51f4a42a55e2..fd030128666c 100644
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -17,7 +17,7 @@
         model = "Freescale i.MX53 Smart Mobile Reference Design Board";
         compatible = "fsl,imx53-smd", "fsl,imx53";
 
-        memory {
+        memory@70000000 {
                 reg = <0x70000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi
index eecdc1c55eef..a72b8981fc3b 100644
--- a/arch/arm/boot/dts/imx53-tqma53.dtsi
+++ b/arch/arm/boot/dts/imx53-tqma53.dtsi
@@ -16,7 +16,7 @@
         model = "TQ TQMa53";
         compatible = "tq,tqma53", "fsl,imx53";
 
-        memory {
+        memory@70000000 {
                 reg = <0x70000000 0x40000000>; /* Up to 1GiB */
         };
 
diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts
index fe15c9555d6e..af8ec5e4417b 100644
--- a/arch/arm/boot/dts/imx53-tx53-x03x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts
@@ -230,6 +230,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 VDDA-supply = <&reg_2v5>;
                 VDDIO-supply = <&reg_3v3>;
                 clocks = <&mclk>;
diff --git a/arch/arm/boot/dts/imx53-tx53-x13x.dts b/arch/arm/boot/dts/imx53-tx53-x13x.dts
index f2b2ad3ce9e5..6cdf2082c742 100644
--- a/arch/arm/boot/dts/imx53-tx53-x13x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x13x.dts
@@ -131,6 +131,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 VDDA-supply = <&reg_2v5>;
                 VDDIO-supply = <&reg_3v3>;
                 clocks = <&mclk>;
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index a22e461fc168..69a2af7d6c11 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -49,6 +49,11 @@
         model = "Ka-Ro electronics TX53 module";
         compatible = "karo,tx53", "fsl,imx53";
 
+        /* Will be filled by the bootloader */
+        memory@70000000 {
+                reg = <0x70000000 0>;
+        };
+
         aliases {
                 can0 = &can2; /* Make the can interface indices consistent with TX28/TX48 modules */
                 can1 = &can1;
diff --git a/arch/arm/boot/dts/imx53-usbarmory.dts b/arch/arm/boot/dts/imx53-usbarmory.dts
index 6782d7fc5961..f6268d0ded29 100644
--- a/arch/arm/boot/dts/imx53-usbarmory.dts
+++ b/arch/arm/boot/dts/imx53-usbarmory.dts
@@ -57,7 +57,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@70000000 {
                 reg = <0x70000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx53-voipac-bsb.dts b/arch/arm/boot/dts/imx53-voipac-bsb.dts
index 25c78f19826c..957053755c3c 100644
--- a/arch/arm/boot/dts/imx53-voipac-bsb.dts
+++ b/arch/arm/boot/dts/imx53-voipac-bsb.dts
@@ -133,6 +133,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 VDDA-supply = <&reg_3p3v>;
                 VDDIO-supply = <&reg_3p3v>;
                 clocks = <&clks 150>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 1040251f2951..7d647d043f52 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -26,7 +26,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx6dl-apf6dev.dts b/arch/arm/boot/dts/imx6dl-apf6dev.dts
index df26e542ab3a..4a7f86de6c39 100644
--- a/arch/arm/boot/dts/imx6dl-apf6dev.dts
+++ b/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -54,7 +54,7 @@
         model = "Armadeus APF6 Solo Module on APF6Dev Board";
         compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
index 5f0d196495d0..7128c76d5721 100644
--- a/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
@@ -48,7 +48,7 @@
         model = "aristainetos2 i.MX6 Dual Lite Board 4";
         compatible = "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
index 805b1318b7f7..240f3661469f 100644
--- a/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos2_7.dts
@@ -48,7 +48,7 @@
         model = "aristainetos2 i.MX6 Dual Lite Board 7";
         compatible = "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
index 3c9f4af9e9ff..ad7733662fe5 100644
--- a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
@@ -27,7 +27,7 @@
                 status = "okay";
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
index 96cd835ccbf6..64ed84e3c512 100644
--- a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
@@ -16,7 +16,7 @@
         model = "aristainetos i.MX6 Dual Lite Board 7";
         compatible = "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index dcf9206f3e0d..ea184d108491 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -53,6 +53,11 @@
         compatible = "toradex,colibri_imx6dl-eval-v3", "toradex,colibri_imx6dl",
                      "fsl,imx6dl";
 
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
+
         aliases {
                 i2c0 = &i2c2;
                 i2c1 = &i2c3;
@@ -63,6 +68,10 @@
                 rtc1 = &snvs_rtc;
         };
 
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
         clocks {
                 /* Fixed crystal dedicated to mcp251x */
                 clk16m: clk@1 {
diff --git a/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts b/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
index 994f96a3fb54..89384cb618f6 100644
--- a/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
+++ b/arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts
@@ -20,4 +20,9 @@
 / {
         model = "DFI FS700-M60-6DL i.MX6dl Q7 Board";
         compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";
+
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts b/arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts
new file mode 100644
index 000000000000..9f7f9f98139d
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-phytec-mira-rdk-nand.dts
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2018 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <c.hemp@phytec.de>
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
+
+/ {
+        model = "PHYTEC phyBOARD-Mira DualLite/Solo Carrier-Board with NAND";
+        compatible = "phytec,imx6dl-pbac06-nand", "phytec,imx6dl-pbac06",
+                     "phytec,imx6qdl-pcm058", "fsl,imx6dl";
+
+        chosen {
+                stdout-path = &uart2;
+        };
+};
+
+&ethphy {
+        max-speed = <100>;
+};
+
+&fec {
+        status = "okay";
+};
+
+&gpmi {
+        status = "okay";
+};
+
+&hdmi {
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+};
+
+&i2c2 {
+        status = "okay";
+};
+
+&i2c_rtc {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&usbh1 {
+        status = "okay";
+};
+
+&usbotg {
+        status = "okay";
+};
+
+&usdhc1 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
index 964bc2ad3c5d..7d9888937f12 100644
--- a/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
@@ -16,7 +16,7 @@
         model = "Phytec phyFLEX-i.MX6 DualLite/Solo";
         compatible = "phytec,imx6dl-pfla02", "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl-rex-basic.dts b/arch/arm/boot/dts/imx6dl-rex-basic.dts
index c3a14a4330a2..3fb7f4ee2496 100644
--- a/arch/arm/boot/dts/imx6dl-rex-basic.dts
+++ b/arch/arm/boot/dts/imx6dl-rex-basic.dts
@@ -16,7 +16,7 @@
         model = "Rex Basic i.MX6 Dual Lite Board";
         compatible = "rex,imx6dl-rex-basic", "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
index 23e108204e1e..2e98c92adff7 100644
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@@ -15,7 +15,7 @@
         model = "RIoTboard i.MX6S";
         compatible = "riot,imx6s-riotboard", "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6dl-ts4900.dts b/arch/arm/boot/dts/imx6dl-ts4900.dts
index 6ea0b780677d..cc01a7a22e30 100644
--- a/arch/arm/boot/dts/imx6dl-ts4900.dts
+++ b/arch/arm/boot/dts/imx6dl-ts4900.dts
@@ -46,4 +46,9 @@
 / {
         model = "Technologic Systems i.MX6 Solo/DualLite TS-4900 (Default Device Tree)";
         compatible = "technologic,imx6dl-ts4900", "fsl,imx6dl";
+
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx6dl-ts7970.dts b/arch/arm/boot/dts/imx6dl-ts7970.dts
index d104daf305d9..82435d5bf33f 100644
--- a/arch/arm/boot/dts/imx6dl-ts7970.dts
+++ b/arch/arm/boot/dts/imx6dl-ts7970.dts
@@ -47,4 +47,9 @@
 / {
         model = "Technologic Systems i.MX6 Solo/DualLite TS-7970 (Default Device Tree)";
         compatible = "technologic,imx6dl-ts7970", "fsl,imx6dl";
+
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
index 8c314eee4fdd..5727fa48cfd5 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
@@ -16,7 +16,7 @@
         model = "Wandboard i.MX6 Dual Lite Board rev B1";
         compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts b/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
index aa4d4faaaec4..a72c07db7dda 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revd1.dts
@@ -16,7 +16,7 @@
         model = "Wandboard i.MX6 Dual Lite Board revD1";
         compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl-wandboard.dts b/arch/arm/boot/dts/imx6dl-wandboard.dts
index bbb616723097..a09f274cd1f4 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
@@ -16,7 +16,7 @@
         model = "Wandboard i.MX6 Dual Lite Board";
         compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index c01674fa098a..558bce81209d 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -80,11 +80,6 @@
                                 reg = <0x020f4000 0x4000>;
                                 interrupts = <0 97 IRQ_TYPE_LEVEL_HIGH>;
                         };
-
-                        lcdif: lcdif@20f8000 {
-                                reg = <0x020f8000 0x4000>;
-                                interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
-                        };
                 };
 
                 aips2: aips-bus@2100000 {
@@ -109,11 +104,6 @@
                 compatible = "fsl,imx-display-subsystem";
                 ports = <&ipu1_di0>, <&ipu1_di1>;
         };
-
-        gpu-subsystem {
-                compatible = "fsl,imx-gpu-subsystem";
-                cores = <&gpu_2d>, <&gpu_3d>;
-        };
 };
 
 &gpio1 {
diff --git a/arch/arm/boot/dts/imx6q-apf6dev.dts b/arch/arm/boot/dts/imx6q-apf6dev.dts
index 4e4de821d9e5..5e72f81cdf8b 100644
--- a/arch/arm/boot/dts/imx6q-apf6dev.dts
+++ b/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -54,7 +54,7 @@
         model = "Armadeus APF6 Quad / Dual Module on APF6Dev Board";
         compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 4989d0bff10f..953a5b5a8ea4 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -18,7 +18,7 @@
         model = "Freescale i.MX6 Quad Armadillo2 Board";
         compatible = "fsl,imx6q-arm2", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-ba16.dtsi b/arch/arm/boot/dts/imx6q-ba16.dtsi
index 5fcb0372d58b..bf4bdb385de9 100644
--- a/arch/arm/boot/dts/imx6q-ba16.dtsi
+++ b/arch/arm/boot/dts/imx6q-ba16.dtsi
@@ -46,7 +46,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
index 916ea94d75ca..990e411cbca0 100644
--- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi
+++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
@@ -353,6 +353,14 @@
         };
 };
 
+&pmu {
+        secure-reg-access;
+};
+
+&usdhc2 {
+        status = "disabled";
+};
+
 &usdhc4 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_usdhc4>;
diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index bc7587c383f6..65ef4cacbc71 100644
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -50,7 +50,7 @@
         model = "CompuLab CM-FX6";
         compatible = "compulab,cm-fx6", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts b/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
index fd0ad9a8866c..ad12d76bbb89 100644
--- a/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
+++ b/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
@@ -20,4 +20,9 @@
 / {
         model = "DFI FS700-M60-6QD i.MX6qd Q7 Board";
         compatible = "dfi,fs700-m60-6qd", "dfi,fs700e-m60", "fsl,imx6q";
+
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx6q-display5.dtsi b/arch/arm/boot/dts/imx6q-display5.dtsi
index 09085fde3341..85232c7c36a0 100644
--- a/arch/arm/boot/dts/imx6q-display5.dtsi
+++ b/arch/arm/boot/dts/imx6q-display5.dtsi
@@ -47,7 +47,7 @@
         model = "Liebherr (LWN) display5 i.MX6 Quad Board";
         compatible = "lwn,display5", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index f0316ea96898..b3c6a4a7897d 100644
--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@ -29,7 +29,7 @@
                 stmpe-i2c1 = &stmpe2;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-dms-ba16.dts b/arch/arm/boot/dts/imx6q-dms-ba16.dts
new file mode 100644
index 000000000000..57761f3172fa
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-dms-ba16.dts
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include "imx6q-ba16.dtsi"
+
+/ {
+        model = "Advantech DMS-BA16";
+        compatible = "advantech,imx6q-dms-ba16", "advantech,imx6q-ba16", "fsl,imx6q";
+
+        reg_usb_otg_vbus: regulator-usbotgvbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb_otg_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_usbotgvbus>;
+                gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        sys_mclk: clock-sys-mclk {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <22000000>;
+        };
+
+        sound {
+                compatible = "fsl,imx6q-ba16-sgtl5000",
+                             "fsl,imx-audio-sgtl5000";
+                model = "imx6q-ba16-sgtl5000";
+                ssi-controller = <&ssi1>;
+                audio-codec = <&sgtl5000>;
+                audio-routing =
+                        "MIC_IN", "Mic Jack",
+                        "Mic Jack", "Mic Bias",
+                        "Headphone Jack", "HP_OUT";
+                mux-int-port = <1>;
+                mux-ext-port = <4>;
+        };
+};
+
+&ecspi5 {
+        cs-gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi5>;
+        status = "okay";
+
+        m25_eeprom: m25p80@0 {
+                compatible = "atmel,at25256B", "atmel,at25";
+                spi-max-frequency = <20000000>;
+                size = <0x8000>;
+                pagesize = <64>;
+                reg = <0>;
+                address-width = <16>;
+        };
+};
+
+&iomuxc {
+        pinctrl_i2c1_gpio: i2c1gpiogrp {
+                fsl,pins = <
+                        MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26        0x1b0b0
+                        MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27        0x1b0b0
+                >;
+        };
+
+        pinctrl_i2c2_gpio: i2c2gpiogrp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x1b0b0
+                        MX6QDL_PAD_KEY_ROW3__GPIO4_IO13 0x1b0b0
+                >;
+        };
+
+        pinctrl_i2c3_gpio: i2c3gpiogrp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_3__GPIO1_IO03   0x1b0b0
+                        MX6QDL_PAD_GPIO_6__GPIO1_IO06   0x1b0b0
+                >;
+        };
+
+        pinctrl_usbotgvbus: usbotgvbusgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+                        MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x000b0
+                >;
+        };
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "okay";
+
+        sgtl5000: codec@a {
+                compatible = "fsl,sgtl5000";
+                reg = <0x0a>;
+                clocks = <&sys_mclk>;
+                lrclk-strength = <0x3>;
+                VDDA-supply = <&reg_1p8v>;
+                VDDIO-supply = <&reg_3p3v>;
+        };
+};
+
+&pwm2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm2>;
+        status = "okay";
+};
+
+&sata {
+        fsl,no-spread-spectrum;
+        fsl,transmit-atten-16ths = <12>;
+        fsl,transmit-boost-mdB = <3330>;
+        fsl,transmit-level-mV = <1133>;
+        fsl,receive-dpll-mode = <1>;
+        status = "okay";
+};
+
+&usbotg {
+        vbus-supply = <&reg_usb_otg_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg>;
+        dr_mode = "otg";
+        disable-over-current;
+        status = "okay";
+};
+
+&usdhc4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc4>;
+        bus-width = <8>;
+        cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
+        no-1-8-v;
+        keep-power-in-suspend;
+        wakeup-source;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts
index e0aea782c666..fcd257bc5ac3 100644
--- a/arch/arm/boot/dts/imx6q-evi.dts
+++ b/arch/arm/boot/dts/imx6q-evi.dts
@@ -50,7 +50,7 @@
         model = "Uniwest Evi";
         compatible = "uniwest,imx6q-evi", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-gk802.dts b/arch/arm/boot/dts/imx6q-gk802.dts
index b715deb4ea46..0be375611382 100644
--- a/arch/arm/boot/dts/imx6q-gk802.dts
+++ b/arch/arm/boot/dts/imx6q-gk802.dts
@@ -18,7 +18,7 @@
                 stdout-path = &uart4;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index 29adaa7c72f8..a8f70b4266ef 100644
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -60,7 +60,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-h100.dts b/arch/arm/boot/dts/imx6q-h100.dts
index 8a2ea6c58902..714e09e04dcb 100644
--- a/arch/arm/boot/dts/imx6q-h100.dts
+++ b/arch/arm/boot/dts/imx6q-h100.dts
@@ -49,6 +49,11 @@
         model = "Auvidea H100";
         compatible = "auvidea,h100", "fsl,imx6q";
 
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
+
         aliases {
                 rtc0 = &rtc;
                 rtc1 = &snvs_rtc;
@@ -161,7 +166,7 @@
         status = "okay";
 
         eeprom: 24c02@51 {
-                compatible = "microchip,24c02", "at24";
+                compatible = "microchip,24c02", "atmel,24c02";
                 reg = <0x51>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts
index 432291bedcf1..dd763f205819 100644
--- a/arch/arm/boot/dts/imx6q-marsboard.dts
+++ b/arch/arm/boot/dts/imx6q-marsboard.dts
@@ -47,7 +47,7 @@
         model = "Embest MarS Board i.MX6Dual";
         compatible = "embest,imx6q-marsboard", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-mccmon6.dts b/arch/arm/boot/dts/imx6q-mccmon6.dts
index cab36f48d5f1..b7e9f38cec72 100644
--- a/arch/arm/boot/dts/imx6q-mccmon6.dts
+++ b/arch/arm/boot/dts/imx6q-mccmon6.dts
@@ -19,7 +19,7 @@
         model = "Liebherr (LWN) monitor6 i.MX6 Quad Board";
         compatible = "lwn,mccmon6", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts
index 7d7dc59507cf..52f39371188d 100644
--- a/arch/arm/boot/dts/imx6q-novena.dts
+++ b/arch/arm/boot/dts/imx6q-novena.dts
@@ -55,6 +55,11 @@
         model = "Kosagi Novena Dual/Quad";
         compatible = "kosagi,imx6q-novena", "fsl,imx6q";
 
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
+
         chosen {
                 stdout-path = &uart2;
         };
diff --git a/arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts b/arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts
new file mode 100644
index 000000000000..2e70ea5623c6
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-phytec-mira-rdk-emmc.dts
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2018 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <c.hemp@phytec.de>
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
+
+/ {
+        model = "PHYTEC phyBOARD-Mira Quad Carrier-Board with eMMC";
+        compatible = "phytec,imx6q-pbac06-emmc", "phytec,imx6q-pbac06",
+                     "phytec,imx6qdl-pcm058", "fsl,imx6q";
+
+        chosen {
+                stdout-path = &uart2;
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&fec {
+        status = "okay";
+};
+
+&hdmi {
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+};
+
+&i2c2 {
+        status = "okay";
+};
+
+&i2c_rtc {
+        status = "okay";
+};
+
+&m25p80 {
+        status = "okay";
+};
+
+&pcie {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&usbh1 {
+        status = "okay";
+};
+
+&usbotg {
+        status = "okay";
+};
+
+&usdhc1 {
+        status = "okay";
+};
+
+&usdhc4 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts b/arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts
new file mode 100644
index 000000000000..65d2e483c136
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-phytec-mira-rdk-nand.dts
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2018 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <c.hemp@phytec.de>
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
+
+/ {
+        model = "PHYTEC phyBOARD-Mira Quad Carrier-Board with NAND";
+        compatible = "phytec,imx6q-pbac06-nand", "phytec,imx6q-pbac06",
+                     "phytec,imx6qdl-pcm058", "fsl,imx6q";
+
+        chosen {
+                stdout-path = &uart2;
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&fec {
+        status = "okay";
+};
+
+&gpmi {
+        status = "okay";
+};
+
+&hdmi {
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+};
+
+&i2c2 {
+        status = "okay";
+};
+
+&i2c_rtc {
+        status = "okay";
+};
+
+&m25p80 {
+        status = "okay";
+};
+
+&pcie {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&usbh1 {
+        status = "okay";
+};
+
+&usbotg {
+        status = "okay";
+};
+
+&usdhc1 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
index cd20d0a948de..fad858c30fe9 100644
--- a/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
@@ -16,7 +16,7 @@
         model = "Phytec phyFLEX-i.MX6 Quad";
         compatible = "phytec,imx6q-pfla02", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-pistachio.dts b/arch/arm/boot/dts/imx6q-pistachio.dts
index 1effb58f304c..bd57b3b74db7 100644
--- a/arch/arm/boot/dts/imx6q-pistachio.dts
+++ b/arch/arm/boot/dts/imx6q-pistachio.dts
@@ -56,7 +56,7 @@
                 stdout-path = &uart4;
         };
 
-        memory: memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-rex-pro.dts b/arch/arm/boot/dts/imx6q-rex-pro.dts
index 90ea61ae04e9..d6cae73b1927 100644
--- a/arch/arm/boot/dts/imx6q-rex-pro.dts
+++ b/arch/arm/boot/dts/imx6q-rex-pro.dts
@@ -16,7 +16,7 @@
         model = "Rex Pro i.MX6 Quad Board";
         compatible = "rex,imx6q-rex-pro", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-sbc6x.dts b/arch/arm/boot/dts/imx6q-sbc6x.dts
index 255733063ea4..b7aa2f0b9f53 100644
--- a/arch/arm/boot/dts/imx6q-sbc6x.dts
+++ b/arch/arm/boot/dts/imx6q-sbc6x.dts
@@ -12,7 +12,7 @@
         model = "MicroSys sbc6x board";
         compatible = "microsys,sbc6x", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
index a3cd7afac20a..505cba776a2d 100644
--- a/arch/arm/boot/dts/imx6q-tbs2910.dts
+++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
@@ -59,7 +59,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6q-ts4900.dts b/arch/arm/boot/dts/imx6q-ts4900.dts
index fab76f8cd076..e655107edc56 100644
--- a/arch/arm/boot/dts/imx6q-ts4900.dts
+++ b/arch/arm/boot/dts/imx6q-ts4900.dts
@@ -46,6 +46,11 @@
 / {
         model = "Technologic Systems i.MX6 Quad TS-4900 (Default Device Tree)";
         compatible = "technologic,imx6q-ts4900", "fsl,imx6q";
+
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
 };
 
 &sata {
diff --git a/arch/arm/boot/dts/imx6q-ts7970.dts b/arch/arm/boot/dts/imx6q-ts7970.dts
index f19e18995e68..c615ac4feede 100644
--- a/arch/arm/boot/dts/imx6q-ts7970.dts
+++ b/arch/arm/boot/dts/imx6q-ts7970.dts
@@ -47,6 +47,11 @@
 / {
         model = "Technologic Systems i.MX6 Quad TS-7970 (Default Device Tree)";
         compatible = "technologic,imx6q-ts7970", "fsl,imx6q";
+
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
 };
 
 &sata {
diff --git a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
index 9207d80f9cfb..b763352cddae 100644
--- a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
@@ -16,7 +16,7 @@
         model = "Wandboard i.MX6 Quad Board rev B1";
         compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-wandboard-revd1.dts b/arch/arm/boot/dts/imx6q-wandboard-revd1.dts
index e87ddb168669..8691fab21058 100644
--- a/arch/arm/boot/dts/imx6q-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard-revd1.dts
@@ -16,7 +16,7 @@
         model = "Wandboard i.MX6 Quad Board revD1";
         compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-wandboard.dts b/arch/arm/boot/dts/imx6q-wandboard.dts
index 4a8a6ee13e9f..2a3d98c1489a 100644
--- a/arch/arm/boot/dts/imx6q-wandboard.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard.dts
@@ -16,7 +16,7 @@
         model = "Wandboard i.MX6 Quad Board";
         compatible = "wand,imx6q-wandboard", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
index 6be8a1eea895..7da6dde9c857 100644
--- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
@@ -47,4 +47,9 @@
 / {
         model = "ZII RDU2 Board";
         compatible = "zii,imx6q-zii-rdu2", "fsl,imx6q";
+
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index bc581aa5cf17..ae7b3f107893 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -215,11 +215,6 @@
                 compatible = "fsl,imx-display-subsystem";
                 ports = <&ipu1_di0>, <&ipu1_di1>, <&ipu2_di0>, <&ipu2_di1>;
         };
-
-        gpu-subsystem {
-                compatible = "fsl,imx-gpu-subsystem";
-                cores = <&gpu_2d>, <&gpu_3d>, <&gpu_vg>;
-        };
 };
 
 &gpio1 {
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 4e776e036cbc..8206683172d2 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -47,6 +47,11 @@
         model = "Toradex Apalis iMX6Q/D Module";
         compatible = "toradex,apalis_imx6q", "fsl,imx6q";
 
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
+
         backlight: backlight {
                 compatible = "pwm-backlight";
                 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index d1cfdc264126..9332a31e6c8b 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -42,6 +42,11 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
+
         ir_recv: ir-receiver {
                 compatible = "gpio-ir-receiver";
                 gpios = <&gpio3 9 1>;
diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
index dea8fc43c692..17a7b9c083d0 100644
--- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
@@ -44,7 +44,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index 363a44394dad..b8044681006c 100644
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -59,7 +59,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index c75385c0cad0..629908fbaa32 100644
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -59,7 +59,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index eab75f3dbaf3..a1a6fb5541e1 100644
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -59,7 +59,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
index 30d4662d4480..4e21b3849394 100644
--- a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
@@ -74,7 +74,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
index c67c10605070..81dae5b5bc87 100644
--- a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
@@ -51,7 +51,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
index 1a0faa1a14c8..c5d95e8d2e09 100644
--- a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
@@ -80,7 +80,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
index d894dde6e85d..b5986efe1090 100644
--- a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
@@ -288,6 +288,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 clocks = <&clks IMX6QDL_CLK_CKO>;
                 VDDA-supply = <&reg_1p8v>;
                 VDDIO-supply = <&reg_3p3v>;
diff --git a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
index 444425153fc7..368132274a91 100644
--- a/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5903.dtsi
@@ -83,7 +83,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
index fd4b68be9fe9..58124adfd65b 100644
--- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
@@ -93,7 +93,7 @@
                 };
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 92583238ca4a..7e20b47de839 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -40,6 +40,11 @@
  */
 
 / {
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
+
         chosen {
                 stdout-path = &uart1;
         };
@@ -239,10 +244,9 @@
 
                 pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id {
                         /*
-                         * Similar to pinctrl_usbotg_2, but we want it
-                         * pulled down for a fixed host connection.
+                         * We want it pulled down for a fixed host connection.
                          */
-                        fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
+                        fsl,pins = <MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x13059>;
                 };
 
                 pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
index dffbc92e0023..98241acb08a6 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -40,6 +40,11 @@
  */
 
 / {
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
+
         chosen {
                 stdout-path = &uart1;
         };
@@ -191,6 +196,7 @@
         sgtl5000: codec@a {
                 clocks = <&clks IMX6QDL_CLK_CKO>;
                 compatible = "fsl,sgtl5000";
+                #sound-dai-cells = <0>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>;
                 reg = <0x0a>;
@@ -409,8 +415,7 @@
 
                 pinctrl_hummingboard2_usbotg_id: hummingboard2-usbotg-id {
                         /*
-                         * Similar to pinctrl_usbotg_2, but we want it
-                         * pulled down for a fixed host connection.
+                         * We want it pulled down for a fixed host connection.
                          */
                         fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
                 };
diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
index b6220d62f6de..acc3b11fba2a 100644
--- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
@@ -44,7 +44,7 @@
 #include <dt-bindings/sound/fsl-imx-audmux.h>
 
 / {
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
@@ -200,7 +200,11 @@
         status = "okay";
 
         mdio {
-                eth_phy: ethernet-phy {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                eth_phy: ethernet-phy@0 {
+                        reg = <0x0>;
                         rxc-skew-ps = <1140>;
                         txc-skew-ps = <1140>;
                         txen-skew-ps = <600>;
diff --git a/arch/arm/boot/dts/imx6qdl-icore.dtsi b/arch/arm/boot/dts/imx6qdl-icore.dtsi
index a1b469c142f1..b3a463a5908b 100644
--- a/arch/arm/boot/dts/imx6qdl-icore.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-icore.dtsi
@@ -45,7 +45,7 @@
 #include <dt-bindings/sound/fsl-imx-audmux.h>
 
 / {
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
index 4cc4e23cf99c..aab088f318e8 100644
--- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
@@ -46,7 +46,7 @@
                 stdout-path = &uart2;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index fd05f7caa472..87ca6ead4098 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@ -46,7 +46,7 @@
                 stdout-path = &uart2;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0xF0000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
index 40942d6b94b3..f5b763d39285 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
@@ -46,7 +46,7 @@
                 stdout-path = &uart2;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 919b6b7619a4..596866b0a0d2 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -48,7 +48,7 @@
                 stdout-path = &uart2;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi
new file mode 100644
index 000000000000..9ebd438dce7d
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi
@@ -0,0 +1,390 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2018 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <c.hemp@phytec.de>
+ */
+
+
+/ {
+        aliases {
+                rtc0 = &i2c_rtc;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                brightness-levels = <0 4 8 16 32 64 128 255>;
+                default-brightness-level = <7>;
+                power-supply = <&reg_backlight>;
+                pwms = <&pwm1 0 5000000>;
+                status = "okay";
+        };
+
+        gpio_leds: leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_gpioleds>;
+                status = "disabled";
+
+                red {
+                        label = "phyboard-mira:red";
+                        gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>;
+                };
+
+                green {
+                        label = "phyboard-mira:green";
+                        gpios = <&gpio5 23 GPIO_ACTIVE_HIGH>;
+                };
+
+                blue {
+                        label = "phyboard-mira:blue";
+                        gpios = <&gpio5 24 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "mmc0";
+                };
+        };
+
+        reg_backlight: regulator-backlight {
+                compatible = "regulator-fixed";
+                regulator-name = "backlight_3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+        };
+
+        reg_en_switch: regulator-en-switch {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_en_switch>;
+                regulator-name = "Enable Switch";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                enable-active-high;
+                gpio = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+                regulator-always-on;
+        };
+
+        reg_flexcan1: regulator-flexcan1 {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_flexcan1_en>;
+                regulator-name = "flexcan1-reg";
+                regulator-min-microvolt = <1500000>;
+                regulator-max-microvolt = <1500000>;
+                gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_panel: regulator-panel {
+                compatible = "regulator-fixed";
+                regulator-name = "panel-power-supply";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+                regulator-always-on;
+        };
+
+        reg_pcie: regulator-pcie {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_pcie_reg>;
+                regulator-name = "mPCIe_1V5";
+                regulator-min-microvolt = <1500000>;
+                regulator-max-microvolt = <1500000>;
+                gpio = <&gpio3 0 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_usb_h1_vbus: usb-h1-vbus {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_usbh1_vbus>;
+                regulator-name = "usb_h1_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio2 18 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        reg_usbotg_vbus: usbotg-vbus {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_usbotg_vbus>;
+                regulator-name = "usb_otg_vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        panel {
+                compatible = "auo,g104sn02";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_panel_en>;
+                power-supply = <&reg_panel>;
+                enable-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;
+                backlight = <&backlight>;
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&lvds0_out>;
+                        };
+                };
+        };
+};
+
+&can1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan1>;
+        xceiver-supply = <&reg_flexcan1>;
+        status = "disabled";
+};
+
+&hdmi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hdmicec>;
+        ddc-i2c-bus = <&i2c2>;
+        status = "disabled";
+};
+
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        clock-frequency = <400000>;
+        status = "disabled";
+
+        stmpe: touchctrl@44 {
+                compatible = "st,stmpe811";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_stmpe>;
+                reg = <0x44>;
+                interrupt-parent = <&gpio7>;
+                interrupts = <12 IRQ_TYPE_NONE>;
+                status = "disabled";
+
+                stmpe_touchscreen {
+                        compatible = "st,stmpe-ts";
+                        st,sample-time = <4>;
+                        st,mod-12b = <1>;
+                        st,ref-sel = <0>;
+                        st,adc-freq = <1>;
+                        st,ave-ctrl = <1>;
+                        st,touch-det-delay = <2>;
+                        st,settling = <2>;
+                        st,fraction-z = <7>;
+                        st,i-drive = <1>;
+                };
+        };
+
+        i2c_rtc: rtc@68 {
+                compatible = "microcrystal,rv4162";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_rtc_int>;
+                reg = <0x68>;
+                interrupt-parent = <&gpio7>;
+                interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+};
+
+&i2c2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        clock-frequency = <100000>;
+        status = "disabled";
+};
+
+&ldb {
+        status = "okay";
+
+        lvds-channel@0 {
+                fsl,data-mapping = "spwg";
+                fsl,data-width = <24>;
+                status = "disabled";
+
+                port@4 {
+                        reg = <4>;
+
+                        lvds0_out: endpoint {
+                                remote-endpoint = <&panel_in>;
+                        };
+                };
+        };
+};
+
+&pcie {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pcie>;
+        reset-gpio = <&gpio2 25 GPIO_ACTIVE_LOW>;
+        vpcie-supply = <&reg_pcie>;
+        status = "disabled";
+};
+
+&pwm1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm1>;
+        status = "okay";
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2>;
+        status = "okay";
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart3>;
+        uart-has-rtscts;
+        status = "disabled";
+};
+
+&usbh1 {
+        vbus-supply = <&reg_usb_h1_vbus>;
+        disable-over-current;
+        status = "disabled";
+};
+
+&usbotg {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg>;
+        vbus-supply = <&reg_usbotg_vbus>;
+        disable-over-current;
+        status = "disabled";
+};
+
+&usdhc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc1>;
+        cd-gpios = <&gpio6 31 GPIO_ACTIVE_LOW>;
+        no-1-8-v;
+        status = "disabled";
+};
+
+&iomuxc {
+        pinctrl_panel_en: panelen1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_EB0__GPIO2_IO28          0xb0b1
+                >;
+        };
+
+        pinctrl_en_switch: enswitchgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_DA4__GPIO3_IO04          0xb0b1
+                >;
+        };
+
+        pinctrl_flexcan1: flexcan1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_7__FLEXCAN1_TX          0x1b0b0
+                        MX6QDL_PAD_GPIO_8__FLEXCAN1_RX          0x1b0b0
+                >;
+        };
+
+        pinctrl_flexcan1_en: flexcan1engrp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_A18__GPIO2_IO20          0xb0b1
+                >;
+        };
+
+        pinctrl_gpioleds: gpioledsgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_CSI0_DAT4__GPIO5_IO22        0x1b0b0
+                        MX6QDL_PAD_CSI0_DAT5__GPIO5_IO23        0x1b0b0
+                        MX6QDL_PAD_CSI0_DAT6__GPIO5_IO24        0x1b0b0
+                >;
+        };
+
+        pinctrl_hdmicec: hdmicecgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE   0x1f8b0
+                >;
+        };
+
+        pinctrl_i2c2: i2c2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
+                        MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
+                >;
+        };
+
+        pinctrl_i2c1: i2c1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
+                        MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
+                >;
+        };
+
+        pinctrl_pcie: pciegrp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_OE__GPIO2_IO25           0xb0b1
+                >;
+        };
+
+        pinctrl_pcie_reg: pciereggrp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_DA0__GPIO3_IO00          0xb0b1
+                >;
+        };
+
+        pinctrl_pwm1: pwm1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_9__PWM1_OUT             0x1b0b1
+                >;
+        };
+
+        pinctrl_rtc_int: rtcintgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD3_RST__GPIO7_IO08          0x1b0b0
+                >;
+        };
+
+        pinctrl_stmpe: stmpegrp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_17__GPIO7_IO12          0x1b0b0
+                >;
+        };
+
+        pinctrl_uart2: uart2grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D26__UART2_TX_DATA       0x1b0b1
+                        MX6QDL_PAD_EIM_D27__UART2_RX_DATA       0x1b0b1
+                >;
+        };
+
+        pinctrl_uart3: uart3grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_EB3__UART3_CTS_B         0x1b0b1
+                        MX6QDL_PAD_EIM_D23__UART3_RTS_B         0x1b0b1
+                        MX6QDL_PAD_EIM_D24__UART3_TX_DATA       0x1b0b1
+                        MX6QDL_PAD_EIM_D25__UART3_RX_DATA       0x1b0b1
+                >;
+        };
+
+        pinctrl_usbh1_vbus: usbh1vbusgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_A20__GPIO2_IO18          0xb0b1
+                >;
+        };
+
+        pinctrl_usbotg: usbotggrp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
+                >;
+        };
+
+        pinctrl_usbotg_vbus: usbotgvbusgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_A19__GPIO2_IO19          0xb0b1
+                >;
+        };
+
+        pinctrl_usdhc1: usdhc1grp {
+                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
+                        MX6QDL_PAD_EIM_BCLK__GPIO6_IO31         0xb0b1  /* CD */
+                >;
+        };
+};
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
index 585b4f6986c1..7ba317ae899b 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
@@ -13,7 +13,7 @@
 
 / {
         chosen {
-                linux,stdout-path = &uart4;
+                stdout-path = &uart4;
         };
 
         regulators {
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index d81b0078a100..c58f3443d55d 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -15,7 +15,7 @@
         model = "Phytec phyFLEX-i.MX6 Quad";
         compatible = "phytec,imx6q-pfla02", "fsl,imx6q";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi
new file mode 100644
index 000000000000..6486df3e2942
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi
@@ -0,0 +1,279 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2018 PHYTEC Messtechnik GmbH
+ * Author: Christian Hemp <c.hemp@phytec.de>
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        aliases {
+                rtc1 = &da9062_rtc;
+                rtc2 = &snvs_rtc;
+        };
+
+        /*
+         * Set the minimum memory size here and
+         * let the bootloader set the real size.
+         */
+        memory@10000000 {
+                device_type = "memory";
+                reg = <0x10000000 0x8000000>;
+        };
+
+        gpio_leds_som: somleds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_gpioleds_som>;
+
+                som-led-green {
+                        label = "phycore:green";
+                        gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+        };
+};
+
+&ecspi1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi1>;
+        cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>;
+        status = "okay";
+
+        m25p80: flash@0 {
+                compatible = "jedec,spi-nor";
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+                status = "disabled";
+        };
+};
+
+&fec {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet>;
+        phy-handle = <&ethphy>;
+        phy-mode = "rgmii";
+        phy-supply = <&vdd_eth_io>;
+        phy-reset-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+        status = "disabled";
+
+        mdio {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ethphy: ethernet-phy@3 {
+                        reg = <3>;
+                        txc-skew-ps = <1680>;
+                        rxc-skew-ps = <1860>;
+                };
+        };
+};
+
+&gpmi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_gpmi_nand>;
+        nand-on-flash-bbt;
+        status = "disabled";
+};
+
+&i2c3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c3>;
+        clock-frequency = <400000>;
+        status = "okay";
+
+        eeprom@50 {
+                compatible = "atmel,24c32";
+                reg = <0x50>;
+        };
+
+        pmic@58 {
+                compatible = "dlg,da9062";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_pmic>;
+                reg = <0x58>;
+                interrupt-parent = <&gpio1>;
+                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                interrupt-controller;
+
+                da9062_rtc: rtc {
+                        compatible = "dlg,da9062-rtc";
+                };
+
+                watchdog {
+                        compatible = "dlg,da9062-watchdog";
+                };
+
+                regulators {
+                        vdd_arm: buck1 {
+                                regulator-name = "vdd_arm";
+                                regulator-min-microvolt = <730000>;
+                                regulator-max-microvolt = <1380000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_soc: buck2 {
+                                regulator-name = "vdd_soc";
+                                regulator-min-microvolt = <730000>;
+                                regulator-max-microvolt = <1380000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_ddr3_1p5: buck3 {
+                                regulator-name = "vdd_ddr3";
+                                regulator-min-microvolt = <1500000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_eth_1p2: buck4 {
+                                regulator-name = "vdd_eth";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <1200000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_snvs: ldo1 {
+                                regulator-name = "vdd_snvs";
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_high: ldo2 {
+                                regulator-name = "vdd_high";
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_eth_io: ldo3 {
+                                regulator-name = "vdd_eth_io";
+                                regulator-min-microvolt = <2500000>;
+                                regulator-max-microvolt = <2500000>;
+                        };
+
+                        vdd_emmc_1p8: ldo4 {
+                                regulator-name = "vdd_emmc";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                        };
+                };
+        };
+};
+
+&reg_arm {
+        vin-supply = <&vdd_arm>;
+};
+
+&reg_pu {
+        vin-supply = <&vdd_soc>;
+};
+
+&reg_soc {
+        vin-supply = <&vdd_soc>;
+};
+
+&snvs_poweroff {
+        status = "okay";
+};
+
+&usdhc4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc4>;
+        bus-width = <8>;
+        non-removable;
+        vmmc-supply = <&vdd_emmc_1p8>;
+        status = "disabled";
+};
+
+&iomuxc {
+        pinctrl_enet: enetgrp {
+                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_ENET_REF_CLK__ENET_TX_CLK    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_TX_EN__ENET_TX_EN       0x1b0b0
+                        MX6QDL_PAD_SD2_DAT1__GPIO1_IO14         0x1b0b0
+                >;
+        };
+
+        pinctrl_gpioleds_som: gpioledssomgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1b0b0
+                >;
+        };
+
+        pinctrl_gpmi_nand: gpminandgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_NANDF_CLE__NAND_CLE          0xb0b1
+                        MX6QDL_PAD_NANDF_ALE__NAND_ALE          0xb0b1
+                        MX6QDL_PAD_NANDF_WP_B__NAND_WP_B        0xb0b1
+                        MX6QDL_PAD_NANDF_RB0__NAND_READY_B      0xb000
+                        MX6QDL_PAD_NANDF_CS0__NAND_CE0_B        0xb0b1
+                        MX6QDL_PAD_NANDF_CS1__NAND_CE1_B        0xb0b1
+                        MX6QDL_PAD_NANDF_CS2__NAND_CE2_B        0xb0b1
+                        MX6QDL_PAD_NANDF_CS3__NAND_CE3_B        0xb0b1
+                        MX6QDL_PAD_SD4_CMD__NAND_RE_B           0xb0b1
+                        MX6QDL_PAD_SD4_CLK__NAND_WE_B           0xb0b1
+                        MX6QDL_PAD_NANDF_D0__NAND_DATA00        0xb0b1
+                        MX6QDL_PAD_NANDF_D1__NAND_DATA01        0xb0b1
+                        MX6QDL_PAD_NANDF_D2__NAND_DATA02        0xb0b1
+                        MX6QDL_PAD_NANDF_D3__NAND_DATA03        0xb0b1
+                        MX6QDL_PAD_NANDF_D4__NAND_DATA04        0xb0b1
+                        MX6QDL_PAD_NANDF_D5__NAND_DATA05        0xb0b1
+                        MX6QDL_PAD_NANDF_D6__NAND_DATA06        0xb0b1
+                        MX6QDL_PAD_NANDF_D7__NAND_DATA07        0xb0b1
+                        MX6QDL_PAD_SD4_DAT0__NAND_DQS           0x00b1
+                >;
+        };
+
+        pinctrl_i2c3: i2c3grp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_6__I2C3_SDA             0x4001b8b1
+                        MX6QDL_PAD_GPIO_5__I2C3_SCL             0x4001b8b1
+                >;
+        };
+
+        pinctrl_ecspi1: ecspi1grp {
+                fsl,pins = <
+                        MX6QDL_PAD_EIM_D16__ECSPI1_SCLK         0x100b1
+                        MX6QDL_PAD_EIM_D17__ECSPI1_MISO         0x100b1
+                        MX6QDL_PAD_EIM_D18__ECSPI1_MOSI         0x100b1
+                        MX6QDL_PAD_EIM_D19__GPIO3_IO19          0x1b0b0
+                >;
+        };
+
+        pinctrl_pmic: pmicgrp {
+                fsl,pins = <
+                        MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x1b0b0
+                >;
+        };
+
+        pinctrl_usdhc4: usdhc4grp {
+                fsl,pins = <
+                        MX6QDL_PAD_SD4_CMD__SD4_CMD             0x17059
+                        MX6QDL_PAD_SD4_CLK__SD4_CLK             0x10059
+                        MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x17059
+                        MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
+                        MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
+                        MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
+                        MX6QDL_PAD_SD4_DAT4__SD4_DATA4          0x17059
+                        MX6QDL_PAD_SD4_DAT5__SD4_DATA5          0x17059
+                        MX6QDL_PAD_SD4_DAT6__SD4_DATA6          0x17059
+                        MX6QDL_PAD_SD4_DAT7__SD4_DATA7          0x17059
+                >;
+        };
+};
diff --git a/arch/arm/boot/dts/imx6qdl-rex.dtsi b/arch/arm/boot/dts/imx6qdl-rex.dtsi
index 6e9549ff11da..039e3b8306c4 100644
--- a/arch/arm/boot/dts/imx6qdl-rex.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-rex.dtsi
@@ -137,7 +137,7 @@
         status = "okay";
 
         eeprom@57 {
-                compatible = "at,24c02";
+                compatible = "atmel,24c02";
                 reg = <0x57>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 82d6ccb46982..54b0139e978d 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -13,7 +13,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index 35de7adc997b..18b65052553d 100644
--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@ -49,7 +49,7 @@
                 stdout-path = &uart2;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 0a50705b9c18..f019f9900369 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -19,7 +19,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index 6abb66cd7d4a..f015e2d1cf35 100644
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -61,8 +61,8 @@
                 sdhc1 = &usdhc2;
         };
 
-        memory {
-                reg = <0 0>; /* will be filled by U-Boot */
+        memory@10000000 {
+                reg = <0x10000000 0>; /* will be filled by U-Boot */
         };
 
         clocks {
diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
index 4161b7d4323a..906387915dc5 100644
--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
@@ -35,7 +35,7 @@
                 pinctrl-names = "default";
         };
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-var-dart.dtsi b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
index 421d6f527609..38080c1dfaec 100644
--- a/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-var-dart.dtsi
@@ -10,7 +10,7 @@
 #include <dt-bindings/sound/fsl-imx-audmux.h>
 
 / {
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
index 72f52fcecee1..911f7f0e3cea 100644
--- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
@@ -305,6 +305,15 @@
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_uart4>;
         status = "okay";
+
+        rave-sp {
+                compatible = "zii,rave-sp-rdu2";
+                current-speed = <1000000>;
+
+                watchdog {
+                        compatible = "zii,rave-sp-watchdog";
+                };
+        };
 };
 
 &ecspi1 {
@@ -498,7 +507,7 @@
         };
 
         eeprom@54 {
-                compatible = "at,24c128";
+                compatible = "atmel,24c128";
                 reg = <0x54>;
         };
 
@@ -602,6 +611,8 @@
         wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
         vmmc-supply = <&reg_3p3v_sd>;
         vqmmc-supply = <&reg_3p3v>;
+        no-1-8-v;
+        no-sdio;
         status = "okay";
 };
 
@@ -613,6 +624,8 @@
         wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
         vmmc-supply = <&reg_3p3v_sd>;
         vqmmc-supply = <&reg_3p3v>;
+        no-1-8-v;
+        no-sdio;
         status = "okay";
 };
 
@@ -622,7 +635,10 @@
         bus-width = <8>;
         vmmc-supply = <&reg_3p3v>;
         vqmmc-supply = <&reg_3p3v>;
+        no-1-8-v;
         non-removable;
+        no-sdio;
+        no-sd;
         status = "okay";
 };
 
@@ -805,6 +821,10 @@
         };
 };
 
+&wdog1 {
+        status = "disabled";
+};
+
 &iomuxc {
         pinctrl_accel: accelgrp {
                 fsl,pins = <
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 59ff86695a14..c003e62bf290 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -23,7 +23,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec;
@@ -143,7 +143,7 @@
                 };
         };
 
-        pmu {
+        pmu: pmu {
                 compatible = "arm,cortex-a9-pmu";
                 interrupt-parent = <&gpc>;
                 interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts b/arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts
new file mode 100644
index 000000000000..f27d7ab42626
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qp-phytec-mira-rdk-nand.dts
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2018 PHYTEC Messtechnik GmbH
+ * Author: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
+ */
+
+/dts-v1/;
+#include "imx6qp.dtsi"
+#include "imx6qdl-phytec-phycore-som.dtsi"
+#include "imx6qdl-phytec-mira.dtsi"
+
+/ {
+        model = "PHYTEC phyBOARD-Mira QuadPlus Carrier-Board with NAND";
+        compatible = "phytec,imx6qp-pbac06-nand", "phytec,imx6qp-pbac06",
+                     "phytec,imx6qdl-pcm058", "fsl,imx6qp";
+
+        chosen {
+                stdout-path = &uart2;
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&fec {
+        status = "okay";
+};
+
+&gpmi {
+        status = "okay";
+};
+
+&hdmi {
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+};
+
+&i2c2 {
+        status = "okay";
+};
+
+&i2c_rtc {
+        status = "okay";
+};
+
+&m25p80 {
+        status = "okay";
+};
+
+&pcie {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&usbh1 {
+        status = "okay";
+};
+
+&usbotg {
+        status = "okay";
+};
+
+&usdhc1 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts b/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
index f7badd82ce8a..907ba0c74ba6 100644
--- a/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
+++ b/arch/arm/boot/dts/imx6qp-wandboard-revd1.dts
@@ -16,7 +16,7 @@
         model = "Wandboard i.MX6 QuadPlus Board revD1";
         compatible = "wand,imx6qp-wandboard", "fsl,imx6qp";
 
-        memory {
+        memory@10000000 {
                 reg = <0x10000000 0x80000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
index 547a76677ab3..de5b50df833c 100644
--- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
+++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
@@ -47,4 +47,9 @@
 / {
         model = "ZII RDU2+ Board";
         compatible = "zii,imx6qp-zii-rdu2", "fsl,imx6qp";
+
+        /* Will be filled by the bootloader */
+        memory@10000000 {
+                reg = <0x10000000 0>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 2844ab541759..37e792fdc160 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -16,7 +16,7 @@
         model = "Freescale i.MX6 SoloLite EVK Board";
         compatible = "fsl,imx6sl-evk", "fsl,imx6sl";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6sl-warp.dts b/arch/arm/boot/dts/imx6sl-warp.dts
index 72c7745f51d3..404e602e6781 100644
--- a/arch/arm/boot/dts/imx6sl-warp.dts
+++ b/arch/arm/boot/dts/imx6sl-warp.dts
@@ -54,7 +54,7 @@
         model = "WaRP Board";
         compatible = "warp,imx6sl-warp", "fsl,imx6sl";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index ae8df3cf687e..ab6a7e2e7e8f 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -21,7 +21,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
index f9d40ee14982..b58f770c40d9 100644
--- a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
+++ b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
@@ -52,7 +52,7 @@
                 t_lcd = &t_lcd;
         };
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index 240a2864d044..72da5acf35a2 100644
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -14,7 +14,7 @@
         model = "Freescale i.MX6 SoloX Sabre Auto Board";
         compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index d35aa858f9db..f8f31872fa14 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -20,7 +20,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
index 4d8c6521845f..252175b59247 100644
--- a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
+++ b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
@@ -20,7 +20,7 @@
                 stdout-path = &uart1;
         };
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
index 0c1fc1a8f913..40ccdf43dffc 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
@@ -48,7 +48,7 @@
         model = "UDOO Neo Basic";
         compatible = "udoo,neobasic", "fsl,imx6sx";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x20000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
index 5d6c2274ee2b..42bfc8f8f7f6 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
@@ -48,7 +48,7 @@
         model = "UDOO Neo Extended";
         compatible = "udoo,neoextended", "fsl,imx6sx";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x40000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
index 653ceb29e28b..c84c877f09d4 100644
--- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
@@ -48,7 +48,7 @@
         model = "UDOO Neo Full";
         compatible = "udoo,neofull", "fsl,imx6sx";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x40000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index fd7879342d0d..49c7205b8db8 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -22,7 +22,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 can0 = &flexcan1;
@@ -188,6 +188,7 @@
                                  <&clks IMX6SX_CLK_GPU>,
                                  <&clks IMX6SX_CLK_GPU>;
                         clock-names = "bus", "core", "shader";
+                        power-domains = <&pd_pu>;
                 };
 
                 dma_apbh: dma-apbh@1804000 {
@@ -767,6 +768,18 @@
                                         #address-cells = <1>;
                                         #size-cells = <0>;
 
+                                        power-domain@0 {
+                                                reg = <0>;
+                                                #power-domain-cells = <0>;
+                                        };
+
+                                        pd_pu: power-domain@1 {
+                                                reg = <1>;
+                                                #power-domain-cells = <0>;
+                                                power-supply = <&reg_soc>;
+                                                clocks = <&clks IMX6SX_CLK_GPU>;
+                                        };
+
                                         pd_pci: power-domain@3 {
                                                 reg = <3>;
                                                 #power-domain-cells = <0>;
@@ -1355,9 +1368,4 @@
                         status = "disabled";
                 };
         };
-
-        gpu-subsystem {
-                compatible = "fsl,imx-gpu-subsystem";
-                cores = <&gpu>;
-        };
 };
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index 18fdb088ba1e..6d720b20e7ed 100644
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -9,487 +9,9 @@
 /dts-v1/;
 
 #include "imx6ul.dtsi"
+#include "imx6ul-14x14-evk.dtsi"
 
 / {
         model = "Freescale i.MX6 UltraLite 14x14 EVK Board";
         compatible = "fsl,imx6ul-14x14-evk", "fsl,imx6ul";
-
-        chosen {
-                stdout-path = &uart1;
-        };
-
-        memory {
-                reg = <0x80000000 0x20000000>;
-        };
-
-        backlight_display: backlight-display {
-                compatible = "pwm-backlight";
-                pwms = <&pwm1 0 5000000>;
-                brightness-levels = <0 4 8 16 32 64 128 255>;
-                default-brightness-level = <6>;
-                status = "okay";
-        };
-
-
-        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 {
-                compatible = "simple-audio-card";
-                simple-audio-card,name = "mx6ul-wm8960";
-                simple-audio-card,format = "i2s";
-                simple-audio-card,bitclock-master = <&dailink_master>;
-                simple-audio-card,frame-master = <&dailink_master>;
-                simple-audio-card,widgets =
-                        "Microphone", "Mic Jack",
-                        "Line", "Line In",
-                        "Line", "Line Out",
-                        "Speaker", "Speaker",
-                        "Headphone", "Headphone Jack";
-                simple-audio-card,routing =
-                        "Headphone Jack", "HP_L",
-                        "Headphone Jack", "HP_R",
-                        "Speaker", "SPK_LP",
-                        "Speaker", "SPK_LN",
-                        "Speaker", "SPK_RP",
-                        "Speaker", "SPK_RN",
-                        "LINPUT1", "Mic Jack",
-                        "LINPUT3", "Mic Jack",
-                        "RINPUT1", "Mic Jack",
-                        "RINPUT2", "Mic Jack";
-
-                simple-audio-card,cpu {
-                        sound-dai = <&sai2>;
-                };
-
-                dailink_master: simple-audio-card,codec {
-                        sound-dai = <&codec>;
-                        clocks = <&clks IMX6UL_CLK_SAI2>;
-                };
-        };
-
-        panel {
-                compatible = "innolux,at043tn24";
-                backlight = <&backlight_display>;
-
-                port {
-                        panel_in: endpoint {
-                                remote-endpoint = <&display_out>;
-                        };
-                };
-        };
-};
-
-&clks {
-        assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
-        assigned-clock-rates = <786432000>;
-};
-
-&i2c2 {
-        clock_frequency = <100000>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_i2c2>;
-        status = "okay";
-
-        codec: wm8960@1a {
-                #sound-dai-cells = <0>;
-                compatible = "wlf,wm8960";
-                reg = <0x1a>;
-                wlf,shared-lrclk;
-        };
-};
-
-&fec1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_enet1>;
-        phy-mode = "rmii";
-        phy-handle = <&ethphy0>;
-        status = "okay";
-};
-
-&fec2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_enet2>;
-        phy-mode = "rmii";
-        phy-handle = <&ethphy1>;
-        status = "okay";
-
-        mdio {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                ethphy0: ethernet-phy@2 {
-                        reg = <2>;
-                        micrel,led-mode = <1>;
-                        clocks = <&clks IMX6UL_CLK_ENET_REF>;
-                        clock-names = "rmii-ref";
-                };
-
-                ethphy1: ethernet-phy@1 {
-                        reg = <1>;
-                        micrel,led-mode = <1>;
-                        clocks = <&clks IMX6UL_CLK_ENET2_REF>;
-                        clock-names = "rmii-ref";
-                };
-        };
-};
-
-
-&lcdif {
-        assigned-clocks = <&clks IMX6UL_CLK_LCDIF_PRE_SEL>;
-        assigned-clock-parents = <&clks IMX6UL_CLK_PLL5_VIDEO_DIV>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_lcdif_dat
-                     &pinctrl_lcdif_ctrl>;
-        status = "okay";
-
-        port {
-                display_out: endpoint {
-                        remote-endpoint = <&panel_in>;
-                };
-        };
-};
-
-&pwm1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_pwm1>;
-        status = "okay";
-};
-
-&qspi {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_qspi>;
-        status = "okay";
-
-        flash0: n25q256a@0 {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                compatible = "micron,n25q256a";
-                spi-max-frequency = <29000000>;
-                reg = <0>;
-        };
-};
-
-&sai2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_sai2>;
-        assigned-clocks = <&clks IMX6UL_CLK_SAI2_SEL>,
-                          <&clks IMX6UL_CLK_SAI2>;
-        assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
-        assigned-clock-rates = <0>, <12288000>;
-        fsl,sai-mclk-direction-output;
-        status = "okay";
-};
-
-&snvs_poweroff {
-        status = "okay";
-};
-
-&tsc {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_tsc>;
-        xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
-        measure-delay-time = <0xffff>;
-        pre-charge-time = <0xfff>;
-        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";
-};
-
-&usbotg1 {
-        dr_mode = "otg";
-        status = "okay";
-};
-
-&usbotg2 {
-        dr_mode = "host";
-        disable-over-current;
-        status = "okay";
-};
-
-&usbphy1 {
-        fsl,tx-d-cal = <106>;
-};
-
-&usbphy2 {
-        fsl,tx-d-cal = <106>;
-};
-
-&usdhc1 {
-        pinctrl-names = "default", "state_100mhz", "state_200mhz";
-        pinctrl-0 = <&pinctrl_usdhc1>;
-        pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
-        pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
-        cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
-        keep-power-in-suspend;
-        wakeup-source;
-        vmmc-supply = <&reg_sd1_vmmc>;
-        status = "okay";
-};
-
-&usdhc2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_usdhc2>;
-        no-1-8-v;
-        keep-power-in-suspend;
-        wakeup-source;
-        status = "okay";
-};
-
-&wdog1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_wdog>;
-        fsl,ext-reset-output;
-};
-
-&iomuxc {
-        pinctrl-names = "default";
-
-        pinctrl_csi1: csi1grp {
-                fsl,pins = <
-                        MX6UL_PAD_CSI_MCLK__CSI_MCLK            0x1b088
-                        MX6UL_PAD_CSI_PIXCLK__CSI_PIXCLK        0x1b088
-                        MX6UL_PAD_CSI_VSYNC__CSI_VSYNC          0x1b088
-                        MX6UL_PAD_CSI_HSYNC__CSI_HSYNC          0x1b088
-                        MX6UL_PAD_CSI_DATA00__CSI_DATA02        0x1b088
-                        MX6UL_PAD_CSI_DATA01__CSI_DATA03        0x1b088
-                        MX6UL_PAD_CSI_DATA02__CSI_DATA04        0x1b088
-                        MX6UL_PAD_CSI_DATA03__CSI_DATA05        0x1b088
-                        MX6UL_PAD_CSI_DATA04__CSI_DATA06        0x1b088
-                        MX6UL_PAD_CSI_DATA05__CSI_DATA07        0x1b088
-                        MX6UL_PAD_CSI_DATA06__CSI_DATA08        0x1b088
-                        MX6UL_PAD_CSI_DATA07__CSI_DATA09        0x1b088
-                >;
-        };
-
-        pinctrl_enet1: enet1grp {
-                fsl,pins = <
-                        MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN      0x1b0b0
-                        MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER      0x1b0b0
-                        MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
-                        MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
-                        MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN      0x1b0b0
-                        MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
-                        MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
-                        MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1  0x4001b031
-                >;
-        };
-
-        pinctrl_enet2: enet2grp {
-                fsl,pins = <
-                        MX6UL_PAD_GPIO1_IO07__ENET2_MDC         0x1b0b0
-                        MX6UL_PAD_GPIO1_IO06__ENET2_MDIO        0x1b0b0
-                        MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN      0x1b0b0
-                        MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER      0x1b0b0
-                        MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0
-                        MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0
-                        MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN      0x1b0b0
-                        MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
-                        MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
-                        MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2  0x4001b031
-                >;
-        };
-
-        pinctrl_flexcan1: flexcan1grp{
-                fsl,pins = <
-                        MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX      0x1b020
-                        MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX      0x1b020
-                >;
-        };
-
-        pinctrl_flexcan2: flexcan2grp{
-                fsl,pins = <
-                        MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX      0x1b020
-                        MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX      0x1b020
-                >;
-        };
-
-        pinctrl_i2c1: i2c1grp {
-                fsl,pins = <
-                        MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
-                        MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
-                >;
-        };
-
-        pinctrl_i2c2: i2c2grp {
-                fsl,pins = <
-                        MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
-                        MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
-                >;
-        };
-
-        pinctrl_lcdif_dat: lcdifdatgrp {
-                fsl,pins = <
-                        MX6UL_PAD_LCD_DATA00__LCDIF_DATA00  0x79
-                        MX6UL_PAD_LCD_DATA01__LCDIF_DATA01  0x79
-                        MX6UL_PAD_LCD_DATA02__LCDIF_DATA02  0x79
-                        MX6UL_PAD_LCD_DATA03__LCDIF_DATA03  0x79
-                        MX6UL_PAD_LCD_DATA04__LCDIF_DATA04  0x79
-                        MX6UL_PAD_LCD_DATA05__LCDIF_DATA05  0x79
-                        MX6UL_PAD_LCD_DATA06__LCDIF_DATA06  0x79
-                        MX6UL_PAD_LCD_DATA07__LCDIF_DATA07  0x79
-                        MX6UL_PAD_LCD_DATA08__LCDIF_DATA08  0x79
-                        MX6UL_PAD_LCD_DATA09__LCDIF_DATA09  0x79
-                        MX6UL_PAD_LCD_DATA10__LCDIF_DATA10  0x79
-                        MX6UL_PAD_LCD_DATA11__LCDIF_DATA11  0x79
-                        MX6UL_PAD_LCD_DATA12__LCDIF_DATA12  0x79
-                        MX6UL_PAD_LCD_DATA13__LCDIF_DATA13  0x79
-                        MX6UL_PAD_LCD_DATA14__LCDIF_DATA14  0x79
-                        MX6UL_PAD_LCD_DATA15__LCDIF_DATA15  0x79
-                        MX6UL_PAD_LCD_DATA16__LCDIF_DATA16  0x79
-                        MX6UL_PAD_LCD_DATA17__LCDIF_DATA17  0x79
-                        MX6UL_PAD_LCD_DATA18__LCDIF_DATA18  0x79
-                        MX6UL_PAD_LCD_DATA19__LCDIF_DATA19  0x79
-                        MX6UL_PAD_LCD_DATA20__LCDIF_DATA20  0x79
-                        MX6UL_PAD_LCD_DATA21__LCDIF_DATA21  0x79
-                        MX6UL_PAD_LCD_DATA22__LCDIF_DATA22  0x79
-                        MX6UL_PAD_LCD_DATA23__LCDIF_DATA23  0x79
-                >;
-        };
-
-        pinctrl_lcdif_ctrl: lcdifctrlgrp {
-                fsl,pins = <
-                        MX6UL_PAD_LCD_CLK__LCDIF_CLK        0x79
-                        MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE  0x79
-                        MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC    0x79
-                        MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC    0x79
-                        /* used for lcd reset */
-                        MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09  0x79
-                >;
-        };
-
-        pinctrl_qspi: qspigrp {
-                fsl,pins = <
-                        MX6UL_PAD_NAND_WP_B__QSPI_A_SCLK        0x70a1
-                        MX6UL_PAD_NAND_READY_B__QSPI_A_DATA00   0x70a1
-                        MX6UL_PAD_NAND_CE0_B__QSPI_A_DATA01     0x70a1
-                        MX6UL_PAD_NAND_CE1_B__QSPI_A_DATA02     0x70a1
-                        MX6UL_PAD_NAND_CLE__QSPI_A_DATA03       0x70a1
-                        MX6UL_PAD_NAND_DQS__QSPI_A_SS0_B        0x70a1
-                >;
-        };
-
-        pinctrl_sai2: sai2grp {
-                fsl,pins = <
-                        MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK        0x17088
-                        MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC        0x17088
-                        MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA     0x11088
-                        MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA        0x11088
-                        MX6UL_PAD_JTAG_TMS__SAI2_MCLK           0x17088
-                        MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04      0x17059
-                >;
-        };
-
-        pinctrl_pwm1: pwm1grp {
-                fsl,pins = <
-                        MX6UL_PAD_GPIO1_IO08__PWM1_OUT   0x110b0
-                >;
-        };
-
-        pinctrl_sim2: sim2grp {
-                fsl,pins = <
-                        MX6UL_PAD_CSI_DATA03__SIM2_PORT1_PD             0xb808
-                        MX6UL_PAD_CSI_DATA04__SIM2_PORT1_CLK            0x31
-                        MX6UL_PAD_CSI_DATA05__SIM2_PORT1_RST_B          0xb808
-                        MX6UL_PAD_CSI_DATA06__SIM2_PORT1_SVEN           0xb808
-                        MX6UL_PAD_CSI_DATA07__SIM2_PORT1_TRXD           0xb809
-                        MX6UL_PAD_CSI_DATA02__GPIO4_IO23                0x3008
-                >;
-        };
-
-        pinctrl_tsc: tscgrp {
-                fsl,pins = <
-                        MX6UL_PAD_GPIO1_IO01__GPIO1_IO01                0xb0
-                        MX6UL_PAD_GPIO1_IO02__GPIO1_IO02                0xb0
-                        MX6UL_PAD_GPIO1_IO03__GPIO1_IO03                0xb0
-                        MX6UL_PAD_GPIO1_IO04__GPIO1_IO04                0xb0
-                >;
-        };
-
-        pinctrl_uart1: uart1grp {
-                fsl,pins = <
-                        MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
-                        MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
-                >;
-        };
-
-        pinctrl_uart2: uart2grp {
-                fsl,pins = <
-                        MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX   0x1b0b1
-                        MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX   0x1b0b1
-                        MX6UL_PAD_UART3_RX_DATA__UART2_DCE_RTS  0x1b0b1
-                        MX6UL_PAD_UART3_TX_DATA__UART2_DCE_CTS  0x1b0b1
-                >;
-        };
-
-        pinctrl_usdhc1: usdhc1grp {
-                fsl,pins = <
-                        MX6UL_PAD_SD1_CMD__USDHC1_CMD           0x17059
-                        MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x10059
-                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0       0x17059
-                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1       0x17059
-                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2       0x17059
-                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3       0x17059
-                        MX6UL_PAD_UART1_RTS_B__GPIO1_IO19       0x17059 /* SD1 CD */
-                        MX6UL_PAD_GPIO1_IO05__USDHC1_VSELECT    0x17059 /* SD1 VSELECT */
-                        MX6UL_PAD_GPIO1_IO09__GPIO1_IO09        0x17059 /* SD1 RESET */
-                >;
-        };
-
-        pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
-                fsl,pins = <
-                        MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x170b9
-                        MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x100b9
-                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170b9
-                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170b9
-                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170b9
-                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9
-
-                >;
-        };
-
-        pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
-                fsl,pins = <
-                        MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x170f9
-                        MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x100f9
-                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170f9
-                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170f9
-                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170f9
-                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9
-                >;
-        };
-
-        pinctrl_usdhc2: usdhc2grp {
-                fsl,pins = <
-                        MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x17059
-                        MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x17059
-                        MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
-                        MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
-                        MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
-                        MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
-                >;
-        };
-
-        pinctrl_wdog: wdoggrp {
-                fsl,pins = <
-                        MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY    0x30b0
-                >;
-        };
 };
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
new file mode 100644
index 000000000000..32a07232c034
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * 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.
+ */
+
+/ {
+        chosen {
+                stdout-path = &uart1;
+        };
+
+        memory@80000000 {
+                reg = <0x80000000 0x20000000>;
+        };
+
+        backlight_display: backlight-display {
+                compatible = "pwm-backlight";
+                pwms = <&pwm1 0 5000000>;
+                brightness-levels = <0 4 8 16 32 64 128 255>;
+                default-brightness-level = <6>;
+                status = "okay";
+        };
+
+
+        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 {
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "mx6ul-wm8960";
+                simple-audio-card,format = "i2s";
+                simple-audio-card,bitclock-master = <&dailink_master>;
+                simple-audio-card,frame-master = <&dailink_master>;
+                simple-audio-card,widgets =
+                        "Microphone", "Mic Jack",
+                        "Line", "Line In",
+                        "Line", "Line Out",
+                        "Speaker", "Speaker",
+                        "Headphone", "Headphone Jack";
+                simple-audio-card,routing =
+                        "Headphone Jack", "HP_L",
+                        "Headphone Jack", "HP_R",
+                        "Speaker", "SPK_LP",
+                        "Speaker", "SPK_LN",
+                        "Speaker", "SPK_RP",
+                        "Speaker", "SPK_RN",
+                        "LINPUT1", "Mic Jack",
+                        "LINPUT3", "Mic Jack",
+                        "RINPUT1", "Mic Jack",
+                        "RINPUT2", "Mic Jack";
+
+                simple-audio-card,cpu {
+                        sound-dai = <&sai2>;
+                };
+
+                dailink_master: simple-audio-card,codec {
+                        sound-dai = <&codec>;
+                        clocks = <&clks IMX6UL_CLK_SAI2>;
+                };
+        };
+
+        panel {
+                compatible = "innolux,at043tn24";
+                backlight = <&backlight_display>;
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&display_out>;
+                        };
+                };
+        };
+};
+
+&clks {
+        assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
+        assigned-clock-rates = <786432000>;
+};
+
+&i2c2 {
+        clock_frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        status = "okay";
+
+        codec: wm8960@1a {
+                #sound-dai-cells = <0>;
+                compatible = "wlf,wm8960";
+                reg = <0x1a>;
+                wlf,shared-lrclk;
+        };
+};
+
+&fec1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet1>;
+        phy-mode = "rmii";
+        phy-handle = <&ethphy0>;
+        status = "okay";
+};
+
+&fec2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet2>;
+        phy-mode = "rmii";
+        phy-handle = <&ethphy1>;
+        status = "okay";
+
+        mdio {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ethphy0: ethernet-phy@2 {
+                        reg = <2>;
+                        micrel,led-mode = <1>;
+                        clocks = <&clks IMX6UL_CLK_ENET_REF>;
+                        clock-names = "rmii-ref";
+                };
+
+                ethphy1: ethernet-phy@1 {
+                        reg = <1>;
+                        micrel,led-mode = <1>;
+                        clocks = <&clks IMX6UL_CLK_ENET2_REF>;
+                        clock-names = "rmii-ref";
+                };
+        };
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "okay";
+
+        mag3110@e {
+                compatible = "fsl,mag3110";
+                reg = <0x0e>;
+        };
+};
+
+&lcdif {
+        assigned-clocks = <&clks IMX6UL_CLK_LCDIF_PRE_SEL>;
+        assigned-clock-parents = <&clks IMX6UL_CLK_PLL5_VIDEO_DIV>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_lcdif_dat
+                     &pinctrl_lcdif_ctrl>;
+        status = "okay";
+
+        port {
+                display_out: endpoint {
+                        remote-endpoint = <&panel_in>;
+                };
+        };
+};
+
+&pwm1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm1>;
+        status = "okay";
+};
+
+&qspi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_qspi>;
+        status = "okay";
+
+        flash0: n25q256a@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "micron,n25q256a";
+                spi-max-frequency = <29000000>;
+                reg = <0>;
+        };
+};
+
+&sai2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_sai2>;
+        assigned-clocks = <&clks IMX6UL_CLK_SAI2_SEL>,
+                          <&clks IMX6UL_CLK_SAI2>;
+        assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
+        assigned-clock-rates = <0>, <12288000>;
+        fsl,sai-mclk-direction-output;
+        status = "okay";
+};
+
+&snvs_poweroff {
+        status = "okay";
+};
+
+&tsc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_tsc>;
+        xnur-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>;
+        measure-delay-time = <0xffff>;
+        pre-charge-time = <0xfff>;
+        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";
+};
+
+&usbotg1 {
+        dr_mode = "otg";
+        status = "okay";
+};
+
+&usbotg2 {
+        dr_mode = "host";
+        disable-over-current;
+        status = "okay";
+};
+
+&usbphy1 {
+        fsl,tx-d-cal = <106>;
+};
+
+&usbphy2 {
+        fsl,tx-d-cal = <106>;
+};
+
+&usdhc1 {
+        pinctrl-names = "default", "state_100mhz", "state_200mhz";
+        pinctrl-0 = <&pinctrl_usdhc1>;
+        pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
+        pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
+        cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
+        keep-power-in-suspend;
+        wakeup-source;
+        vmmc-supply = <&reg_sd1_vmmc>;
+        status = "okay";
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        no-1-8-v;
+        keep-power-in-suspend;
+        wakeup-source;
+        status = "okay";
+};
+
+&wdog1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_wdog>;
+        fsl,ext-reset-output;
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+
+        pinctrl_csi1: csi1grp {
+                fsl,pins = <
+                        MX6UL_PAD_CSI_MCLK__CSI_MCLK            0x1b088
+                        MX6UL_PAD_CSI_PIXCLK__CSI_PIXCLK        0x1b088
+                        MX6UL_PAD_CSI_VSYNC__CSI_VSYNC          0x1b088
+                        MX6UL_PAD_CSI_HSYNC__CSI_HSYNC          0x1b088
+                        MX6UL_PAD_CSI_DATA00__CSI_DATA02        0x1b088
+                        MX6UL_PAD_CSI_DATA01__CSI_DATA03        0x1b088
+                        MX6UL_PAD_CSI_DATA02__CSI_DATA04        0x1b088
+                        MX6UL_PAD_CSI_DATA03__CSI_DATA05        0x1b088
+                        MX6UL_PAD_CSI_DATA04__CSI_DATA06        0x1b088
+                        MX6UL_PAD_CSI_DATA05__CSI_DATA07        0x1b088
+                        MX6UL_PAD_CSI_DATA06__CSI_DATA08        0x1b088
+                        MX6UL_PAD_CSI_DATA07__CSI_DATA09        0x1b088
+                >;
+        };
+
+        pinctrl_enet1: enet1grp {
+                fsl,pins = <
+                        MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN      0x1b0b0
+                        MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER      0x1b0b0
+                        MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
+                        MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
+                        MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN      0x1b0b0
+                        MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
+                        MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
+                        MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1  0x4001b031
+                >;
+        };
+
+        pinctrl_enet2: enet2grp {
+                fsl,pins = <
+                        MX6UL_PAD_GPIO1_IO07__ENET2_MDC         0x1b0b0
+                        MX6UL_PAD_GPIO1_IO06__ENET2_MDIO        0x1b0b0
+                        MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN      0x1b0b0
+                        MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER      0x1b0b0
+                        MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0
+                        MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0
+                        MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN      0x1b0b0
+                        MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
+                        MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
+                        MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2  0x4001b031
+                >;
+        };
+
+        pinctrl_flexcan1: flexcan1grp{
+                fsl,pins = <
+                        MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX      0x1b020
+                        MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX      0x1b020
+                >;
+        };
+
+        pinctrl_flexcan2: flexcan2grp{
+                fsl,pins = <
+                        MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX      0x1b020
+                        MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX      0x1b020
+                >;
+        };
+
+        pinctrl_i2c1: i2c1grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+                        MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
+                >;
+        };
+
+        pinctrl_i2c2: i2c2grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+                        MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
+                >;
+        };
+
+        pinctrl_lcdif_dat: lcdifdatgrp {
+                fsl,pins = <
+                        MX6UL_PAD_LCD_DATA00__LCDIF_DATA00  0x79
+                        MX6UL_PAD_LCD_DATA01__LCDIF_DATA01  0x79
+                        MX6UL_PAD_LCD_DATA02__LCDIF_DATA02  0x79
+                        MX6UL_PAD_LCD_DATA03__LCDIF_DATA03  0x79
+                        MX6UL_PAD_LCD_DATA04__LCDIF_DATA04  0x79
+                        MX6UL_PAD_LCD_DATA05__LCDIF_DATA05  0x79
+                        MX6UL_PAD_LCD_DATA06__LCDIF_DATA06  0x79
+                        MX6UL_PAD_LCD_DATA07__LCDIF_DATA07  0x79
+                        MX6UL_PAD_LCD_DATA08__LCDIF_DATA08  0x79
+                        MX6UL_PAD_LCD_DATA09__LCDIF_DATA09  0x79
+                        MX6UL_PAD_LCD_DATA10__LCDIF_DATA10  0x79
+                        MX6UL_PAD_LCD_DATA11__LCDIF_DATA11  0x79
+                        MX6UL_PAD_LCD_DATA12__LCDIF_DATA12  0x79
+                        MX6UL_PAD_LCD_DATA13__LCDIF_DATA13  0x79
+                        MX6UL_PAD_LCD_DATA14__LCDIF_DATA14  0x79
+                        MX6UL_PAD_LCD_DATA15__LCDIF_DATA15  0x79
+                        MX6UL_PAD_LCD_DATA16__LCDIF_DATA16  0x79
+                        MX6UL_PAD_LCD_DATA17__LCDIF_DATA17  0x79
+                        MX6UL_PAD_LCD_DATA18__LCDIF_DATA18  0x79
+                        MX6UL_PAD_LCD_DATA19__LCDIF_DATA19  0x79
+                        MX6UL_PAD_LCD_DATA20__LCDIF_DATA20  0x79
+                        MX6UL_PAD_LCD_DATA21__LCDIF_DATA21  0x79
+                        MX6UL_PAD_LCD_DATA22__LCDIF_DATA22  0x79
+                        MX6UL_PAD_LCD_DATA23__LCDIF_DATA23  0x79
+                >;
+        };
+
+        pinctrl_lcdif_ctrl: lcdifctrlgrp {
+                fsl,pins = <
+                        MX6UL_PAD_LCD_CLK__LCDIF_CLK        0x79
+                        MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE  0x79
+                        MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC    0x79
+                        MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC    0x79
+                        /* used for lcd reset */
+                        MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09  0x79
+                >;
+        };
+
+        pinctrl_qspi: qspigrp {
+                fsl,pins = <
+                        MX6UL_PAD_NAND_WP_B__QSPI_A_SCLK        0x70a1
+                        MX6UL_PAD_NAND_READY_B__QSPI_A_DATA00   0x70a1
+                        MX6UL_PAD_NAND_CE0_B__QSPI_A_DATA01     0x70a1
+                        MX6UL_PAD_NAND_CE1_B__QSPI_A_DATA02     0x70a1
+                        MX6UL_PAD_NAND_CLE__QSPI_A_DATA03       0x70a1
+                        MX6UL_PAD_NAND_DQS__QSPI_A_SS0_B        0x70a1
+                >;
+        };
+
+        pinctrl_sai2: sai2grp {
+                fsl,pins = <
+                        MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK        0x17088
+                        MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC        0x17088
+                        MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA     0x11088
+                        MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA        0x11088
+                        MX6UL_PAD_JTAG_TMS__SAI2_MCLK           0x17088
+                        MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04      0x17059
+                >;
+        };
+
+        pinctrl_pwm1: pwm1grp {
+                fsl,pins = <
+                        MX6UL_PAD_GPIO1_IO08__PWM1_OUT   0x110b0
+                >;
+        };
+
+        pinctrl_sim2: sim2grp {
+                fsl,pins = <
+                        MX6UL_PAD_CSI_DATA03__SIM2_PORT1_PD             0xb808
+                        MX6UL_PAD_CSI_DATA04__SIM2_PORT1_CLK            0x31
+                        MX6UL_PAD_CSI_DATA05__SIM2_PORT1_RST_B          0xb808
+                        MX6UL_PAD_CSI_DATA06__SIM2_PORT1_SVEN           0xb808
+                        MX6UL_PAD_CSI_DATA07__SIM2_PORT1_TRXD           0xb809
+                        MX6UL_PAD_CSI_DATA02__GPIO4_IO23                0x3008
+                >;
+        };
+
+        pinctrl_tsc: tscgrp {
+                fsl,pins = <
+                        MX6UL_PAD_GPIO1_IO01__GPIO1_IO01                0xb0
+                        MX6UL_PAD_GPIO1_IO02__GPIO1_IO02                0xb0
+                        MX6UL_PAD_GPIO1_IO03__GPIO1_IO03                0xb0
+                        MX6UL_PAD_GPIO1_IO04__GPIO1_IO04                0xb0
+                >;
+        };
+
+        pinctrl_uart1: uart1grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
+                        MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
+                >;
+        };
+
+        pinctrl_uart2: uart2grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX   0x1b0b1
+                        MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX   0x1b0b1
+                        MX6UL_PAD_UART3_RX_DATA__UART2_DCE_RTS  0x1b0b1
+                        MX6UL_PAD_UART3_TX_DATA__UART2_DCE_CTS  0x1b0b1
+                >;
+        };
+
+        pinctrl_usdhc1: usdhc1grp {
+                fsl,pins = <
+                        MX6UL_PAD_SD1_CMD__USDHC1_CMD           0x17059
+                        MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x10059
+                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0       0x17059
+                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1       0x17059
+                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2       0x17059
+                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3       0x17059
+                        MX6UL_PAD_UART1_RTS_B__GPIO1_IO19       0x17059 /* SD1 CD */
+                        MX6UL_PAD_GPIO1_IO05__USDHC1_VSELECT    0x17059 /* SD1 VSELECT */
+                        MX6UL_PAD_GPIO1_IO09__GPIO1_IO09        0x17059 /* SD1 RESET */
+                >;
+        };
+
+        pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
+                fsl,pins = <
+                        MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x170b9
+                        MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x100b9
+                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170b9
+                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170b9
+                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170b9
+                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9
+
+                >;
+        };
+
+        pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
+                fsl,pins = <
+                        MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x170f9
+                        MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x100f9
+                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170f9
+                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170f9
+                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170f9
+                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9
+                >;
+        };
+
+        pinctrl_usdhc2: usdhc2grp {
+                fsl,pins = <
+                        MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x17059
+                        MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x17059
+                        MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
+                        MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
+                        MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
+                        MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
+                >;
+        };
+
+        pinctrl_wdog: wdoggrp {
+                fsl,pins = <
+                        MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY    0x30b0
+                >;
+        };
+};
diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts
index 571eea7f1c6b..d81d20f8fc8d 100644
--- a/arch/arm/boot/dts/imx6ul-geam.dts
+++ b/arch/arm/boot/dts/imx6ul-geam.dts
@@ -50,7 +50,7 @@
         model = "Engicam GEAM6UL Starter Kit";
         compatible = "engicam,imx6ul-geam", "fsl,imx6ul";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x08000000>;
         };
 
@@ -181,6 +181,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 clocks = <&clks IMX6UL_CLK_OSC>;
                 clock-names = "mclk";
                 VDDA-supply = <&reg_3p3v>;
diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi
index 950fb28b630a..921e12c69a00 100644
--- a/arch/arm/boot/dts/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi
@@ -45,7 +45,7 @@
 #include "imx6ul.dtsi"
 
 / {
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x20000000>;
         };
 
@@ -142,6 +142,7 @@
         sgtl5000: codec@a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
+                #sound-dai-cells = <0>;
                 clocks = <&clks IMX6UL_CLK_OSC>;
                 clock-names = "mclk";
                 VDDA-supply = <&reg_3p3v>;
diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi
index 039721d3dcb4..8f775f6974d1 100644
--- a/arch/arm/boot/dts/imx6ul-litesom.dtsi
+++ b/arch/arm/boot/dts/imx6ul-litesom.dtsi
@@ -47,7 +47,7 @@
         model = "Grinn i.MX6UL liteSOM";
         compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x20000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
index aec5ccce0321..a031bee311df 100644
--- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi
@@ -48,7 +48,7 @@
 #include "imx6ul.dtsi"
 
 / {
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0>; /* will be filled by U-Boot */
         };
 
diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
index 3bf26ebd4df9..47682b8c023c 100644
--- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
+++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
@@ -51,7 +51,7 @@
         model = "Technexion Pico i.MX6UL Board";
         compatible = "technexion,imx6ul-pico-hobbit", "fsl,imx6ul";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x10000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx6ul-pinfunc.h b/arch/arm/boot/dts/imx6ul-pinfunc.h
index 0034eeb84542..7b9a4dc38456 100644
--- a/arch/arm/boot/dts/imx6ul-pinfunc.h
+++ b/arch/arm/boot/dts/imx6ul-pinfunc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ * Copyright 2014 - 2015 Freescale Semiconductor, Inc.
  *
  * 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
@@ -34,14 +34,14 @@
 #define MX6UL_PAD_JTAG_MOD__ENET1_REF_CLK_25M           0x0044 0x02d0 0x0000 3 0
 #define MX6UL_PAD_JTAG_MOD__CCM_PMIC_RDY                0x0044 0x02d0 0x04c0 4 0
 #define MX6UL_PAD_JTAG_MOD__GPIO1_IO10                  0x0044 0x02d0 0x0000 5 0
-#define MX6UL_PAD_JTAG_MOD__SDMA_EXT_EVENT00            0x0044 0x02d0 0x0000 6 0
+#define MX6UL_PAD_JTAG_MOD__SDMA_EXT_EVENT00            0x0044 0x02d0 0x0610 6 0
 #define MX6UL_PAD_JTAG_TMS__SJC_TMS                     0x0048 0x02d4 0x0000 0 0
 #define MX6UL_PAD_JTAG_TMS__GPT2_CAPTURE1               0x0048 0x02d4 0x0598 1 0
-#define MX6UL_PAD_JTAG_TMS__SAI2_MCLK                   0x0048 0x02d4 0x0000 2 0
+#define MX6UL_PAD_JTAG_TMS__SAI2_MCLK                   0x0048 0x02d4 0x05f0 2 0
 #define MX6UL_PAD_JTAG_TMS__CCM_CLKO1                   0x0048 0x02d4 0x0000 3 0
 #define MX6UL_PAD_JTAG_TMS__CCM_WAIT                    0x0048 0x02d4 0x0000 4 0
 #define MX6UL_PAD_JTAG_TMS__GPIO1_IO11                  0x0048 0x02d4 0x0000 5 0
-#define MX6UL_PAD_JTAG_TMS__SDMA_EXT_EVENT01            0x0048 0x02d4 0x0000 6 0
+#define MX6UL_PAD_JTAG_TMS__SDMA_EXT_EVENT01            0x0048 0x02d4 0x0614 6 0
 #define MX6UL_PAD_JTAG_TMS__EPIT1_OUT                   0x0048 0x02d4 0x0000 8 0
 #define MX6UL_PAD_JTAG_TDO__SJC_TDO                     0x004c 0x02d8 0x0000 0 0
 #define MX6UL_PAD_JTAG_TDO__GPT2_CAPTURE2               0x004c 0x02d8 0x059c 1 0
@@ -63,12 +63,14 @@
 #define MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA                0x0054 0x02e0 0x05f4 2 0
 #define MX6UL_PAD_JTAG_TCK__PWM7_OUT                    0x0054 0x02e0 0x0000 4 0
 #define MX6UL_PAD_JTAG_TCK__GPIO1_IO14                  0x0054 0x02e0 0x0000 5 0
+#define MX6UL_PAD_JTAG_TCK__OSC32K_32K_OUT                      0x0054 0x02e0 0x0000 6 0
 #define MX6UL_PAD_JTAG_TCK__SIM2_POWER_FAIL             0x0054 0x02e0 0x0000 8 0
 #define MX6UL_PAD_JTAG_TRST_B__SJC_TRSTB                0x0058 0x02e4 0x0000 0 0
 #define MX6UL_PAD_JTAG_TRST_B__GPT2_COMPARE3            0x0058 0x02e4 0x0000 1 0
 #define MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA             0x0058 0x02e4 0x0000 2 0
 #define MX6UL_PAD_JTAG_TRST_B__PWM8_OUT                 0x0058 0x02e4 0x0000 4 0
 #define MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15               0x0058 0x02e4 0x0000 5 0
+#define MX6UL_PAD_JTAG_TRST_B__REF_CLK_24M              0x0058 0x02e4 0x0000 6 0
 #define MX6UL_PAD_JTAG_TRST_B__CAAM_RNG_OSC_OBS         0x0058 0x02e4 0x0000 8 0
 #define MX6UL_PAD_GPIO1_IO00__I2C2_SCL                  0x005c 0x02e8 0x05ac 0 1
 #define MX6UL_PAD_GPIO1_IO00__GPT1_CAPTURE1             0x005c 0x02e8 0x058c 1 0
@@ -94,22 +96,24 @@
 #define MX6UL_PAD_GPIO1_IO02__ENET1_REF_CLK_25M         0x0064 0x02f0 0x0000 3 0
 #define MX6UL_PAD_GPIO1_IO02__USDHC1_WP                 0x0064 0x02f0 0x066c 4 0
 #define MX6UL_PAD_GPIO1_IO02__GPIO1_IO02                0x0064 0x02f0 0x0000 5 0
-#define MX6UL_PAD_GPIO1_IO02__SDMA_EXT_EVENT00          0x0064 0x02f0 0x0000 6 0
+#define MX6UL_PAD_GPIO1_IO02__SDMA_EXT_EVENT00          0x0064 0x02f0 0x0610 6 1
 #define MX6UL_PAD_GPIO1_IO02__SRC_ANY_PU_RESET          0x0064 0x02f0 0x0000 7 0
 #define MX6UL_PAD_GPIO1_IO02__UART1_DCE_TX              0x0064 0x02f0 0x0000 8 0
 #define MX6UL_PAD_GPIO1_IO02__UART1_DTE_RX              0x0064 0x02f0 0x0624 8 0
 #define MX6UL_PAD_GPIO1_IO03__I2C1_SDA                  0x0068 0x02f4 0x05a8 0 1
 #define MX6UL_PAD_GPIO1_IO03__GPT1_COMPARE3             0x0068 0x02f4 0x0000 1 0
 #define MX6UL_PAD_GPIO1_IO03__USB_OTG2_OC               0x0068 0x02f4 0x0660 2 0
+#define MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT            0x0068 0x02f4 0x0000 3 0
 #define MX6UL_PAD_GPIO1_IO03__USDHC1_CD_B               0x0068 0x02f4 0x0668 4 0
 #define MX6UL_PAD_GPIO1_IO03__GPIO1_IO03                0x0068 0x02f4 0x0000 5 0
-#define MX6UL_PAD_GPIO1_IO03__CCM_DI0_eXT_CLK           0x0068 0x02f4 0x0000 6 0
+#define MX6UL_PAD_GPIO1_IO03__CCM_DI0_EXT_CLK           0x0068 0x02f4 0x0000 6 0
 #define MX6UL_PAD_GPIO1_IO03__SRC_TESTER_ACK            0x0068 0x02f4 0x0000 7 0
-#define MX6UL_PAD_GPIO1_IO03__UART1_DTE_TX              0x0068 0x02f4 0x0000 8 0
 #define MX6UL_PAD_GPIO1_IO03__UART1_DCE_RX              0x0068 0x02f4 0x0624 8 1
+#define MX6UL_PAD_GPIO1_IO03__UART1_DTE_TX              0x0068 0x02f4 0x0000 8 0
 #define MX6UL_PAD_GPIO1_IO04__ENET1_REF_CLK1            0x006c 0x02f8 0x0574 0 1
 #define MX6UL_PAD_GPIO1_IO04__PWM3_OUT                  0x006c 0x02f8 0x0000 1 0
 #define MX6UL_PAD_GPIO1_IO04__USB_OTG1_PWR              0x006c 0x02f8 0x0000 2 0
+#define MX6UL_PAD_GPIO1_IO04__REF_CLK_24M               0x006c 0x02f8 0x0000 3 0
 #define MX6UL_PAD_GPIO1_IO04__USDHC1_RESET_B            0x006c 0x02f8 0x0000 4 0
 #define MX6UL_PAD_GPIO1_IO04__GPIO1_IO04                0x006c 0x02f8 0x0000 5 0
 #define MX6UL_PAD_GPIO1_IO04__ENET2_1588_EVENT0_IN      0x006c 0x02f8 0x0000 6 0
@@ -200,7 +204,7 @@
 #define MX6UL_PAD_UART2_TX_DATA__CSI_DATA06             0x0094 0x0320 0x04dc 3 0
 #define MX6UL_PAD_UART2_TX_DATA__GPT1_CAPTURE1          0x0094 0x0320 0x058c 4 1
 #define MX6UL_PAD_UART2_TX_DATA__GPIO1_IO20             0x0094 0x0320 0x0000 5 0
-#define MX6UL_PAD_UART2_TX_DATA__ECSPI3_SS0             0x0094 0x0320 0x0000 8 0
+#define MX6UL_PAD_UART2_TX_DATA__ECSPI3_SS0             0x0094 0x0320 0x0560 8 0
 #define MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX           0x0098 0x0324 0x062c 0 1
 #define MX6UL_PAD_UART2_RX_DATA__UART2_DTE_TX           0x0098 0x0324 0x0000 0 0
 #define MX6UL_PAD_UART2_RX_DATA__ENET1_TDATA03          0x0098 0x0324 0x0000 1 0
@@ -232,7 +236,7 @@
 #define MX6UL_PAD_UART3_TX_DATA__UART3_DTE_RX           0x00a4 0x0330 0x0634 0 0
 #define MX6UL_PAD_UART3_TX_DATA__ENET2_RDATA02          0x00a4 0x0330 0x0000 1 0
 #define MX6UL_PAD_UART3_TX_DATA__SIM1_PORT0_PD          0x00a4 0x0330 0x0000 2 0
-#define MX6UL_PAD_UART3_TX_DATA__CSI_DATA01             0x00a4 0x0330 0x0000 3 0
+#define MX6UL_PAD_UART3_TX_DATA__CSI_DATA01             0x00a4 0x0330 0x04d4 3 0
 #define MX6UL_PAD_UART3_TX_DATA__UART2_DCE_CTS          0x00a4 0x0330 0x0000 4 0
 #define MX6UL_PAD_UART3_TX_DATA__UART2_DTE_RTS          0x00a4 0x0330 0x0628 4 2
 #define MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24             0x00a4 0x0330 0x0000 5 0
@@ -242,7 +246,7 @@
 #define MX6UL_PAD_UART3_RX_DATA__UART3_DTE_TX           0x00a8 0x0334 0x0000 0 0
 #define MX6UL_PAD_UART3_RX_DATA__ENET2_RDATA03          0x00a8 0x0334 0x0000 1 0
 #define MX6UL_PAD_UART3_RX_DATA__SIM2_PORT0_PD          0x00a8 0x0334 0x0000 2 0
-#define MX6UL_PAD_UART3_RX_DATA__CSI_DATA00             0x00a8 0x0334 0x0000 3 0
+#define MX6UL_PAD_UART3_RX_DATA__CSI_DATA00             0x00a8 0x0334 0x04d0 3 0
 #define MX6UL_PAD_UART3_RX_DATA__UART2_DCE_RTS          0x00a8 0x0334 0x0628 4 3
 #define MX6UL_PAD_UART3_RX_DATA__UART2_DTE_CTS          0x00a8 0x0334 0x0000 4 0
 #define MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25             0x00a8 0x0334 0x0000 5 0
@@ -251,7 +255,7 @@
 #define MX6UL_PAD_UART3_CTS_B__UART3_DTE_RTS            0x00ac 0x0338 0x0630 0 0
 #define MX6UL_PAD_UART3_CTS_B__ENET2_RX_CLK             0x00ac 0x0338 0x0000 1 0
 #define MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX              0x00ac 0x0338 0x0000 2 0
-#define MX6UL_PAD_UART3_CTS_B__CSI_DATA10               0x00ac 0x0338 0x0000 3 0
+#define MX6UL_PAD_UART3_CTS_B__CSI_DATA10               0x00ac 0x0338 0x04ec 3 0
 #define MX6UL_PAD_UART3_CTS_B__ENET1_1588_EVENT1_IN     0x00ac 0x0338 0x0000 4 0
 #define MX6UL_PAD_UART3_CTS_B__GPIO1_IO26               0x00ac 0x0338 0x0000 5 0
 #define MX6UL_PAD_UART3_CTS_B__EPIT2_OUT                0x00ac 0x0338 0x0000 8 0
@@ -259,7 +263,7 @@
 #define MX6UL_PAD_UART3_RTS_B__UART3_DTE_CTS            0x00b0 0x033c 0x0000 0 0
 #define MX6UL_PAD_UART3_RTS_B__ENET2_TX_ER              0x00b0 0x033c 0x0000 1 0
 #define MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX              0x00b0 0x033c 0x0584 2 0
-#define MX6UL_PAD_UART3_RTS_B__CSI_DATA11               0x00b0 0x033c 0x0000 3 0
+#define MX6UL_PAD_UART3_RTS_B__CSI_DATA11               0x00b0 0x033c 0x04f0 3 0
 #define MX6UL_PAD_UART3_RTS_B__ENET1_1588_EVENT1_OUT    0x00b0 0x033c 0x0000 4 0
 #define MX6UL_PAD_UART3_RTS_B__GPIO1_IO27               0x00b0 0x033c 0x0000 5 0
 #define MX6UL_PAD_UART3_RTS_B__WDOG1_WDOG_B             0x00b0 0x033c 0x0000 8 0
@@ -267,7 +271,7 @@
 #define MX6UL_PAD_UART4_TX_DATA__UART4_DTE_RX           0x00b4 0x0340 0x063c 0 0
 #define MX6UL_PAD_UART4_TX_DATA__ENET2_TDATA02          0x00b4 0x0340 0x0000 1 0
 #define MX6UL_PAD_UART4_TX_DATA__I2C1_SCL               0x00b4 0x0340 0x05a4 2 1
-#define MX6UL_PAD_UART4_TX_DATA__CSI_DATA12             0x00b4 0x0340 0x0000 3 0
+#define MX6UL_PAD_UART4_TX_DATA__CSI_DATA12             0x00b4 0x0340 0x04f4 3 0
 #define MX6UL_PAD_UART4_TX_DATA__CSU_CSU_ALARM_AUT02    0x00b4 0x0340 0x0000 4 0
 #define MX6UL_PAD_UART4_TX_DATA__GPIO1_IO28             0x00b4 0x0340 0x0000 5 0
 #define MX6UL_PAD_UART4_TX_DATA__ECSPI2_SCLK            0x00b4 0x0340 0x0544 8 1
@@ -275,23 +279,23 @@
 #define MX6UL_PAD_UART4_RX_DATA__UART4_DTE_TX           0x00b8 0x0344 0x0000 0 0
 #define MX6UL_PAD_UART4_RX_DATA__ENET2_TDATA03          0x00b8 0x0344 0x0000 1 0
 #define MX6UL_PAD_UART4_RX_DATA__I2C1_SDA               0x00b8 0x0344 0x05a8 2 2
-#define MX6UL_PAD_UART4_RX_DATA__CSI_DATA13             0x00b8 0x0344 0x0000 3 0
+#define MX6UL_PAD_UART4_RX_DATA__CSI_DATA13             0x00b8 0x0344 0x04f8 3 0
 #define MX6UL_PAD_UART4_RX_DATA__CSU_CSU_ALARM_AUT01    0x00b8 0x0344 0x0000 4 0
 #define MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29             0x00b8 0x0344 0x0000 5 0
-#define MX6UL_PAD_UART4_RX_DATA__ECSPI2_SS0             0x00b8 0x0344 0x0000 8 0
+#define MX6UL_PAD_UART4_RX_DATA__ECSPI2_SS0             0x00b8 0x0344 0x0550 8 1
 #define MX6UL_PAD_UART5_TX_DATA__GPIO1_IO30             0x00bc 0x0348 0x0000 5 0
 #define MX6UL_PAD_UART5_TX_DATA__ECSPI2_MOSI            0x00bc 0x0348 0x054c 8 0
 #define MX6UL_PAD_UART5_TX_DATA__UART5_DCE_TX           0x00bc 0x0348 0x0000 0 0
 #define MX6UL_PAD_UART5_TX_DATA__UART5_DTE_RX           0x00bc 0x0348 0x0644 0 4
 #define MX6UL_PAD_UART5_TX_DATA__ENET2_CRS              0x00bc 0x0348 0x0000 1 0
 #define MX6UL_PAD_UART5_TX_DATA__I2C2_SCL               0x00bc 0x0348 0x05ac 2 2
-#define MX6UL_PAD_UART5_TX_DATA__CSI_DATA14             0x00bc 0x0348 0x0000 3 0
+#define MX6UL_PAD_UART5_TX_DATA__CSI_DATA14             0x00bc 0x0348 0x04fc 3 0
 #define MX6UL_PAD_UART5_TX_DATA__CSU_CSU_ALARM_AUT00    0x00bc 0x0348 0x0000 4 0
 #define MX6UL_PAD_UART5_RX_DATA__UART5_DCE_RX           0x00c0 0x034c 0x0644 0 5
 #define MX6UL_PAD_UART5_RX_DATA__UART5_DTE_TX           0x00c0 0x034c 0x0000 0 0
 #define MX6UL_PAD_UART5_RX_DATA__ENET2_COL              0x00c0 0x034c 0x0000 1 0
 #define MX6UL_PAD_UART5_RX_DATA__I2C2_SDA               0x00c0 0x034c 0x05b0 2 2
-#define MX6UL_PAD_UART5_RX_DATA__CSI_DATA15             0x00c0 0x034c 0x0000 3 0
+#define MX6UL_PAD_UART5_RX_DATA__CSI_DATA15             0x00c0 0x034c 0x0500 3 0
 #define MX6UL_PAD_UART5_RX_DATA__CSU_CSU_INT_DEB        0x00c0 0x034c 0x0000 4 0
 #define MX6UL_PAD_UART5_RX_DATA__GPIO1_IO31             0x00c0 0x034c 0x0000 5 0
 #define MX6UL_PAD_UART5_RX_DATA__ECSPI2_MISO            0x00c0 0x034c 0x0548 8 1
@@ -299,59 +303,61 @@
 #define MX6UL_PAD_ENET1_RX_DATA0__UART4_DCE_RTS         0x00c4 0x0350 0x0638 1 0
 #define MX6UL_PAD_ENET1_RX_DATA0__UART4_DTE_CTS         0x00c4 0x0350 0x0000 1 0
 #define MX6UL_PAD_ENET1_RX_DATA0__PWM1_OUT              0x00c4 0x0350 0x0000 2 0
-#define MX6UL_PAD_ENET1_RX_DATA0__CSI_DATA16            0x00c4 0x0350 0x0000 3 0
+#define MX6UL_PAD_ENET1_RX_DATA0__CSI_DATA16            0x00c4 0x0350 0x0504 3 0
 #define MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX           0x00c4 0x0350 0x0000 4 0
 #define MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00            0x00c4 0x0350 0x0000 5 0
-#define MX6UL_PAD_ENET1_RX_DATA0__KPP_ROW00             0x00c4 0x0350 0x0000 6 0
+#define MX6UL_PAD_ENET1_RX_DATA0__KPP_ROW00             0x00c4 0x0350 0x05d0 6 0
 #define MX6UL_PAD_ENET1_RX_DATA0__USDHC1_LCTL           0x00c4 0x0350 0x0000 8 0
 #define MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01         0x00c8 0x0354 0x0000 0 0
 #define MX6UL_PAD_ENET1_RX_DATA1__UART4_DCE_CTS         0x00c8 0x0354 0x0000 1 0
 #define MX6UL_PAD_ENET1_RX_DATA1__UART4_DTE_RTS         0x00c8 0x0354 0x0638 1 1
 #define MX6UL_PAD_ENET1_RX_DATA1__PWM2_OUT              0x00c8 0x0354 0x0000 2 0
-#define MX6UL_PAD_ENET1_RX_DATA1__CSI_DATA17            0x00c8 0x0354 0x0000 3 0
+#define MX6UL_PAD_ENET1_RX_DATA1__CSI_DATA17            0x00c8 0x0354 0x0508 3 0
 #define MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX           0x00c8 0x0354 0x0584 4 1
 #define MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01            0x00c8 0x0354 0x0000 5 0
-#define MX6UL_PAD_ENET1_RX_DATA1__KPP_COL00             0x00c8 0x0354 0x0000 6 0
+#define MX6UL_PAD_ENET1_RX_DATA1__KPP_COL00             0x00c8 0x0354 0x05c4 6 0
 #define MX6UL_PAD_ENET1_RX_DATA1__USDHC2_LCTL           0x00c8 0x0354 0x0000 8 0
 #define MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN              0x00cc 0x0358 0x0000 0 0
 #define MX6UL_PAD_ENET1_RX_EN__UART5_DCE_RTS            0x00cc 0x0358 0x0640 1 3
 #define MX6UL_PAD_ENET1_RX_EN__UART5_DTE_CTS            0x00cc 0x0358 0x0000 1 0
-#define MX6UL_PAD_ENET1_RX_EN__CSI_DATA18               0x00cc 0x0358 0x0000 3 0
+#define MX6UL_PAD_ENET1_RX_EN__OSC32K_32K_OUT           0x00cc 0x0358 0x0000 2 0
+#define MX6UL_PAD_ENET1_RX_EN__CSI_DATA18               0x00cc 0x0358 0x050c 3 0
 #define MX6UL_PAD_ENET1_RX_EN__FLEXCAN2_TX              0x00cc 0x0358 0x0000 4 0
 #define MX6UL_PAD_ENET1_RX_EN__GPIO2_IO02               0x00cc 0x0358 0x0000 5 0
-#define MX6UL_PAD_ENET1_RX_EN__KPP_ROW01                0x00cc 0x0358 0x0000 6 0
+#define MX6UL_PAD_ENET1_RX_EN__KPP_ROW01                0x00cc 0x0358 0x05d4 6 0
 #define MX6UL_PAD_ENET1_RX_EN__USDHC1_VSELECT           0x00cc 0x0358 0x0000 8 0
 #define MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00         0x00d0 0x035c 0x0000 0 0
 #define MX6UL_PAD_ENET1_TX_DATA0__UART5_DCE_CTS         0x00d0 0x035c 0x0000 1 0
 #define MX6UL_PAD_ENET1_TX_DATA0__UART5_DTE_RTS         0x00d0 0x035c 0x0640 1 4
-#define MX6UL_PAD_ENET1_TX_DATA0__CSI_DATA19            0x00d0 0x035c 0x0000 3 0
+#define MX6UL_PAD_ENET1_TX_DATA0__REF_CLK_24M           0x00d0 0x035c 0x0000 2 0
+#define MX6UL_PAD_ENET1_TX_DATA0__CSI_DATA19            0x00d0 0x035c 0x0510 3 0
 #define MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX           0x00d0 0x035c 0x0588 4 1
 #define MX6UL_PAD_ENET1_TX_DATA0__GPIO2_IO03            0x00d0 0x035c 0x0000 5 0
-#define MX6UL_PAD_ENET1_TX_DATA0__KPP_COL01             0x00d0 0x035c 0x0000 6 0
+#define MX6UL_PAD_ENET1_TX_DATA0__KPP_COL01             0x00d0 0x035c 0x05c8 6 0
 #define MX6UL_PAD_ENET1_TX_DATA0__USDHC2_VSELECT        0x00d0 0x035c 0x0000 8 0
 #define MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01         0x00d4 0x0360 0x0000 0 0
 #define MX6UL_PAD_ENET1_TX_DATA1__UART6_DCE_CTS         0x00d4 0x0360 0x0000 1 0
 #define MX6UL_PAD_ENET1_TX_DATA1__UART6_DTE_RTS         0x00d4 0x0360 0x0648 1 2
 #define MX6UL_PAD_ENET1_TX_DATA1__PWM5_OUT              0x00d4 0x0360 0x0000 2 0
-#define MX6UL_PAD_ENET1_TX_DATA1__CSI_DATA20            0x00d4 0x0360 0x0000 3 0
+#define MX6UL_PAD_ENET1_TX_DATA1__CSI_DATA20            0x00d4 0x0360 0x0514 3 0
 #define MX6UL_PAD_ENET1_TX_DATA1__ENET2_MDIO            0x00d4 0x0360 0x0580 4 1
 #define MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04            0x00d4 0x0360 0x0000 5 0
-#define MX6UL_PAD_ENET1_TX_DATA1__KPP_ROW02             0x00d4 0x0360 0x0000 6 0
+#define MX6UL_PAD_ENET1_TX_DATA1__KPP_ROW02             0x00d4 0x0360 0x05d8 6 0
 #define MX6UL_PAD_ENET1_TX_DATA1__WDOG1_WDOG_RST_B_DEB  0x00d4 0x0360 0x0000 8 0
 #define MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN              0x00d8 0x0364 0x0000 0 0
 #define MX6UL_PAD_ENET1_TX_EN__UART6_DCE_RTS            0x00d8 0x0364 0x0648 1 3
 #define MX6UL_PAD_ENET1_TX_EN__UART6_DTE_CTS            0x00d8 0x0364 0x0000 1 0
 #define MX6UL_PAD_ENET1_TX_EN__PWM6_OUT                 0x00d8 0x0364 0x0000 2 0
-#define MX6UL_PAD_ENET1_TX_EN__CSI_DATA21               0x00d8 0x0364 0x0000 3 0
+#define MX6UL_PAD_ENET1_TX_EN__CSI_DATA21               0x00d8 0x0364 0x0518 3 0
 #define MX6UL_PAD_ENET1_TX_EN__ENET2_MDC                0x00d8 0x0364 0x0000 4 0
 #define MX6UL_PAD_ENET1_TX_EN__GPIO2_IO05               0x00d8 0x0364 0x0000 5 0
-#define MX6UL_PAD_ENET1_TX_EN__KPP_COL02                0x00d8 0x0364 0x0000 6 0
+#define MX6UL_PAD_ENET1_TX_EN__KPP_COL02                0x00d8 0x0364 0x05cc 6 0
 #define MX6UL_PAD_ENET1_TX_EN__WDOG2_WDOG_RST_B_DEB     0x00d8 0x0364 0x0000 8 0
 #define MX6UL_PAD_ENET1_TX_CLK__ENET1_TX_CLK            0x00dc 0x0368 0x0000 0 0
 #define MX6UL_PAD_ENET1_TX_CLK__UART7_DCE_CTS           0x00dc 0x0368 0x0000 1 0
 #define MX6UL_PAD_ENET1_TX_CLK__UART7_DTE_RTS           0x00dc 0x0368 0x0650 1 0
 #define MX6UL_PAD_ENET1_TX_CLK__PWM7_OUT                0x00dc 0x0368 0x0000 2 0
-#define MX6UL_PAD_ENET1_TX_CLK__CSI_DATA22              0x00dc 0x0368 0x0000 3 0
+#define MX6UL_PAD_ENET1_TX_CLK__CSI_DATA22              0x00dc 0x0368 0x051c 3 0
 #define MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1          0x00dc 0x0368 0x0574 4 2
 #define MX6UL_PAD_ENET1_TX_CLK__GPIO2_IO06              0x00dc 0x0368 0x0000 5 0
 #define MX6UL_PAD_ENET1_TX_CLK__KPP_ROW03               0x00dc 0x0368 0x0000 6 0
@@ -360,7 +366,7 @@
 #define MX6UL_PAD_ENET1_RX_ER__UART7_DCE_RTS            0x00e0 0x036c 0x0650 1 1
 #define MX6UL_PAD_ENET1_RX_ER__UART7_DTE_CTS            0x00e0 0x036c 0x0000 1 0
 #define MX6UL_PAD_ENET1_RX_ER__PWM8_OUT                 0x00e0 0x036c 0x0000 2 0
-#define MX6UL_PAD_ENET1_RX_ER__CSI_DATA23               0x00e0 0x036c 0x0000 3 0
+#define MX6UL_PAD_ENET1_RX_ER__CSI_DATA23               0x00e0 0x036c 0x0520 3 0
 #define MX6UL_PAD_ENET1_RX_ER__EIM_CRE                  0x00e0 0x036c 0x0000 4 0
 #define MX6UL_PAD_ENET1_RX_ER__GPIO2_IO07               0x00e0 0x036c 0x0000 5 0
 #define MX6UL_PAD_ENET1_RX_ER__KPP_COL03                0x00e0 0x036c 0x0000 6 0
@@ -377,7 +383,7 @@
 #define MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01         0x00e8 0x0374 0x0000 0 0
 #define MX6UL_PAD_ENET2_RX_DATA1__UART6_DCE_RX          0x00e8 0x0374 0x064c 1 2
 #define MX6UL_PAD_ENET2_RX_DATA1__UART6_DTE_TX          0x00e8 0x0374 0x0000 1 0
-#define MX6UL_PAD_ENET2_RX_DATA1__SIM1_PORT0_cLK        0x00e8 0x0374 0x0000 2 0
+#define MX6UL_PAD_ENET2_RX_DATA1__SIM1_PORT0_CLK        0x00e8 0x0374 0x0000 2 0
 #define MX6UL_PAD_ENET2_RX_DATA1__I2C3_SDA              0x00e8 0x0374 0x05b8 3 1
 #define MX6UL_PAD_ENET2_RX_DATA1__ENET1_MDC             0x00e8 0x0374 0x0000 4 0
 #define MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09            0x00e8 0x0374 0x0000 5 0
@@ -400,6 +406,7 @@
 #define MX6UL_PAD_ENET2_TX_DATA0__EIM_EB_B02            0x00f0 0x037c 0x0000 4 0
 #define MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11            0x00f0 0x037c 0x0000 5 0
 #define MX6UL_PAD_ENET2_TX_DATA0__KPP_COL05             0x00f0 0x037c 0x0000 6 0
+#define MX6UL_PAD_ENET2_TX_DATA0__REF_CLK_24M           0x00f0 0x037c 0x0000 8 0
 #define MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01         0x00f4 0x0380 0x0000 0 0
 #define MX6UL_PAD_ENET2_TX_DATA1__UART8_DCE_TX          0x00f4 0x0380 0x0000 1 0
 #define MX6UL_PAD_ENET2_TX_DATA1__UART8_DTE_RX          0x00f4 0x0380 0x065c 1 0
@@ -412,7 +419,7 @@
 #define MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN              0x00f8 0x0384 0x0000 0 0
 #define MX6UL_PAD_ENET2_TX_EN__UART8_DCE_RX             0x00f8 0x0384 0x065c 1 1
 #define MX6UL_PAD_ENET2_TX_EN__UART8_DTE_TX             0x00f8 0x0384 0x0000 1 0
-#define MX6UL_PAD_ENET2_TX_EN__SIM2_PORT0_cLK           0x00f8 0x0384 0x0000 2 0
+#define MX6UL_PAD_ENET2_TX_EN__SIM2_PORT0_CLK           0x00f8 0x0384 0x0000 2 0
 #define MX6UL_PAD_ENET2_TX_EN__ECSPI4_MOSI              0x00f8 0x0384 0x056c 3 0
 #define MX6UL_PAD_ENET2_TX_EN__EIM_ACLK_FREERUN         0x00f8 0x0384 0x0000 4 0
 #define MX6UL_PAD_ENET2_TX_EN__GPIO2_IO13               0x00f8 0x0384 0x0000 5 0
@@ -431,7 +438,7 @@
 #define MX6UL_PAD_ENET2_RX_ER__UART8_DCE_RTS            0x0100 0x038c 0x0658 1 1
 #define MX6UL_PAD_ENET2_RX_ER__UART8_DTE_CTS            0x0100 0x038c 0x0000 1 0
 #define MX6UL_PAD_ENET2_RX_ER__SIM2_PORT0_SVEN          0x0100 0x038c 0x0000 2 0
-#define MX6UL_PAD_ENET2_RX_ER__ECSPI4_SS0               0x0100 0x038c 0x0000 3 0
+#define MX6UL_PAD_ENET2_RX_ER__ECSPI4_SS0               0x0100 0x038c 0x0570 3 0
 #define MX6UL_PAD_ENET2_RX_ER__EIM_ADDR25               0x0100 0x038c 0x0000 4 0
 #define MX6UL_PAD_ENET2_RX_ER__GPIO2_IO15               0x0100 0x038c 0x0000 5 0
 #define MX6UL_PAD_ENET2_RX_ER__KPP_COL07                0x0100 0x038c 0x0000 6 0
@@ -440,7 +447,7 @@
 #define MX6UL_PAD_LCD_CLK__LCDIF_WR_RWN                 0x0104 0x0390 0x0000 1 0
 #define MX6UL_PAD_LCD_CLK__UART4_DCE_TX                 0x0104 0x0390 0x0000 2 0
 #define MX6UL_PAD_LCD_CLK__UART4_DTE_RX                 0x0104 0x0390 0x063c 2 2
-#define MX6UL_PAD_LCD_CLK__SAI3_MCLK                    0x0104 0x0390 0x0000 3 0
+#define MX6UL_PAD_LCD_CLK__SAI3_MCLK                    0x0104 0x0390 0x0600 3 0
 #define MX6UL_PAD_LCD_CLK__EIM_CS2_B                    0x0104 0x0390 0x0000 4 0
 #define MX6UL_PAD_LCD_CLK__GPIO3_IO00                   0x0104 0x0390 0x0000 5 0
 #define MX6UL_PAD_LCD_CLK__WDOG1_WDOG_RST_B_DEB         0x0104 0x0390 0x0000 8 0
@@ -464,7 +471,7 @@
 #define MX6UL_PAD_LCD_VSYNC__LCDIF_BUSY                 0x0110 0x039c 0x05dc 1 1
 #define MX6UL_PAD_LCD_VSYNC__UART4_DCE_RTS              0x0110 0x039c 0x0638 2 3
 #define MX6UL_PAD_LCD_VSYNC__UART4_DTE_CTS              0x0110 0x039c 0x0000 2 0
-#define MX6UL_PAD_LCD_VSYNC__SAI3_RX_DATA               0x0110 0x039c 0x0000 3 0
+#define MX6UL_PAD_LCD_VSYNC__SAI3_RX_DATA               0x0110 0x039c 0x0604 3 0
 #define MX6UL_PAD_LCD_VSYNC__WDOG2_WDOG_B               0x0110 0x039c 0x0000 4 0
 #define MX6UL_PAD_LCD_VSYNC__GPIO3_IO03                 0x0110 0x039c 0x0000 5 0
 #define MX6UL_PAD_LCD_VSYNC__ECSPI2_SS2                 0x0110 0x039c 0x0000 8 0
@@ -477,13 +484,15 @@
 #define MX6UL_PAD_LCD_RESET__ECSPI2_SS3                 0x0114 0x03a0 0x0000 8 0
 #define MX6UL_PAD_LCD_DATA00__LCDIF_DATA00              0x0118 0x03a4 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA00__PWM1_OUT                  0x0118 0x03a4 0x0000 1 0
+#define MX6UL_PAD_LCD_DATA00__CA7_MX6UL_TRACE0          0x0118 0x03a4 0x0000 2 0
 #define MX6UL_PAD_LCD_DATA00__ENET1_1588_EVENT2_IN      0x0118 0x03a4 0x0000 3 0
 #define MX6UL_PAD_LCD_DATA00__I2C3_SDA                  0x0118 0x03a4 0x05b8 4 2
 #define MX6UL_PAD_LCD_DATA00__GPIO3_IO05                0x0118 0x03a4 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA00__SRC_BT_CFG00              0x0118 0x03a4 0x0000 6 0
-#define MX6UL_PAD_LCD_DATA00__SAI1_MCLK                 0x0118 0x03a4 0x0000 8 0
+#define MX6UL_PAD_LCD_DATA00__SAI1_MCLK                 0x0118 0x03a4 0x05e0 8 1
 #define MX6UL_PAD_LCD_DATA01__LCDIF_DATA01              0x011c 0x03a8 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA01__PWM2_OUT                  0x011c 0x03a8 0x0000 1 0
+#define MX6UL_PAD_LCD_DATA01__CA7_MX6UL_TRACE1          0x011c 0x03a8 0x0000 2 0
 #define MX6UL_PAD_LCD_DATA01__ENET1_1588_EVENT2_OUT     0x011c 0x03a8 0x0000 3 0
 #define MX6UL_PAD_LCD_DATA01__I2C3_SCL                  0x011c 0x03a8 0x05b4 4 2
 #define MX6UL_PAD_LCD_DATA01__GPIO3_IO06                0x011c 0x03a8 0x0000 5 0
@@ -491,6 +500,7 @@
 #define MX6UL_PAD_LCD_DATA01__SAI1_TX_SYNC              0x011c 0x03a8 0x05ec 8 0
 #define MX6UL_PAD_LCD_DATA02__LCDIF_DATA02              0x0120 0x03ac 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA02__PWM3_OUT                  0x0120 0x03ac 0x0000 1 0
+#define MX6UL_PAD_LCD_DATA02__CA7_MX6UL_TRACE2          0x0120 0x03ac 0x0000 2 0
 #define MX6UL_PAD_LCD_DATA02__ENET1_1588_EVENT3_IN      0x0120 0x03ac 0x0000 3 0
 #define MX6UL_PAD_LCD_DATA02__I2C4_SDA                  0x0120 0x03ac 0x05c0 4 2
 #define MX6UL_PAD_LCD_DATA02__GPIO3_IO07                0x0120 0x03ac 0x0000 5 0
@@ -498,14 +508,16 @@
 #define MX6UL_PAD_LCD_DATA02__SAI1_TX_BCLK              0x0120 0x03ac 0x05e8 8 0
 #define MX6UL_PAD_LCD_DATA03__LCDIF_DATA03              0x0124 0x03b0 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA03__PWM4_OUT                  0x0124 0x03b0 0x0000 1 0
+#define MX6UL_PAD_LCD_DATA03__CA7_MX6UL_TRACE3          0x0124 0x03b0 0x0000 2 0
 #define MX6UL_PAD_LCD_DATA03__ENET1_1588_EVENT3_OUT     0x0124 0x03b0 0x0000 3 0
 #define MX6UL_PAD_LCD_DATA03__I2C4_SCL                  0x0124 0x03b0 0x05bc 4 2
 #define MX6UL_PAD_LCD_DATA03__GPIO3_IO08                0x0124 0x03b0 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA03__SRC_BT_CFG03              0x0124 0x03b0 0x0000 6 0
-#define MX6UL_PAD_LCD_DATA03__SAI1_RX_DATA              0x0124 0x03b0 0x0000 8 0
+#define MX6UL_PAD_LCD_DATA03__SAI1_RX_DATA              0x0124 0x03b0 0x05e4 8 0
 #define MX6UL_PAD_LCD_DATA04__LCDIF_DATA04              0x0128 0x03b4 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA04__UART8_DCE_CTS             0x0128 0x03b4 0x0000 1 0
 #define MX6UL_PAD_LCD_DATA04__UART8_DTE_RTS             0x0128 0x03b4 0x0658 1 2
+#define MX6UL_PAD_LCD_DATA04__CA7_MX6UL_TRACE4          0x0128 0x03b4 0x0000 2 0
 #define MX6UL_PAD_LCD_DATA04__ENET2_1588_EVENT2_IN      0x0128 0x03b4 0x0000 3 0
 #define MX6UL_PAD_LCD_DATA04__SPDIF_SR_CLK              0x0128 0x03b4 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA04__GPIO3_IO09                0x0128 0x03b4 0x0000 5 0
@@ -514,6 +526,7 @@
 #define MX6UL_PAD_LCD_DATA05__LCDIF_DATA05              0x012c 0x03b8 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA05__UART8_DCE_RTS             0x012c 0x03b8 0x0658 1 3
 #define MX6UL_PAD_LCD_DATA05__UART8_DTE_CTS             0x012c 0x03b8 0x0000 1 0
+#define MX6UL_PAD_LCD_DATA05__CA7_MX6UL_TRACE5          0x012c 0x03b8 0x0000 2 0
 #define MX6UL_PAD_LCD_DATA05__ENET2_1588_EVENT2_OUT     0x012c 0x03b8 0x0000 3 0
 #define MX6UL_PAD_LCD_DATA05__SPDIF_OUT                 0x012c 0x03b8 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA05__GPIO3_IO10                0x012c 0x03b8 0x0000 5 0
@@ -522,6 +535,7 @@
 #define MX6UL_PAD_LCD_DATA06__LCDIF_DATA06              0x0130 0x03bc 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA06__UART7_DCE_CTS             0x0130 0x03bc 0x0000 1 0
 #define MX6UL_PAD_LCD_DATA06__UART7_DTE_RTS             0x0130 0x03bc 0x0650 1 2
+#define MX6UL_PAD_LCD_DATA06__CA7_MX6UL_TRACE6          0x0130 0x03bc 0x0000 2 0
 #define MX6UL_PAD_LCD_DATA06__ENET2_1588_EVENT3_IN      0x0130 0x03bc 0x0000 3 0
 #define MX6UL_PAD_LCD_DATA06__SPDIF_LOCK                0x0130 0x03bc 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA06__GPIO3_IO11                0x0130 0x03bc 0x0000 5 0
@@ -530,6 +544,7 @@
 #define MX6UL_PAD_LCD_DATA07__LCDIF_DATA07              0x0134 0x03c0 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA07__UART7_DCE_RTS             0x0134 0x03c0 0x0650 1 3
 #define MX6UL_PAD_LCD_DATA07__UART7_DTE_CTS             0x0134 0x03c0 0x0000 1 0
+#define MX6UL_PAD_LCD_DATA07__CA7_MX6UL_TRACE7          0x0134 0x03c0 0x0000 2 0
 #define MX6UL_PAD_LCD_DATA07__ENET2_1588_EVENT3_OUT     0x0134 0x03c0 0x0000 3 0
 #define MX6UL_PAD_LCD_DATA07__SPDIF_EXT_CLK             0x0134 0x03c0 0x061c 4 0
 #define MX6UL_PAD_LCD_DATA07__GPIO3_IO12                0x0134 0x03c0 0x0000 5 0
@@ -537,56 +552,64 @@
 #define MX6UL_PAD_LCD_DATA07__ECSPI1_SS3                0x0134 0x03c0 0x0000 8 0
 #define MX6UL_PAD_LCD_DATA08__LCDIF_DATA08              0x0138 0x03c4 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA08__SPDIF_IN                  0x0138 0x03c4 0x0618 1 2
-#define MX6UL_PAD_LCD_DATA08__CSI_DATA16                0x0138 0x03c4 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA08__CA7_MX6UL_TRACE8          0x0138 0x03c4 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA08__CSI_DATA16                0x0138 0x03c4 0x0504 3 1
 #define MX6UL_PAD_LCD_DATA08__EIM_DATA00                0x0138 0x03c4 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA08__GPIO3_IO13                0x0138 0x03c4 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA08__SRC_BT_CFG08              0x0138 0x03c4 0x0000 6 0
 #define MX6UL_PAD_LCD_DATA08__FLEXCAN1_TX               0x0138 0x03c4 0x0000 8 0
 #define MX6UL_PAD_LCD_DATA09__LCDIF_DATA09              0x013c 0x03c8 0x0000 0 0
-#define MX6UL_PAD_LCD_DATA09__SAI3_MCLK                 0x013c 0x03c8 0x0000 1 0
-#define MX6UL_PAD_LCD_DATA09__CSI_DATA17                0x013c 0x03c8 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA09__SAI3_MCLK                 0x013c 0x03c8 0x0600 1 1
+#define MX6UL_PAD_LCD_DATA09__CA7_MX6UL_TRACE9          0x013c 0x03c8 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA09__CSI_DATA17                0x013c 0x03c8 0x0508 3 1
 #define MX6UL_PAD_LCD_DATA09__EIM_DATA01                0x013c 0x03c8 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA09__GPIO3_IO14                0x013c 0x03c8 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA09__SRC_BT_CFG09              0x013c 0x03c8 0x0000 6 0
 #define MX6UL_PAD_LCD_DATA09__FLEXCAN1_RX               0x013c 0x03c8 0x0584 8 2
 #define MX6UL_PAD_LCD_DATA10__LCDIF_DATA10              0x0140 0x03cc 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA10__SAI3_RX_SYNC              0x0140 0x03cc 0x0000 1 0
-#define MX6UL_PAD_LCD_DATA10__CSI_DATA18                0x0140 0x03cc 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA10__CA7_MX6UL_TRACE10         0x0140 0x03cc 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA10__CSI_DATA18                0x0140 0x03cc 0x050c 3 1
 #define MX6UL_PAD_LCD_DATA10__EIM_DATA02                0x0140 0x03cc 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA10__GPIO3_IO15                0x0140 0x03cc 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA10__SRC_BT_CFG10              0x0140 0x03cc 0x0000 6 0
 #define MX6UL_PAD_LCD_DATA10__FLEXCAN2_TX               0x0140 0x03cc 0x0000 8 0
 #define MX6UL_PAD_LCD_DATA11__LCDIF_DATA11              0x0144 0x03d0 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA11__SAI3_RX_BCLK              0x0144 0x03d0 0x0000 1 0
-#define MX6UL_PAD_LCD_DATA11__CSI_DATA19                0x0144 0x03d0 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA11__CA7_MX6UL_TRACE11         0x0144 0x03d0 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA11__CSI_DATA19                0x0144 0x03d0 0x0510 3 1
 #define MX6UL_PAD_LCD_DATA11__EIM_DATA03                0x0144 0x03d0 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA11__GPIO3_IO16                0x0144 0x03d0 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA11__SRC_BT_CFG11              0x0144 0x03d0 0x0000 6 0
 #define MX6UL_PAD_LCD_DATA11__FLEXCAN2_RX               0x0144 0x03d0 0x0588 8 2
 #define MX6UL_PAD_LCD_DATA12__LCDIF_DATA12              0x0148 0x03d4 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA12__SAI3_TX_SYNC              0x0148 0x03d4 0x060c 1 1
-#define MX6UL_PAD_LCD_DATA12__CSI_DATA20                0x0148 0x03d4 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA12__CA7_MX6UL_TRACE12         0x0148 0x03d4 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA12__CSI_DATA20                0x0148 0x03d4 0x0514 3 1
 #define MX6UL_PAD_LCD_DATA12__EIM_DATA04                0x0148 0x03d4 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA12__GPIO3_IO17                0x0148 0x03d4 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA12__SRC_BT_CFG12              0x0148 0x03d4 0x0000 6 0
 #define MX6UL_PAD_LCD_DATA12__ECSPI1_RDY                0x0148 0x03d4 0x0000 8 0
 #define MX6UL_PAD_LCD_DATA13__LCDIF_DATA13              0x014c 0x03d8 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA13__SAI3_TX_BCLK              0x014c 0x03d8 0x0608 1 1
-#define MX6UL_PAD_LCD_DATA13__CSI_DATA21                0x014c 0x03d8 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA13__CA7_MX6UL_TRACE13         0x014c 0x03d8 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA13__CSI_DATA21                0x014c 0x03d8 0x0518 3 1
 #define MX6UL_PAD_LCD_DATA13__EIM_DATA05                0x014c 0x03d8 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA13__GPIO3_IO18                0x014c 0x03d8 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA13__SRC_BT_CFG13              0x014c 0x03d8 0x0000 6 0
 #define MX6UL_PAD_LCD_DATA13__USDHC2_RESET_B            0x014c 0x03d8 0x0000 8 0
 #define MX6UL_PAD_LCD_DATA14__LCDIF_DATA14              0x0150 0x03dc 0x0000 0 0
-#define MX6UL_PAD_LCD_DATA14__SAI3_RX_DATA              0x0150 0x03dc 0x0000 1 0
-#define MX6UL_PAD_LCD_DATA14__CSI_DATA22                0x0150 0x03dc 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA14__SAI3_RX_DATA              0x0150 0x03dc 0x0604 1 1
+#define MX6UL_PAD_LCD_DATA14__CA7_MX6UL_TRACE14         0x0150 0x03dc 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA14__CSI_DATA22                0x0150 0x03dc 0x051c 3 1
 #define MX6UL_PAD_LCD_DATA14__EIM_DATA06                0x0150 0x03dc 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA14__GPIO3_IO19                0x0150 0x03dc 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA14__SRC_BT_CFG14              0x0150 0x03dc 0x0000 6 0
 #define MX6UL_PAD_LCD_DATA14__USDHC2_DATA4              0x0150 0x03dc 0x068c 8 0
 #define MX6UL_PAD_LCD_DATA15__LCDIF_DATA15              0x0154 0x03e0 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA15__SAI3_TX_DATA              0x0154 0x03e0 0x0000 1 0
-#define MX6UL_PAD_LCD_DATA15__CSI_DATA23                0x0154 0x03e0 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA15__CA7_MX6UL_TRACE15         0x0154 0x03e0 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA15__CSI_DATA23                0x0154 0x03e0 0x0520 3 1
 #define MX6UL_PAD_LCD_DATA15__EIM_DATA07                0x0154 0x03e0 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA15__GPIO3_IO20                0x0154 0x03e0 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA15__SRC_BT_CFG15              0x0154 0x03e0 0x0000 6 0
@@ -594,7 +617,8 @@
 #define MX6UL_PAD_LCD_DATA16__LCDIF_DATA16              0x0158 0x03e4 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA16__UART7_DCE_TX              0x0158 0x03e4 0x0000 1 0
 #define MX6UL_PAD_LCD_DATA16__UART7_DTE_RX              0x0158 0x03e4 0x0654 1 2
-#define MX6UL_PAD_LCD_DATA16__CSI_DATA01                0x0158 0x03e4 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA16__CA7_MX6UL_TRACE_CLK       0x0158 0x03e4 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA16__CSI_DATA01                0x0158 0x03e4 0x04d4 3 1
 #define MX6UL_PAD_LCD_DATA16__EIM_DATA08                0x0158 0x03e4 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA16__GPIO3_IO21                0x0158 0x03e4 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA16__SRC_BT_CFG24              0x0158 0x03e4 0x0000 6 0
@@ -602,7 +626,8 @@
 #define MX6UL_PAD_LCD_DATA17__LCDIF_DATA17              0x015c 0x03e8 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA17__UART7_DCE_RX              0x015c 0x03e8 0x0654 1 3
 #define MX6UL_PAD_LCD_DATA17__UART7_DTE_TX              0x015c 0x03e8 0x0000 1 0
-#define MX6UL_PAD_LCD_DATA17__CSI_DATA00                0x015c 0x03e8 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA17__CA7_MX6UL_TRACE_CTL       0x015c 0x03e8 0x0000 2 0
+#define MX6UL_PAD_LCD_DATA17__CSI_DATA00                0x015c 0x03e8 0x04d0 3 1
 #define MX6UL_PAD_LCD_DATA17__EIM_DATA09                0x015c 0x03e8 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA17__GPIO3_IO22                0x015c 0x03e8 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA17__SRC_BT_CFG25              0x015c 0x03e8 0x0000 6 0
@@ -610,7 +635,7 @@
 #define MX6UL_PAD_LCD_DATA18__LCDIF_DATA18              0x0160 0x03ec 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA18__PWM5_OUT                  0x0160 0x03ec 0x0000 1 0
 #define MX6UL_PAD_LCD_DATA18__CA7_MX6UL_EVENTO          0x0160 0x03ec 0x0000 2 0
-#define MX6UL_PAD_LCD_DATA18__CSI_DATA10                0x0160 0x03ec 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA18__CSI_DATA10                0x0160 0x03ec 0x04ec 3 1
 #define MX6UL_PAD_LCD_DATA18__EIM_DATA10                0x0160 0x03ec 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA18__GPIO3_IO23                0x0160 0x03ec 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA18__SRC_BT_CFG26              0x0160 0x03ec 0x0000 6 0
@@ -622,7 +647,7 @@
 #define MX6UL_PAD_LCD_DATA19__LCDIF_DATA19              0x0164 0x03f0 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA19__PWM6_OUT                  0x0164 0x03f0 0x0000 1 0
 #define MX6UL_PAD_LCD_DATA19__WDOG1_WDOG_ANY            0x0164 0x03f0 0x0000 2 0
-#define MX6UL_PAD_LCD_DATA19__CSI_DATA11                0x0164 0x03f0 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA19__CSI_DATA11                0x0164 0x03f0 0x04f0 3 1
 #define MX6UL_PAD_LCD_DATA20__EIM_DATA12                0x0168 0x03f4 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA20__GPIO3_IO25                0x0168 0x03f4 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA20__SRC_BT_CFG28              0x0168 0x03f4 0x0000 6 0
@@ -631,12 +656,12 @@
 #define MX6UL_PAD_LCD_DATA20__UART8_DCE_TX              0x0168 0x03f4 0x0000 1 0
 #define MX6UL_PAD_LCD_DATA20__UART8_DTE_RX              0x0168 0x03f4 0x065c 1 2
 #define MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK               0x0168 0x03f4 0x0534 2 0
-#define MX6UL_PAD_LCD_DATA20__CSI_DATA12                0x0168 0x03f4 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA20__CSI_DATA12                0x0168 0x03f4 0x04f4 3 1
 #define MX6UL_PAD_LCD_DATA21__LCDIF_DATA21              0x016c 0x03f8 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA21__UART8_DCE_RX              0x016c 0x03f8 0x065c 1 3
 #define MX6UL_PAD_LCD_DATA21__UART8_DTE_TX              0x016c 0x03f8 0x0000 1 0
-#define MX6UL_PAD_LCD_DATA21__ECSPI1_SS0                0x016c 0x03f8 0x0000 2 0
-#define MX6UL_PAD_LCD_DATA21__CSI_DATA13                0x016c 0x03f8 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA21__ECSPI1_SS0                0x016c 0x03f8 0x0540 2 0
+#define MX6UL_PAD_LCD_DATA21__CSI_DATA13                0x016c 0x03f8 0x04f8 3 1
 #define MX6UL_PAD_LCD_DATA21__EIM_DATA13                0x016c 0x03f8 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA21__GPIO3_IO26                0x016c 0x03f8 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA21__SRC_BT_CFG29              0x016c 0x03f8 0x0000 6 0
@@ -644,7 +669,7 @@
 #define MX6UL_PAD_LCD_DATA22__LCDIF_DATA22              0x0170 0x03fc 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA22__MQS_RIGHT                 0x0170 0x03fc 0x0000 1 0
 #define MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI               0x0170 0x03fc 0x053c 2 0
-#define MX6UL_PAD_LCD_DATA22__CSI_DATA14                0x0170 0x03fc 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA22__CSI_DATA14                0x0170 0x03fc 0x04fc 3 1
 #define MX6UL_PAD_LCD_DATA22__EIM_DATA14                0x0170 0x03fc 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA22__GPIO3_IO27                0x0170 0x03fc 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA22__SRC_BT_CFG30              0x0170 0x03fc 0x0000 6 0
@@ -652,7 +677,7 @@
 #define MX6UL_PAD_LCD_DATA23__LCDIF_DATA23              0x0174 0x0400 0x0000 0 0
 #define MX6UL_PAD_LCD_DATA23__MQS_LEFT                  0x0174 0x0400 0x0000 1 0
 #define MX6UL_PAD_LCD_DATA23__ECSPI1_MISO               0x0174 0x0400 0x0538 2 0
-#define MX6UL_PAD_LCD_DATA23__CSI_DATA15                0x0174 0x0400 0x0000 3 0
+#define MX6UL_PAD_LCD_DATA23__CSI_DATA15                0x0174 0x0400 0x0500 3 1
 #define MX6UL_PAD_LCD_DATA23__EIM_DATA15                0x0174 0x0400 0x0000 4 0
 #define MX6UL_PAD_LCD_DATA23__GPIO3_IO28                0x0174 0x0400 0x0000 5 0
 #define MX6UL_PAD_LCD_DATA23__SRC_BT_CFG31              0x0174 0x0400 0x0000 6 0
@@ -660,42 +685,42 @@
 #define MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B               0x0178 0x0404 0x0000 0 0
 #define MX6UL_PAD_NAND_RE_B__USDHC2_CLK                 0x0178 0x0404 0x0670 1 2
 #define MX6UL_PAD_NAND_RE_B__QSPI_B_SCLK                0x0178 0x0404 0x0000 2 0
-#define MX6UL_PAD_NAND_RE_B__KPP_ROW00                  0x0178 0x0404 0x0000 3 0
+#define MX6UL_PAD_NAND_RE_B__KPP_ROW00                  0x0178 0x0404 0x05d0 3 1
 #define MX6UL_PAD_NAND_RE_B__EIM_EB_B00                 0x0178 0x0404 0x0000 4 0
 #define MX6UL_PAD_NAND_RE_B__GPIO4_IO00                 0x0178 0x0404 0x0000 5 0
 #define MX6UL_PAD_NAND_RE_B__ECSPI3_SS2                 0x0178 0x0404 0x0000 8 0
 #define MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B               0x017c 0x0408 0x0000 0 0
 #define MX6UL_PAD_NAND_WE_B__USDHC2_CMD                 0x017c 0x0408 0x0678 1 2
 #define MX6UL_PAD_NAND_WE_B__QSPI_B_SS0_B               0x017c 0x0408 0x0000 2 0
-#define MX6UL_PAD_NAND_WE_B__KPP_COL00                  0x017c 0x0408 0x0000 3 0
+#define MX6UL_PAD_NAND_WE_B__KPP_COL00                  0x017c 0x0408 0x05c4 3 1
 #define MX6UL_PAD_NAND_WE_B__EIM_EB_B01                 0x017c 0x0408 0x0000 4 0
 #define MX6UL_PAD_NAND_WE_B__GPIO4_IO01                 0x017c 0x0408 0x0000 5 0
 #define MX6UL_PAD_NAND_WE_B__ECSPI3_SS3                 0x017c 0x0408 0x0000 8 0
 #define MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00           0x0180 0x040c 0x0000 0 0
 #define MX6UL_PAD_NAND_DATA00__USDHC2_DATA0             0x0180 0x040c 0x067c 1 2
 #define MX6UL_PAD_NAND_DATA00__QSPI_B_SS1_B             0x0180 0x040c 0x0000 2 0
-#define MX6UL_PAD_NAND_DATA00__KPP_ROW01                0x0180 0x040c 0x0000 3 0
+#define MX6UL_PAD_NAND_DATA00__KPP_ROW01                0x0180 0x040c 0x05d4 3 1
 #define MX6UL_PAD_NAND_DATA00__EIM_AD08                 0x0180 0x040c 0x0000 4 0
 #define MX6UL_PAD_NAND_DATA00__GPIO4_IO02               0x0180 0x040c 0x0000 5 0
 #define MX6UL_PAD_NAND_DATA00__ECSPI4_RDY               0x0180 0x040c 0x0000 8 0
 #define MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01           0x0184 0x0410 0x0000 0 0
 #define MX6UL_PAD_NAND_DATA01__USDHC2_DATA1             0x0184 0x0410 0x0680 1 2
 #define MX6UL_PAD_NAND_DATA01__QSPI_B_DQS               0x0184 0x0410 0x0000 2 0
-#define MX6UL_PAD_NAND_DATA01__KPP_COL01                0x0184 0x0410 0x0000 3 0
+#define MX6UL_PAD_NAND_DATA01__KPP_COL01                0x0184 0x0410 0x05c8 3 1
 #define MX6UL_PAD_NAND_DATA01__EIM_AD09                 0x0184 0x0410 0x0000 4 0
 #define MX6UL_PAD_NAND_DATA01__GPIO4_IO03               0x0184 0x0410 0x0000 5 0
 #define MX6UL_PAD_NAND_DATA01__ECSPI4_SS1               0x0184 0x0410 0x0000 8 0
 #define MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02           0x0188 0x0414 0x0000 0 0
 #define MX6UL_PAD_NAND_DATA02__USDHC2_DATA2             0x0188 0x0414 0x0684 1 1
 #define MX6UL_PAD_NAND_DATA02__QSPI_B_DATA00            0x0188 0x0414 0x0000 2 0
-#define MX6UL_PAD_NAND_DATA02__KPP_ROW02                0x0188 0x0414 0x0000 3 0
+#define MX6UL_PAD_NAND_DATA02__KPP_ROW02                0x0188 0x0414 0x05d8 3 1
 #define MX6UL_PAD_NAND_DATA02__EIM_AD10                 0x0188 0x0414 0x0000 4 0
 #define MX6UL_PAD_NAND_DATA02__GPIO4_IO04               0x0188 0x0414 0x0000 5 0
 #define MX6UL_PAD_NAND_DATA02__ECSPI4_SS2               0x0188 0x0414 0x0000 8 0
 #define MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03           0x018c 0x0418 0x0000 0 0
 #define MX6UL_PAD_NAND_DATA03__USDHC2_DATA3             0x018c 0x0418 0x0688 1 2
 #define MX6UL_PAD_NAND_DATA03__QSPI_B_DATA01            0x018c 0x0418 0x0000 2 0
-#define MX6UL_PAD_NAND_DATA03__KPP_COL02                0x018c 0x0418 0x0000 3 0
+#define MX6UL_PAD_NAND_DATA03__KPP_COL02                0x018c 0x0418 0x05cc 3 1
 #define MX6UL_PAD_NAND_DATA03__EIM_AD11                 0x018c 0x0418 0x0000 4 0
 #define MX6UL_PAD_NAND_DATA03__GPIO4_IO05               0x018c 0x0418 0x0000 5 0
 #define MX6UL_PAD_NAND_DATA03__ECSPI4_SS3               0x018c 0x0418 0x0000 8 0
@@ -726,7 +751,7 @@
 #define MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07           0x019c 0x0428 0x0000 0 0
 #define MX6UL_PAD_NAND_DATA07__USDHC2_DATA7             0x019c 0x0428 0x0698 1 1
 #define MX6UL_PAD_NAND_DATA07__QSPI_A_SS1_B             0x019c 0x0428 0x0000 2 0
-#define MX6UL_PAD_NAND_DATA07__ECSPI4_SS0               0x019c 0x0428 0x0000 3 0
+#define MX6UL_PAD_NAND_DATA07__ECSPI4_SS0               0x019c 0x0428 0x0570 3 1
 #define MX6UL_PAD_NAND_DATA07__EIM_AD15                 0x019c 0x0428 0x0000 4 0
 #define MX6UL_PAD_NAND_DATA07__GPIO4_IO09               0x019c 0x0428 0x0000 5 0
 #define MX6UL_PAD_NAND_DATA07__UART2_DCE_RTS            0x019c 0x0428 0x0628 8 5
@@ -748,7 +773,7 @@
 #define MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B         0x01a8 0x0434 0x0000 0 0
 #define MX6UL_PAD_NAND_READY_B__USDHC1_DATA4            0x01a8 0x0434 0x0000 1 0
 #define MX6UL_PAD_NAND_READY_B__QSPI_A_DATA00           0x01a8 0x0434 0x0000 2 0
-#define MX6UL_PAD_NAND_READY_B__ECSPI3_SS0              0x01a8 0x0434 0x0000 3 0
+#define MX6UL_PAD_NAND_READY_B__ECSPI3_SS0              0x01a8 0x0434 0x0560 3 1
 #define MX6UL_PAD_NAND_READY_B__EIM_CS1_B               0x01a8 0x0434 0x0000 4 0
 #define MX6UL_PAD_NAND_READY_B__GPIO4_IO12              0x01a8 0x0434 0x0000 5 0
 #define MX6UL_PAD_NAND_READY_B__UART3_DCE_TX            0x01a8 0x0434 0x0000 8 0
@@ -783,7 +808,7 @@
 #define MX6UL_PAD_NAND_DQS__PWM5_OUT                    0x01b8 0x0444 0x0000 3 0
 #define MX6UL_PAD_NAND_DQS__EIM_WAIT                    0x01b8 0x0444 0x0000 4 0
 #define MX6UL_PAD_NAND_DQS__GPIO4_IO16                  0x01b8 0x0444 0x0000 5 0
-#define MX6UL_PAD_NAND_DQS__SDMA_EXT_EVENT01            0x01b8 0x0444 0x0000 6 0
+#define MX6UL_PAD_NAND_DQS__SDMA_EXT_EVENT01            0x01b8 0x0444 0x0614 6 1
 #define MX6UL_PAD_NAND_DQS__SPDIF_EXT_CLK               0x01b8 0x0444 0x061c 8 1
 #define MX6UL_PAD_SD1_CMD__USDHC1_CMD                   0x01bc 0x0448 0x0000 0 0
 #define MX6UL_PAD_SD1_CMD__GPT2_COMPARE1                0x01bc 0x0448 0x0000 1 0
@@ -791,11 +816,11 @@
 #define MX6UL_PAD_SD1_CMD__SPDIF_OUT                    0x01bc 0x0448 0x0000 3 0
 #define MX6UL_PAD_SD1_CMD__EIM_ADDR19                   0x01bc 0x0448 0x0000 4 0
 #define MX6UL_PAD_SD1_CMD__GPIO2_IO16                   0x01bc 0x0448 0x0000 5 0
-#define MX6UL_PAD_SD1_CMD__SDMA_EXT_EVENT00             0x01bc 0x0448 0x0000 6 0
+#define MX6UL_PAD_SD1_CMD__SDMA_EXT_EVENT00             0x01bc 0x0448 0x0610 6 2
 #define MX6UL_PAD_SD1_CMD__USB_OTG1_PWR                 0x01bc 0x0448 0x0000 8 0
 #define MX6UL_PAD_SD1_CLK__USDHC1_CLK                   0x01c0 0x044c 0x0000 0 0
 #define MX6UL_PAD_SD1_CLK__GPT2_COMPARE2                0x01c0 0x044c 0x0000 1 0
-#define MX6UL_PAD_SD1_CLK__SAI2_MCLK                    0x01c0 0x044c 0x0000 2 0
+#define MX6UL_PAD_SD1_CLK__SAI2_MCLK                    0x01c0 0x044c 0x05f0 2 1
 #define MX6UL_PAD_SD1_CLK__SPDIF_IN                     0x01c0 0x044c 0x0618 3 3
 #define MX6UL_PAD_SD1_CLK__EIM_ADDR20                   0x01c0 0x044c 0x0000 4 0
 #define MX6UL_PAD_SD1_CLK__GPIO2_IO17                   0x01c0 0x044c 0x0000 5 0
@@ -878,10 +903,10 @@
 #define MX6UL_PAD_CSI_DATA01__CSI_DATA03                0x01e8 0x0474 0x04c8 0 0
 #define MX6UL_PAD_CSI_DATA01__USDHC2_DATA1              0x01e8 0x0474 0x0680 1 0
 #define MX6UL_PAD_CSI_DATA01__SIM1_PORT1_SVEN           0x01e8 0x0474 0x0000 2 0
-#define MX6UL_PAD_CSI_DATA01__ECSPI2_SS0                0x01e8 0x0474 0x0000 3 0
+#define MX6UL_PAD_CSI_DATA01__ECSPI2_SS0                0x01e8 0x0474 0x0550 3 0
 #define MX6UL_PAD_CSI_DATA01__EIM_AD01                  0x01e8 0x0474 0x0000 4 0
 #define MX6UL_PAD_CSI_DATA01__GPIO4_IO22                0x01e8 0x0474 0x0000 5 0
-#define MX6UL_PAD_CSI_DATA01__SAI1_MCLK                 0x01e8 0x0474 0x0000 6 0
+#define MX6UL_PAD_CSI_DATA01__SAI1_MCLK                 0x01e8 0x0474 0x05e0 6 0
 #define MX6UL_PAD_CSI_DATA01__UART5_DCE_RX              0x01e8 0x0474 0x0644 8 1
 #define MX6UL_PAD_CSI_DATA01__UART5_DTE_TX              0x01e8 0x0474 0x0000 8 0
 #define MX6UL_PAD_CSI_DATA02__CSI_DATA04                0x01ec 0x0478 0x04d8 0 1
@@ -913,7 +938,7 @@
 #define MX6UL_PAD_CSI_DATA05__CSI_DATA07                0x01f8 0x0484 0x04e0 0 1
 #define MX6UL_PAD_CSI_DATA05__USDHC2_DATA5              0x01f8 0x0484 0x0690 1 2
 #define MX6UL_PAD_CSI_DATA05__SIM2_PORT1_RST_B          0x01f8 0x0484 0x0000 2 0
-#define MX6UL_PAD_CSI_DATA05__ECSPI1_SS0                0x01f8 0x0484 0x0000 3 0
+#define MX6UL_PAD_CSI_DATA05__ECSPI1_SS0                0x01f8 0x0484 0x0540 3 1
 #define MX6UL_PAD_CSI_DATA05__EIM_AD05                  0x01f8 0x0484 0x0000 4 0
 #define MX6UL_PAD_CSI_DATA05__GPIO4_IO26                0x01f8 0x0484 0x0000 5 0
 #define MX6UL_PAD_CSI_DATA05__SAI1_TX_BCLK              0x01f8 0x0484 0x05e8 6 1
@@ -924,7 +949,7 @@
 #define MX6UL_PAD_CSI_DATA06__ECSPI1_MOSI               0x01fc 0x0488 0x053c 3 1
 #define MX6UL_PAD_CSI_DATA06__EIM_AD06                  0x01fc 0x0488 0x0000 4 0
 #define MX6UL_PAD_CSI_DATA06__GPIO4_IO27                0x01fc 0x0488 0x0000 5 0
-#define MX6UL_PAD_CSI_DATA06__SAI1_RX_DATA              0x01fc 0x0488 0x0000 6 0
+#define MX6UL_PAD_CSI_DATA06__SAI1_RX_DATA              0x01fc 0x0488 0x05e4 6 1
 #define MX6UL_PAD_CSI_DATA06__USDHC1_RESET_B            0x01fc 0x0488 0x0000 8 0
 #define MX6UL_PAD_CSI_DATA07__CSI_DATA09                0x0200 0x048c 0x04e8 0 1
 #define MX6UL_PAD_CSI_DATA07__USDHC2_DATA7              0x0200 0x048c 0x0698 1 2
diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index 65111f9843f4..f678d18ad44a 100644
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -70,8 +70,8 @@
                 stdout-path = &uart1;
         };
 
-        memory {
-                reg = <0 0>; /* will be filled by U-Boot */
+        memory@80000000 {
+                reg = <0x80000000 0>; /* will be filled by U-Boot */
         };
 
         clocks {
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 5d6c3ba36cd1..1241972b16ba 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -22,7 +22,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 ethernet0 = &fec1;
@@ -86,15 +86,10 @@
                                  <&clks IMX6UL_CA7_SECONDARY_SEL>,
                                  <&clks IMX6UL_CLK_STEP>,
                                  <&clks IMX6UL_CLK_PLL1_SW>,
-                                 <&clks IMX6UL_CLK_PLL1_SYS>,
-                                 <&clks IMX6UL_PLL1_BYPASS>,
-                                 <&clks IMX6UL_CLK_PLL1>,
-                                 <&clks IMX6UL_PLL1_BYPASS_SRC>,
-                                 <&clks IMX6UL_CLK_OSC>;
+                                 <&clks IMX6UL_CLK_PLL1_SYS>;
                         clock-names = "arm", "pll2_bus",  "pll2_pfd2_396m",
                                       "secondary_sel", "step", "pll1_sw",
-                                      "pll1_sys", "pll1_bypass", "pll1",
-                                      "pll1_bypass_src", "osc";
+                                      "pll1_sys";
                         arm-supply = <&reg_arm>;
                         soc-supply = <&reg_soc>;
                 };
@@ -102,14 +97,26 @@
 
         intc: interrupt-controller@a01000 {
                 compatible = "arm,gic-400", "arm,cortex-a7-gic";
+                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
                 #interrupt-cells = <3>;
                 interrupt-controller;
+                interrupt-parent = <&intc>;
                 reg = <0x00a01000 0x1000>,
                       <0x00a02000 0x2000>,
                       <0x00a04000 0x2000>,
                       <0x00a06000 0x2000>;
         };
 
+        timer {
+                compatible = "arm,armv7-timer";
+                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)>;
+                interrupt-parent = <&intc>;
+                status = "disabled";
+        };
+
         ckil: clock-cli {
                 compatible = "fixed-clock";
                 #clock-cells = <0>;
@@ -924,6 +931,14 @@
                                 status = "disabled";
                         };
 
+                        wdog3: wdog@21e4000 {
+                                compatible = "fsl,imx6ul-wdt", "fsl,imx21-wdt";
+                                reg = <0x021e4000 0x4000>;
+                                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6UL_CLK_WDOG3>;
+                                status = "disabled";
+                        };
+
                         uart2: serial@21e8000 {
                                 compatible = "fsl,imx6ul-uart",
                                              "fsl,imx6q-uart";
diff --git a/arch/arm/boot/dts/imx6ull-14x14-evk.dts b/arch/arm/boot/dts/imx6ull-14x14-evk.dts
index 4741871434dd..30ef60344af3 100644
--- a/arch/arm/boot/dts/imx6ull-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-evk.dts
@@ -39,7 +39,10 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "imx6ul-14x14-evk.dts"
+/dts-v1/;
+
+#include "imx6ull.dtsi"
+#include "imx6ul-14x14-evk.dtsi"
 
 / {
         model = "Freescale i.MX6 UlltraLite 14x14 EVK Board";
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
new file mode 100644
index 000000000000..08669a18349e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2018 Toradex AG
+ */
+
+/dts-v1/;
+
+#include "imx6ull-colibri-nonwifi.dtsi"
+#include "imx6ull-colibri-eval-v3.dtsi"
+
+/ {
+        model = "Toradex Colibri iMX6ULL 256MB on Colibri Evaluation Board V3";
+        compatible = "toradex,colibri-imx6ull-eval", "fsl,imx6ull";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
new file mode 100644
index 000000000000..006690ea98c0
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2017 Toradex AG
+ */
+
+/ {
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        /* fixed crystal dedicated to mcp2515 */
+        clk16m: clk16m {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <16000000>;
+        };
+
+        panel: panel {
+                compatible = "edt,et057090dhu";
+                backlight = <&bl>;
+                power-supply = <&reg_3v3>;
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&lcdif_out>;
+                        };
+                };
+        };
+
+        reg_3v3: regulator-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "3.3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        reg_5v0: regulator-5v0 {
+                compatible = "regulator-fixed";
+                regulator-name = "5V";
+                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 = <&gpio1 2 GPIO_ACTIVE_LOW>;
+                vin-supply = <&reg_5v0>;
+        };
+};
+
+&adc1 {
+        status = "okay";
+};
+
+&bl {
+        brightness-levels = <0 4 8 16 32 64 128 255>;
+        default-brightness-level = <6>;
+        power-supply = <&reg_3v3>;
+        pwms = <&pwm4 0 5000000 1>;
+        status = "okay";
+};
+
+&ecspi1 {
+        status = "okay";
+
+        mcp2515: can@0 {
+                compatible = "microchip,mcp2515";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_can_int>;
+                reg = <0>;
+                clocks = <&clk16m>;
+                interrupt-parent = <&gpio2>;
+                interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+                spi-max-frequency = <10000000>;
+                vdd-supply = <&reg_3v3>;
+                xceiver-supply = <&reg_5v0>;
+                status = "okay";
+        };
+};
+
+&i2c1 {
+        status = "okay";
+
+        /* M41T0M6 real time clock on carrier board */
+        m41t0m6: rtc@68 {
+                compatible = "st,m41t0";
+                reg = <0x68>;
+        };
+};
+
+&lcdif {
+        status = "okay";
+
+        port {
+                lcdif_out: endpoint {
+                        remote-endpoint = <&panel_in>;
+                };
+        };
+};
+
+/* PWM <A> */
+&pwm4 {
+        status = "okay";
+};
+
+/* PWM <B> */
+&pwm5 {
+        status = "okay";
+};
+
+/* PWM <C> */
+&pwm6 {
+        status = "okay";
+};
+
+/* PWM <D> */
+&pwm7 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart5 {
+        status = "okay";
+};
+
+&usbotg1 {
+        status = "okay";
+};
+
+&usbotg2 {
+        vbus-supply = <&reg_usbh_vbus>;
+        status = "okay";
+};
+
+&usdhc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>;
+        no-1-8-v;
+        cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
+        disable-wp;
+        wakeup-source;
+        keep-power-in-suspend;
+        vmmc-supply = <&reg_3v3>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
new file mode 100644
index 000000000000..10ab4697950f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2018 Toradex AG
+ */
+
+#include "imx6ull-colibri.dtsi"
+
+/ {
+        memory@80000000 {
+                reg = <0x80000000 0x10000000>;
+        };
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
+                &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6>;
+};
+
+&iomuxc_snvs {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio2 &pinctrl_snvs_gpio3>;
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts
new file mode 100644
index 000000000000..df72ce1ae2cb
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2018 Toradex AG
+ */
+
+/dts-v1/;
+
+#include "imx6ull-colibri-wifi.dtsi"
+#include "imx6ull-colibri-eval-v3.dtsi"
+
+/ {
+        model = "Toradex Colibri iMX6ULL 512MB on Colibri Evaluation Board V3";
+        compatible = "toradex,colibri-imx6ull-wifi-eval", "fsl,imx6ull";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
new file mode 100644
index 000000000000..3dffbcd50bf6
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2018 Toradex AG
+ */
+
+#include "imx6ull-colibri.dtsi"
+
+/ {
+        memory@80000000 {
+                reg = <0x80000000 0x20000000>;
+        };
+
+        wifi_pwrseq: sdio-pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_snvs_wifi_pdn>;
+                reset-gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
+        };
+};
+
+&cpu0 {
+        clock-frequency = <792000000>;
+        operating-points = <
+                /* kHz  uV */
+                792000  1225000
+                528000  1175000
+                396000  1025000
+                198000  950000
+        >;
+        fsl,soc-operating-points = <
+                /* KHz  uV */
+                792000  1175000
+                528000  1175000
+                396000  1175000
+                198000  1175000
+        >;
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
+                &pinctrl_gpio4 &pinctrl_gpio5>;
+
+};
+
+&iomuxc_snvs {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio2>;
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        assigned-clocks = <&clks IMX6UL_CLK_USDHC2_SEL>, <&clks IMX6UL_CLK_USDHC2>;
+        assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>;
+        assigned-clock-rates = <0>, <198000000>;
+        cap-power-off-card;
+        keep-power-in-suspend;
+        mmc-pwrseq = <&wifi_pwrseq>;
+        no-1-8-v;
+        non-removable;
+        vmmc-supply = <&reg_module_3v3>;
+        wakeup-source;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
new file mode 100644
index 000000000000..6c63a7384611
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -0,0 +1,553 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2018 Toradex AG
+ */
+
+#include "imx6ull.dtsi"
+
+/ {
+        aliases {
+                ethernet0 = &fec2;
+                ethernet1 = &fec1;
+        };
+
+        bl: backlight {
+                compatible = "pwm-backlight";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_gpio_bl_on>;
+                enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+                status = "disabled";
+        };
+
+        reg_module_3v3: regulator-module-3v3 {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-name = "+V3.3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        reg_module_3v3_avdd: regulator-module-3v3-avdd {
+                compatible = "regulator-fixed";
+                regulator-always-on;
+                regulator-name = "+V3.3_AVDD_AUDIO";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        reg_sd1_vmmc: regulator-sd1-vmmc {
+                compatible = "regulator-gpio";
+                gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_snvs_reg_sd>;
+                regulator-always-on;
+                regulator-name = "+V3.3_1.8_SD";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <3300000>;
+                states = <1800000 0x1 3300000 0x0>;
+                vin-supply = <&reg_module_3v3>;
+        };
+};
+
+&adc1 {
+        num-channels = <10>;
+        vref-supply = <&reg_module_3v3_avdd>;
+};
+
+/* Colibri SPI */
+&ecspi1 {
+        cs-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
+};
+
+&fec2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet2>;
+        phy-mode = "rmii";
+        phy-handle = <&ethphy1>;
+        status = "okay";
+
+        mdio {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ethphy1: ethernet-phy@2 {
+                        compatible = "ethernet-phy-ieee802.3-c22";
+                        max-speed = <100>;
+                        reg = <2>;
+                };
+        };
+};
+
+&gpmi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_gpmi_nand>;
+        nand-on-flash-bbt;
+        nand-ecc-mode = "hw";
+        nand-ecc-strength = <8>;
+        nand-ecc-step-size = <512>;
+        status = "okay";
+};
+
+&i2c1 {
+        pinctrl-names = "default", "gpio";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        pinctrl-1 = <&pinctrl_i2c1_gpio>;
+        sda-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
+        scl-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
+};
+
+&i2c2 {
+        pinctrl-names = "default", "gpio";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        pinctrl-1 = <&pinctrl_i2c2_gpio>;
+        sda-gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
+        scl-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
+        status = "okay";
+
+        ad7879@2c {
+                compatible = "adi,ad7879-1";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_snvs_ad7879_int>;
+                reg = <0x2c>;
+                interrupt-parent = <&gpio5>;
+                interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+                touchscreen-max-pressure = <4096>;
+                adi,resistance-plate-x = <120>;
+                adi,first-conversion-delay = /bits/ 8 <3>;
+                adi,acquisition-time = /bits/ 8 <1>;
+                adi,median-filter-size = /bits/ 8 <2>;
+                adi,averaging = /bits/ 8 <1>;
+                adi,conversion-interval = /bits/ 8 <255>;
+        };
+};
+
+&lcdif {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_lcdif_dat
+                     &pinctrl_lcdif_ctrl>;
+};
+
+&pwm4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm4>;
+        #pwm-cells = <3>;
+};
+
+&pwm5 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm5>;
+        #pwm-cells = <3>;
+};
+
+&pwm6 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm6>;
+        #pwm-cells = <3>;
+};
+
+&pwm7 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm7>;
+        #pwm-cells = <3>;
+};
+
+&sdma {
+        status = "okay";
+};
+
+&snvs_pwrkey {
+        status = "disabled";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>;
+        uart-has-rtscts;
+        fsl,dte-mode;
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2>;
+        uart-has-rtscts;
+        fsl,dte-mode;
+};
+
+&uart5 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart5>;
+        fsl,dte-mode;
+};
+
+&usbotg1 {
+        dr_mode = "otg";
+        srp-disable;
+        hnp-disable;
+        adp-disable;
+};
+
+&usbotg2 {
+        dr_mode = "host";
+};
+
+&usdhc1 {
+        assigned-clocks = <&clks IMX6UL_CLK_USDHC1_SEL>, <&clks IMX6UL_CLK_USDHC1>;
+        assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>;
+        assigned-clock-rates = <0>, <198000000>;
+};
+
+&iomuxc {
+        pinctrl_can_int: canint-grp {
+                fsl,pins = <
+                        MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04    0X14 /* SODIMM 73 */
+                >;
+        };
+
+        pinctrl_enet2: enet2-grp {
+                fsl,pins = <
+                        MX6UL_PAD_GPIO1_IO06__ENET2_MDIO        0x1b0b0
+                        MX6UL_PAD_GPIO1_IO07__ENET2_MDC         0x1b0b0
+                        MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0
+                        MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0
+                        MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN      0x1b0b0
+                        MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER      0x1b0b0
+                        MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2  0x4001b031
+                        MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
+                        MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
+                        MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN      0x1b0b0
+                >;
+        };
+
+        pinctrl_ecspi1_cs: ecspi1-cs-grp {
+                fsl,pins = <
+                        MX6UL_PAD_LCD_DATA21__GPIO3_IO26        0x000a0
+                >;
+        };
+
+        pinctrl_ecspi1: ecspi1-grp {
+                fsl,pins = <
+                        MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK       0x000a0
+                        MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI       0x000a0
+                        MX6UL_PAD_LCD_DATA23__ECSPI1_MISO       0x100a0
+                >;
+        };
+
+        pinctrl_flexcan2: flexcan2-grp {
+                fsl,pins = <
+                        MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX   0x1b020
+                        MX6UL_PAD_ENET1_RX_EN__FLEXCAN2_TX      0x1b020
+                >;
+        };
+
+        pinctrl_gpio_bl_on: gpio-bl-on-grp {
+                fsl,pins = <
+                        MX6UL_PAD_JTAG_TMS__GPIO1_IO11          0x000a0
+                >;
+        };
+
+        pinctrl_gpio1: gpio1-grp {
+                fsl,pins = <
+                        MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00    0x74 /* SODIMM 55 */
+                        MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01    0x74 /* SODIMM 63 */
+                        MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25     0X14 /* SODIMM 77 */
+                        MX6UL_PAD_JTAG_TCK__GPIO1_IO14          0x14 /* SODIMM 99 */
+                        MX6UL_PAD_NAND_CE1_B__GPIO4_IO14        0x14 /* SODIMM 133 */
+                        MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24     0x14 /* SODIMM 135 */
+                        MX6UL_PAD_UART3_CTS_B__GPIO1_IO26       0x14 /* SODIMM 100 */
+                        MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15       0x14 /* SODIMM 102 */
+                        MX6UL_PAD_ENET1_RX_ER__GPIO2_IO07       0x14 /* SODIMM 104 */
+                        MX6UL_PAD_UART3_RTS_B__GPIO1_IO27       0x14 /* SODIMM 186 */
+                >;
+        };
+
+        pinctrl_gpio2: gpio2-grp { /* Camera */
+                fsl,pins = <
+                        MX6UL_PAD_CSI_DATA04__GPIO4_IO25        0x74 /* SODIMM 69 */
+                        MX6UL_PAD_CSI_MCLK__GPIO4_IO17          0x14 /* SODIMM 75 */
+                        MX6UL_PAD_CSI_DATA06__GPIO4_IO27        0x14 /* SODIMM 85 */
+                        MX6UL_PAD_CSI_PIXCLK__GPIO4_IO18        0x14 /* SODIMM 96 */
+                        MX6UL_PAD_CSI_DATA05__GPIO4_IO26        0x14 /* SODIMM 98 */
+                >;
+        };
+
+        pinctrl_gpio3: gpio3-grp { /* CAN2 */
+                fsl,pins = <
+                        MX6UL_PAD_ENET1_RX_EN__GPIO2_IO02       0x14 /* SODIMM 178 */
+                        MX6UL_PAD_ENET1_TX_DATA0__GPIO2_IO03    0x14 /* SODIMM 188 */
+                >;
+        };
+
+        pinctrl_gpio4: gpio4-grp {
+                fsl,pins = <
+                        MX6UL_PAD_CSI_DATA07__GPIO4_IO28        0x74 /* SODIMM 65 */
+                >;
+        };
+
+        pinctrl_gpio5: gpio5-grp { /* ATMEL MXT TOUCH */
+                fsl,pins = <
+                        MX6UL_PAD_JTAG_MOD__GPIO1_IO10          0x74 /* SODIMM 106 */
+                >;
+        };
+
+        pinctrl_gpio6: gpio6-grp { /* Wifi pins */
+                fsl,pins = <
+                        MX6UL_PAD_GPIO1_IO03__GPIO1_IO03        0x14 /* SODIMM 89 */
+                        MX6UL_PAD_CSI_DATA02__GPIO4_IO23        0x14 /* SODIMM 79 */
+                        MX6UL_PAD_CSI_VSYNC__GPIO4_IO19         0x14 /* SODIMM 81 */
+                        MX6UL_PAD_CSI_DATA03__GPIO4_IO24        0x14 /* SODIMM 97 */
+                        MX6UL_PAD_CSI_DATA00__GPIO4_IO21        0x14 /* SODIMM 101 */
+                        MX6UL_PAD_CSI_DATA01__GPIO4_IO22        0x14 /* SODIMM 103 */
+                        MX6UL_PAD_CSI_HSYNC__GPIO4_IO20         0x14 /* SODIMM 94 */
+                >;
+        };
+
+        pinctrl_gpmi_nand: gpmi-nand-grp {
+                fsl,pins = <
+                        MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00   0x100a9
+                        MX6UL_PAD_NAND_DATA01__RAWNAND_DATA01   0x100a9
+                        MX6UL_PAD_NAND_DATA02__RAWNAND_DATA02   0x100a9
+                        MX6UL_PAD_NAND_DATA03__RAWNAND_DATA03   0x100a9
+                        MX6UL_PAD_NAND_DATA04__RAWNAND_DATA04   0x100a9
+                        MX6UL_PAD_NAND_DATA05__RAWNAND_DATA05   0x100a9
+                        MX6UL_PAD_NAND_DATA06__RAWNAND_DATA06   0x100a9
+                        MX6UL_PAD_NAND_DATA07__RAWNAND_DATA07   0x100a9
+                        MX6UL_PAD_NAND_CLE__RAWNAND_CLE         0x100a9
+                        MX6UL_PAD_NAND_ALE__RAWNAND_ALE         0x100a9
+                        MX6UL_PAD_NAND_RE_B__RAWNAND_RE_B       0x100a9
+                        MX6UL_PAD_NAND_WE_B__RAWNAND_WE_B       0x100a9
+                        MX6UL_PAD_NAND_CE0_B__RAWNAND_CE0_B     0x100a9
+                        MX6UL_PAD_NAND_READY_B__RAWNAND_READY_B 0x100a9
+                >;
+        };
+
+        pinctrl_i2c1: i2c1-grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
+                        MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
+                >;
+        };
+
+        pinctrl_i2c1_gpio: i2c1-gpio-grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART4_TX_DATA__GPIO1_IO28 0x4001b8b0
+                        MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x4001b8b0
+                >;
+        };
+
+        pinctrl_i2c2: i2c2-grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
+                        MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
+                >;
+        };
+
+        pinctrl_i2c2_gpio: i2c2-gpio-grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART5_TX_DATA__GPIO1_IO30 0x4001b8b0
+                        MX6UL_PAD_UART5_RX_DATA__GPIO1_IO31 0x4001b8b0
+                >;
+        };
+
+        pinctrl_lcdif_dat: lcdif-dat-grp {
+                fsl,pins = <
+                        MX6UL_PAD_LCD_DATA00__LCDIF_DATA00  0x00079
+                        MX6UL_PAD_LCD_DATA01__LCDIF_DATA01  0x00079
+                        MX6UL_PAD_LCD_DATA02__LCDIF_DATA02  0x00079
+                        MX6UL_PAD_LCD_DATA03__LCDIF_DATA03  0x00079
+                        MX6UL_PAD_LCD_DATA04__LCDIF_DATA04  0x00079
+                        MX6UL_PAD_LCD_DATA05__LCDIF_DATA05  0x00079
+                        MX6UL_PAD_LCD_DATA06__LCDIF_DATA06  0x00079
+                        MX6UL_PAD_LCD_DATA07__LCDIF_DATA07  0x00079
+                        MX6UL_PAD_LCD_DATA08__LCDIF_DATA08  0x00079
+                        MX6UL_PAD_LCD_DATA09__LCDIF_DATA09  0x00079
+                        MX6UL_PAD_LCD_DATA10__LCDIF_DATA10  0x00079
+                        MX6UL_PAD_LCD_DATA11__LCDIF_DATA11  0x00079
+                        MX6UL_PAD_LCD_DATA12__LCDIF_DATA12  0x00079
+                        MX6UL_PAD_LCD_DATA13__LCDIF_DATA13  0x00079
+                        MX6UL_PAD_LCD_DATA14__LCDIF_DATA14  0x00079
+                        MX6UL_PAD_LCD_DATA15__LCDIF_DATA15  0x00079
+                        MX6UL_PAD_LCD_DATA16__LCDIF_DATA16  0x00079
+                        MX6UL_PAD_LCD_DATA17__LCDIF_DATA17  0x00079
+                >;
+        };
+
+        pinctrl_lcdif_ctrl: lcdif-ctrl-grp {
+                fsl,pins = <
+                        MX6UL_PAD_LCD_CLK__LCDIF_CLK        0x00079
+                        MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE  0x00079
+                        MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC    0x00079
+                        MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC    0x00079
+                >;
+        };
+
+        pinctrl_pwm4: pwm4-grp {
+                fsl,pins = <
+                        MX6UL_PAD_NAND_WP_B__PWM4_OUT   0x00079
+                >;
+        };
+
+        pinctrl_pwm5: pwm5-grp {
+                fsl,pins = <
+                        MX6UL_PAD_NAND_DQS__PWM5_OUT    0x00079
+                >;
+        };
+
+        pinctrl_pwm6: pwm6-grp {
+                fsl,pins = <
+                        MX6UL_PAD_ENET1_TX_EN__PWM6_OUT 0x00079
+                >;
+        };
+
+        pinctrl_pwm7: pwm7-grp {
+                fsl,pins = <
+                        MX6UL_PAD_ENET1_TX_CLK__PWM7_OUT        0x00079
+                >;
+        };
+
+        pinctrl_uart1: uart1-grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART1_TX_DATA__UART1_DTE_RX   0x1b0b1
+                        MX6UL_PAD_UART1_RX_DATA__UART1_DTE_TX   0x1b0b1
+                        MX6UL_PAD_UART1_RTS_B__UART1_DTE_CTS    0x1b0b1
+                        MX6UL_PAD_UART1_CTS_B__UART1_DTE_RTS    0x1b0b1
+                >;
+        };
+
+        pinctrl_uart1_ctrl1: uart1-ctrl1-grp { /* Additional DTR, DCD */
+                fsl,pins = <
+                        MX6UL_PAD_JTAG_TDI__GPIO1_IO13          0x1b0b1 /* DCD */
+                        MX6UL_PAD_LCD_DATA18__GPIO3_IO23        0x1b0b1 /* DSR */
+                        MX6UL_PAD_JTAG_TDO__GPIO1_IO12          0x1b0b1 /* DTR */
+                        MX6UL_PAD_LCD_DATA19__GPIO3_IO24        0x1b0b1 /* RI */
+                >;
+        };
+
+        pinctrl_uart2: uart2-grp {
+                fsl,pins = <
+                        MX6UL_PAD_UART2_TX_DATA__UART2_DTE_RX   0x1b0b1
+                        MX6UL_PAD_UART2_RX_DATA__UART2_DTE_TX   0x1b0b1
+                        MX6UL_PAD_UART2_CTS_B__UART2_DTE_RTS    0x1b0b1
+                        MX6UL_PAD_UART2_RTS_B__UART2_DTE_CTS    0x1b0b1
+                >;
+        };
+        pinctrl_uart5: uart5-grp {
+                fsl,pins = <
+                        MX6UL_PAD_GPIO1_IO04__UART5_DTE_RX      0x1b0b1
+                        MX6UL_PAD_GPIO1_IO05__UART5_DTE_TX      0x1b0b1
+                >;
+        };
+
+        pinctrl_usbh_reg: gpio-usbh-reg {
+                fsl,pins = <
+                        MX6UL_PAD_GPIO1_IO02__GPIO1_IO02        0x1b0b1 /* SODIMM 129 USBH PEN */
+                >;
+        };
+
+        pinctrl_usdhc1: usdhc1-grp {
+                fsl,pins = <
+                        MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x17059
+                        MX6UL_PAD_SD1_CMD__USDHC1_CMD           0x10059
+                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0       0x17059
+                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1       0x17059
+                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2       0x17059
+                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3       0x17059
+                >;
+        };
+
+        pinctrl_usdhc1_100mhz: usdhc1-100mhz-grp {
+                fsl,pins = <
+                        MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x170b9
+                        MX6UL_PAD_SD1_CMD__USDHC1_CMD           0x100b9
+                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0       0x170b9
+                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1       0x170b9
+                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2       0x170b9
+                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3       0x170b9
+                >;
+        };
+
+        pinctrl_usdhc1_200mhz: usdhc1-200mhz-grp {
+                fsl,pins = <
+                        MX6UL_PAD_SD1_CLK__USDHC1_CLK           0x170f9
+                        MX6UL_PAD_SD1_CMD__USDHC1_CMD           0x100f9
+                        MX6UL_PAD_SD1_DATA0__USDHC1_DATA0       0x170b9
+                        MX6UL_PAD_SD1_DATA1__USDHC1_DATA1       0x170b9
+                        MX6UL_PAD_SD1_DATA2__USDHC1_DATA2       0x170b9
+                        MX6UL_PAD_SD1_DATA3__USDHC1_DATA3       0x170b9
+                >;
+        };
+
+        pinctrl_usdhc2: usdhc2-grp {
+                fsl,pins = <
+                        MX6UL_PAD_CSI_DATA00__USDHC2_DATA0      0x17059
+                        MX6UL_PAD_CSI_DATA01__USDHC2_DATA1      0x17059
+                        MX6UL_PAD_CSI_DATA02__USDHC2_DATA2      0x17059
+                        MX6UL_PAD_CSI_DATA03__USDHC2_DATA3      0x17059
+                        MX6UL_PAD_CSI_HSYNC__USDHC2_CMD         0x17059
+                        MX6UL_PAD_CSI_VSYNC__USDHC2_CLK         0x17059
+
+                        MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT    0x14
+                >;
+        };
+};
+
+&iomuxc_snvs {
+        pinctrl_snvs_gpio1: snvs-gpio1-grp {
+                fsl,pins = <
+                        MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06     0x14 /* SODIMM 93 */
+                        MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03     0x14 /* SODIMM 95 */
+                        MX6ULL_PAD_BOOT_MODE0__GPIO5_IO10       0x74 /* SODIMM 105 */
+                        MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05     0x14 /* SODIMM 131 USBH OC */
+                        MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08     0x74 /* SODIMM 138 */
+                >;
+        };
+
+        pinctrl_snvs_gpio2: snvs-gpio2-grp { /* ATMEL MXT TOUCH */
+                fsl,pins = <
+                        MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04     0x74 /* SODIMM 107 */
+                >;
+        };
+
+        pinctrl_snvs_gpio3: snvs-gpio3-grp { /* Wifi pins */
+                fsl,pins = <
+                        MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11       0x14 /* SODIMM 127 */
+                >;
+        };
+
+        pinctrl_snvs_ad7879_int: snvs-ad7879-int-grp { /* TOUCH Interrupt */
+                fsl,pins = <
+                        MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07     0x1b0b0
+                >;
+        };
+
+        pinctrl_snvs_reg_sd: snvs-reg-sd-grp {
+                fsl,pins = <
+                        MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09     0x4001b8b0
+                >;
+        };
+
+        pinctrl_snvs_usbc_det: snvs-usbc-det-grp {
+                fsl,pins = <
+                        MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02     0x1b0b0
+                >;
+        };
+
+        pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp {
+                fsl,pins = <
+                        MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01     0x130b0
+                >;
+        };
+
+        pinctrl_snvs_usdhc1_cd: snvs-usdhc1-cd-grp {
+                fsl,pins = <
+                        MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00     0x1b0b0 /* CD */
+                >;
+        };
+
+        pinctrl_snvs_wifi_pdn: snvs-wifi-pdn-grp {
+                fsl,pins = <
+                        MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11       0x14
+                >;
+        };
+};
diff --git a/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h b/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h
new file mode 100644
index 000000000000..f6fb6783c193
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-pinfunc-snvs.h
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright (C) 2017 NXP
+ */
+
+#ifndef __DTS_IMX6ULL_PINFUNC_SNVS_H
+#define __DTS_IMX6ULL_PINFUNC_SNVS_H
+/*
+ * The pin function ID is a tuple of
+ * <mux_reg conf_reg input_reg mux_mode input_val>
+ */
+#define MX6ULL_PAD_BOOT_MODE0__GPIO5_IO10                          0x0000 0x0044 0x0000 0x5 0x0
+#define MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11                          0x0004 0x0048 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00                        0x0008 0x004C 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01                        0x000C 0x0050 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02                        0x0010 0x0054 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03                        0x0014 0x0058 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER4__GPIO5_IO04                        0x0018 0x005C 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05                        0x001C 0x0060 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06                        0x0020 0x0064 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07                        0x0024 0x0068 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08                        0x0028 0x006C 0x0000 0x5 0x0
+#define MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09                        0x002C 0x0070 0x0000 0x5 0x0
+
+#endif /* __DTS_IMX6ULL_PINFUNC_SNVS_H */
diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
index 0c182917b863..571ddd71cdba 100644
--- a/arch/arm/boot/dts/imx6ull.dtsi
+++ b/arch/arm/boot/dts/imx6ull.dtsi
@@ -41,3 +41,35 @@
 
 #include "imx6ul.dtsi"
 #include "imx6ull-pinfunc.h"
+#include "imx6ull-pinfunc-snvs.h"
+
+/* Delete UART8 in AIPS-1 (i.MX6UL specific) */
+/delete-node/ &uart8;
+
+/ {
+        soc {
+                aips3: aips-bus@2200000 {
+                        compatible = "fsl,aips-bus", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x02200000 0x100000>;
+                        ranges;
+
+                        iomuxc_snvs: iomuxc-snvs@2290000 {
+                                compatible = "fsl,imx6ull-iomuxc-snvs";
+                                reg = <0x02290000 0x4000>;
+                        };
+
+                        uart8: serial@2288000 {
+                                compatible = "fsl,imx6ul-uart",
+                                             "fsl,imx6q-uart";
+                                reg = <0x02288000 0x4000>;
+                                interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6UL_CLK_UART8_IPG>,
+                                         <&clks IMX6UL_CLK_UART8_SERIAL>;
+                                clock-names = "ipg", "per";
+                                status = "disabled";
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
index ae45af1ad062..7f645683f53b 100644
--- a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
+++ b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts
@@ -18,7 +18,7 @@
         model = "CompuLab CL-SOM-iMX7";
         compatible = "compulab,cl-som-imx7", "fsl,imx7d";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */
         };
 
@@ -213,37 +213,37 @@
 &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
+                        MX7D_PAD_SD2_CD_B__ENET1_MDIO                   0x30
+                        MX7D_PAD_SD2_WP__ENET1_MDC                      0x30
+                        MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC       0x11
+                        MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0       0x11
+                        MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1       0x11
+                        MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2       0x11
+                        MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3       0x11
+                        MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL 0x11
+                        MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC       0x11
+                        MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0       0x11
+                        MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1       0x11
+                        MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2       0x11
+                        MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3       0x11
+                        MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x11
                 >;
         };
 
         pinctrl_enet2: enet2grp {
                 fsl,pins = <
-                        MX7D_PAD_EPDC_GDSP__ENET2_RGMII_TXC             0x1
-                        MX7D_PAD_EPDC_SDCE2__ENET2_RGMII_TD0            0x1
-                        MX7D_PAD_EPDC_SDCE3__ENET2_RGMII_TD1            0x1
-                        MX7D_PAD_EPDC_GDCLK__ENET2_RGMII_TD2            0x1
-                        MX7D_PAD_EPDC_GDOE__ENET2_RGMII_TD3             0x1
-                        MX7D_PAD_EPDC_GDRL__ENET2_RGMII_TX_CTL          0x1
-                        MX7D_PAD_EPDC_SDCE1__ENET2_RGMII_RXC            0x1
-                        MX7D_PAD_EPDC_SDCLK__ENET2_RGMII_RD0            0x1
-                        MX7D_PAD_EPDC_SDLE__ENET2_RGMII_RD1             0x1
-                        MX7D_PAD_EPDC_SDOE__ENET2_RGMII_RD2             0x1
-                        MX7D_PAD_EPDC_SDSHR__ENET2_RGMII_RD3            0x1
-                        MX7D_PAD_EPDC_SDCE0__ENET2_RGMII_RX_CTL         0x1
+                        MX7D_PAD_EPDC_GDSP__ENET2_RGMII_TXC             0x11
+                        MX7D_PAD_EPDC_SDCE2__ENET2_RGMII_TD0            0x11
+                        MX7D_PAD_EPDC_SDCE3__ENET2_RGMII_TD1            0x11
+                        MX7D_PAD_EPDC_GDCLK__ENET2_RGMII_TD2            0x11
+                        MX7D_PAD_EPDC_GDOE__ENET2_RGMII_TD3             0x11
+                        MX7D_PAD_EPDC_GDRL__ENET2_RGMII_TX_CTL          0x11
+                        MX7D_PAD_EPDC_SDCE1__ENET2_RGMII_RXC            0x11
+                        MX7D_PAD_EPDC_SDCLK__ENET2_RGMII_RD0            0x11
+                        MX7D_PAD_EPDC_SDLE__ENET2_RGMII_RD1             0x11
+                        MX7D_PAD_EPDC_SDOE__ENET2_RGMII_RD2             0x11
+                        MX7D_PAD_EPDC_SDSHR__ENET2_RGMII_RD3            0x11
+                        MX7D_PAD_EPDC_SDCE0__ENET2_RGMII_RX_CTL         0x11
                 >;
         };
 
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
index 9b63b9c89e4b..04d24ee17b14 100644
--- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
@@ -7,7 +7,7 @@
 #include "imx7-colibri.dtsi"
 
 / {
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x40000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi b/arch/arm/boot/dts/imx7d-colibri.dtsi
index 6f2bb70c1fbd..d9f8fb69511b 100644
--- a/arch/arm/boot/dts/imx7d-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri.dtsi
@@ -44,7 +44,7 @@
 #include "imx7-colibri.dtsi"
 
 / {
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x20000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index 2b05898bb3f6..52167298984d 100644
--- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
@@ -53,7 +53,7 @@
                 t_lcd = &t_lcd;
         };
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x40000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
index e307462a48ec..21973eb55671 100644
--- a/arch/arm/boot/dts/imx7d-pico.dtsi
+++ b/arch/arm/boot/dts/imx7d-pico.dtsi
@@ -48,7 +48,7 @@
         model = "Technexion Pico i.MX7D Board";
         compatible = "technexion,imx7d-pico", "fsl,imx7d";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x80000000>;
         };
 
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index e7d2db839d70..5d6a08be397f 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -48,7 +48,7 @@
         model = "Freescale i.MX7 SabreSD Board";
         compatible = "fsl,imx7d-sdb", "fsl,imx7d";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x80000000>;
         };
 
@@ -336,6 +336,11 @@
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_i2c2>;
         status = "okay";
+
+        mpl3115@60 {
+                compatible = "fsl,mpl3115";
+                reg = <0x60>;
+        };
 };
 
 &i2c3 {
diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi
index b81013455b21..fe8344cee864 100644
--- a/arch/arm/boot/dts/imx7s-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7s-colibri.dtsi
@@ -44,7 +44,7 @@
 #include "imx7-colibri.dtsi"
 
 / {
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x10000000>;
         };
 };
diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 9bdf121f7e43..8a30b148534d 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -50,7 +50,7 @@
         model = "Warp i.MX7 Board";
         compatible = "warp,imx7s-warp", "fsl,imx7s";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x20000000>;
         };
 
@@ -271,6 +271,15 @@
         status = "okay";
 };
 
+&uart6 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart6>;
+        assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>;
+        assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
+        fsl,dte-mode;
+        status = "okay";
+};
+
 &usbotg1 {
         dr_mode = "peripheral";
         status = "okay";
@@ -379,6 +388,13 @@
                 >;
         };
 
+        pinctrl_uart6: uart6grp {
+                fsl,pins = <
+                        MX7D_PAD_ECSPI1_MOSI__UART6_DTE_RX      0x79
+                        MX7D_PAD_ECSPI1_SCLK__UART6_DTE_TX      0x79
+                >;
+        };
+
         pinctrl_usdhc1: usdhc1grp {
                 fsl,pins = <
                         MX7D_PAD_SD1_CMD__SD1_CMD       0x59
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 9aa2bb998552..4d42335c0dee 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -58,7 +58,7 @@
          * Also for U-Boot there must be a pre-existing /memory node.
          */
         chosen {};
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; };
 
         aliases {
                 gpio0 = &gpio1;
@@ -130,6 +130,12 @@
                 #phy-cells = <0>;
         };
 
+        pmu {
+                compatible = "arm,cortex-a7-pmu";
+                interrupt-parent = <&gpc>;
+                interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-affinity = <&cpu0>;
+        };
 
         replicator {
                 /*
@@ -499,6 +505,14 @@
                                 status = "disabled";
                         };
 
+                        kpp: kpp@30320000 {
+                                compatible = "fsl,imx7d-kpp", "fsl,imx21-kpp";
+                                reg = <0x30320000 0x10000>;
+                                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX7D_KPP_ROOT_CLK>;
+                                status = "disabled";
+                        };
+
                         iomuxc: iomuxc@30330000 {
                                 compatible = "fsl,imx7d-iomuxc";
                                 reg = <0x30330000 0x10000>;
@@ -511,9 +525,29 @@
                         };
 
                         ocotp: ocotp-ctrl@30350000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
                                 compatible = "fsl,imx7d-ocotp", "syscon";
                                 reg = <0x30350000 0x10000>;
                                 clocks = <&clks IMX7D_OCOTP_CLK>;
+
+                                tempmon_calib: calib@3c {
+                                        reg = <0x3c 0x4>;
+                                };
+
+                                tempmon_temp_grade: temp-grade@10 {
+                                        reg = <0x10 0x4>;
+                                };
+                        };
+
+                        tempmon: tempmon {
+                                compatible = "fsl,imx7d-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 IMX7D_PLL_SYS_MAIN_CLK>;
                         };
 
                         anatop: anatop@30360000 {
@@ -551,6 +585,8 @@
                                         offset = <0x34>;
                                         interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
                                                      <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_SNVS_CLK>;
+                                        clock-names = "snvs-rtc";
                                 };
 
                                 snvs_poweroff: snvs-poweroff {
@@ -708,118 +744,156 @@
                         reg = <0x30800000 0x400000>;
                         ranges;
 
-                        ecspi1: ecspi@30820000 {
+                        spba-bus@30800000 {
+                                compatible = "fsl,spba-bus", "simple-bus";
                                 #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
-                                reg = <0x30820000 0x10000>;
-                                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_ECSPI1_ROOT_CLK>,
-                                        <&clks IMX7D_ECSPI1_ROOT_CLK>;
-                                clock-names = "ipg", "per";
-                                status = "disabled";
-                        };
+                                #size-cells = <1>;
+                                reg = <0x30800000 0x100000>;
+                                ranges;
 
-                        ecspi2: ecspi@30830000 {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
-                                reg = <0x30830000 0x10000>;
-                                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_ECSPI2_ROOT_CLK>,
-                                        <&clks IMX7D_ECSPI2_ROOT_CLK>;
-                                clock-names = "ipg", "per";
-                                status = "disabled";
-                        };
+                                ecspi1: ecspi@30820000 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
+                                        reg = <0x30820000 0x10000>;
+                                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_ECSPI1_ROOT_CLK>,
+                                                <&clks IMX7D_ECSPI1_ROOT_CLK>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
 
-                        ecspi3: ecspi@30840000 {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
-                                reg = <0x30840000 0x10000>;
-                                interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_ECSPI3_ROOT_CLK>,
-                                        <&clks IMX7D_ECSPI3_ROOT_CLK>;
-                                clock-names = "ipg", "per";
-                                status = "disabled";
-                        };
+                                ecspi2: ecspi@30830000 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
+                                        reg = <0x30830000 0x10000>;
+                                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_ECSPI2_ROOT_CLK>,
+                                                <&clks IMX7D_ECSPI2_ROOT_CLK>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
 
-                        uart1: serial@30860000 {
-                                compatible = "fsl,imx7d-uart",
-                                             "fsl,imx6q-uart";
-                                reg = <0x30860000 0x10000>;
-                                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_UART1_ROOT_CLK>,
-                                        <&clks IMX7D_UART1_ROOT_CLK>;
-                                clock-names = "ipg", "per";
-                                status = "disabled";
-                        };
+                                ecspi3: ecspi@30840000 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
+                                        reg = <0x30840000 0x10000>;
+                                        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_ECSPI3_ROOT_CLK>,
+                                                <&clks IMX7D_ECSPI3_ROOT_CLK>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
 
-                        uart2: serial@30890000 {
-                                compatible = "fsl,imx7d-uart",
-                                             "fsl,imx6q-uart";
-                                reg = <0x30890000 0x10000>;
-                                interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_UART2_ROOT_CLK>,
-                                        <&clks IMX7D_UART2_ROOT_CLK>;
-                                clock-names = "ipg", "per";
-                                status = "disabled";
-                        };
+                                uart1: serial@30860000 {
+                                        compatible = "fsl,imx7d-uart",
+                                                     "fsl,imx6q-uart";
+                                        reg = <0x30860000 0x10000>;
+                                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_UART1_ROOT_CLK>,
+                                                <&clks IMX7D_UART1_ROOT_CLK>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
 
-                        uart3: serial@30880000 {
-                                compatible = "fsl,imx7d-uart",
-                                             "fsl,imx6q-uart";
-                                reg = <0x30880000 0x10000>;
-                                interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_UART3_ROOT_CLK>,
-                                        <&clks IMX7D_UART3_ROOT_CLK>;
-                                clock-names = "ipg", "per";
-                                status = "disabled";
-                        };
+                                uart2: serial@30890000 {
+                                        compatible = "fsl,imx7d-uart",
+                                                     "fsl,imx6q-uart";
+                                        reg = <0x30890000 0x10000>;
+                                        interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_UART2_ROOT_CLK>,
+                                                <&clks IMX7D_UART2_ROOT_CLK>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
 
-                        sai1: sai@308a0000 {
-                                #sound-dai-cells = <0>;
-                                compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
-                                reg = <0x308a0000 0x10000>;
-                                interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_SAI1_IPG_CLK>,
-                                         <&clks IMX7D_SAI1_ROOT_CLK>,
-                                         <&clks IMX7D_CLK_DUMMY>,
-                                         <&clks IMX7D_CLK_DUMMY>;
-                                clock-names = "bus", "mclk1", "mclk2", "mclk3";
-                                dma-names = "rx", "tx";
-                                dmas = <&sdma 8 24 0>, <&sdma 9 24 0>;
-                                status = "disabled";
-                        };
+                                uart3: serial@30880000 {
+                                        compatible = "fsl,imx7d-uart",
+                                                     "fsl,imx6q-uart";
+                                        reg = <0x30880000 0x10000>;
+                                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_UART3_ROOT_CLK>,
+                                                <&clks IMX7D_UART3_ROOT_CLK>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
 
-                        sai2: sai@308b0000 {
-                                #sound-dai-cells = <0>;
-                                compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
-                                reg = <0x308b0000 0x10000>;
-                                interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_SAI2_IPG_CLK>,
-                                         <&clks IMX7D_SAI2_ROOT_CLK>,
-                                         <&clks IMX7D_CLK_DUMMY>,
-                                         <&clks IMX7D_CLK_DUMMY>;
-                                clock-names = "bus", "mclk1", "mclk2", "mclk3";
-                                dma-names = "rx", "tx";
-                                dmas = <&sdma 10 24 0>, <&sdma 11 24 0>;
-                                status = "disabled";
+                                sai1: sai@308a0000 {
+                                        #sound-dai-cells = <0>;
+                                        compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
+                                        reg = <0x308a0000 0x10000>;
+                                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_SAI1_IPG_CLK>,
+                                                 <&clks IMX7D_SAI1_ROOT_CLK>,
+                                                 <&clks IMX7D_CLK_DUMMY>,
+                                                 <&clks IMX7D_CLK_DUMMY>;
+                                        clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                                        dma-names = "rx", "tx";
+                                        dmas = <&sdma 8 24 0>, <&sdma 9 24 0>;
+                                        status = "disabled";
+                                };
+
+                                sai2: sai@308b0000 {
+                                        #sound-dai-cells = <0>;
+                                        compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
+                                        reg = <0x308b0000 0x10000>;
+                                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_SAI2_IPG_CLK>,
+                                                 <&clks IMX7D_SAI2_ROOT_CLK>,
+                                                 <&clks IMX7D_CLK_DUMMY>,
+                                                 <&clks IMX7D_CLK_DUMMY>;
+                                        clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                                        dma-names = "rx", "tx";
+                                        dmas = <&sdma 10 24 0>, <&sdma 11 24 0>;
+                                        status = "disabled";
+                                };
+
+                                sai3: sai@308c0000 {
+                                        #sound-dai-cells = <0>;
+                                        compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
+                                        reg = <0x308c0000 0x10000>;
+                                        interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX7D_SAI3_IPG_CLK>,
+                                                 <&clks IMX7D_SAI3_ROOT_CLK>,
+                                                 <&clks IMX7D_CLK_DUMMY>,
+                                                 <&clks IMX7D_CLK_DUMMY>;
+                                        clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                                        dma-names = "rx", "tx";
+                                        dmas = <&sdma 12 24 0>, <&sdma 13 24 0>;
+                                        status = "disabled";
+                                };
                         };
 
-                        sai3: sai@308c0000 {
-                                #sound-dai-cells = <0>;
-                                compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
-                                reg = <0x308c0000 0x10000>;
-                                interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks IMX7D_SAI3_IPG_CLK>,
-                                         <&clks IMX7D_SAI3_ROOT_CLK>,
-                                         <&clks IMX7D_CLK_DUMMY>,
-                                         <&clks IMX7D_CLK_DUMMY>;
-                                clock-names = "bus", "mclk1", "mclk2", "mclk3";
-                                dma-names = "rx", "tx";
-                                dmas = <&sdma 12 24 0>, <&sdma 13 24 0>;
-                                status = "disabled";
+                        crypto: caam@30900000 {
+                                compatible = "fsl,sec-v4.0";
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0x30900000 0x40000>;
+                                ranges = <0 0x30900000 0x40000>;
+                                interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX7D_CAAM_CLK>,
+                                         <&clks IMX7D_AHB_CHANNEL_ROOT_CLK>;
+                                clock-names = "ipg", "aclk";
+
+                                sec_jr0: jr0@1000 {
+                                        compatible = "fsl,sec-v4.0-job-ring";
+                                        reg = <0x1000 0x1000>;
+                                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+                                };
+
+                                sec_jr1: jr1@2000 {
+                                        compatible = "fsl,sec-v4.0-job-ring";
+                                        reg = <0x2000 0x1000>;
+                                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                                };
+
+                                sec_jr2: jr1@3000 {
+                                        compatible = "fsl,sec-v4.0-job-ring";
+                                        reg = <0x3000 0x1000>;
+                                        interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+                                };
                         };
 
                         flexcan1: can@30a00000 {
diff --git a/arch/arm/boot/dts/keystone-k2e-clocks.dtsi b/arch/arm/boot/dts/keystone-k2e-clocks.dtsi
index 5e0e7d232161..f7592155a740 100644
--- a/arch/arm/boot/dts/keystone-k2e-clocks.dtsi
+++ b/arch/arm/boot/dts/keystone-k2e-clocks.dtsi
@@ -42,7 +42,7 @@ clocks {
                 domain-id = <0>;
         };
 
-        clkhyperlink0: clkhyperlink02350030 {
+        clkhyperlink0: clkhyperlink0@2350030 {
                 #clock-cells = <0>;
                 compatible = "ti,keystone,psc-clock";
                 clocks = <&chipclk12>;
diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi
index 0bcd3f8a9c45..085e7326ea8e 100644
--- a/arch/arm/boot/dts/keystone-k2e.dtsi
+++ b/arch/arm/boot/dts/keystone-k2e.dtsi
@@ -109,11 +109,14 @@
                         };
                 };
 
-                dspgpio0: keystone_dsp_gpio@2620240 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x240>;
+                devctrl: device-state-control@2620000 {
+                        dspgpio0: keystone_dsp_gpio@240 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x240 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x240>;
+                        };
                 };
 
                 dsp0: dsp@10800000 {
diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
index fd061718dc0a..da78c0034427 100644
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@ -69,6 +69,24 @@
                 interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
         };
 
+        usbphy {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "simple-bus";
+
+                usb0_phy: usb-phy@0 {
+                        compatible = "usb-nop-xceiv";
+                        reg = <0>;
+                        status = "disabled";
+                };
+
+                usb1_phy: usb-phy@1 {
+                        compatible = "usb-nop-xceiv";
+                        reg = <1>;
+                        status = "disabled";
+                };
+        };
+
         soc0: soc@0 {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -97,8 +115,28 @@
                 };
 
                 devctrl: device-state-control@2620000 {
-                        compatible = "ti,keystone-devctrl", "syscon";
+                        compatible = "ti,keystone-devctrl", "syscon", "simple-mfd";
                         reg = <0x02620000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0x0 0x02620000 0x1000>;
+
+                        kirq0: keystone_irq@2a0 {
+                                compatible = "ti,keystone-irq";
+                                reg = <0x2a0 0x10>;
+                                interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                                ti,syscon-dev = <&devctrl 0x2a0>;
+                        };
+
+                        dspgpio0: keystone_dsp_gpio@240 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x240 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x240>;
+                        };
                 };
 
                 uart0: serial@2530c00 {
@@ -113,7 +151,7 @@
                         status = "disabled";
                 };
 
-                uart1: serial@02531000 {
+                uart1: serial@2531000 {
                         compatible = "ti,da830-uart", "ns16550a";
                         current-speed = <115200>;
                         reg-shift = <2>;
@@ -125,7 +163,7 @@
                         status = "disabled";
                 };
 
-                uart2: serial@02531400 {
+                uart2: serial@2531400 {
                         compatible = "ti,da830-uart", "ns16550a";
                         current-speed = <115200>;
                         reg-shift = <2>;
@@ -188,21 +226,6 @@
                         status = "disabled";
                 };
 
-                kirq0: keystone_irq@26202a0 {
-                        compatible = "ti,keystone-irq";
-                        interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;
-                        interrupt-controller;
-                        #interrupt-cells = <1>;
-                        ti,syscon-dev = <&devctrl 0x2a0>;
-                };
-
-                dspgpio0: keystone_dsp_gpio@2620240 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x240>;
-                };
-
                 dsp0: dsp@10800000 {
                         compatible = "ti,k2g-dsp";
                         reg = <0x10800000 0x00100000>,
@@ -460,11 +483,6 @@
                         status = "disabled";
                 };
 
-                usb0_phy: usb-phy@0 {
-                        compatible = "usb-nop-xceiv";
-                        status = "disabled";
-                };
-
                 keystone_usb0: keystone-dwc3@2680000 {
                         compatible = "ti,keystone-dwc3";
                         #address-cells = <1>;
@@ -488,11 +506,6 @@
                         };
                 };
 
-                usb1_phy: usb-phy@1 {
-                        compatible = "usb-nop-xceiv";
-                        status = "disabled";
-                };
-
                 keystone_usb1: keystone-dwc3@2580000 {
                         compatible = "ti,keystone-dwc3";
                         #address-cells = <1>;
@@ -583,5 +596,18 @@
                         power-domains = <&k2g_pds 0x0013>;
                         clocks = <&k2g_clks 0x0013 0>;
                 };
+
+                wdt: wdt@02250000 {
+                        compatible = "ti,keystone-wdt", "ti,davinci-wdt";
+                        reg = <0x02250000 0x80>;
+                        power-domains = <&k2g_pds 0x22>;
+                        clocks = <&k2g_clks 0x22 0>;
+                };
+
+                emif: emif@21010000 {
+                        compatible = "ti,emif-keystone";
+                        reg = <0x21010000 0x200>;
+                        interrupts = <GIC_SPI 123 IRQ_TYPE_EDGE_RISING>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi
index ed59474522cb..ca0f198ba627 100644
--- a/arch/arm/boot/dts/keystone-k2hk.dtsi
+++ b/arch/arm/boot/dts/keystone-k2hk.dtsi
@@ -87,60 +87,70 @@
                         };
                 };
 
-                dspgpio0: keystone_dsp_gpio@2620240 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x240>;
-                };
+                devctrl: device-state-control@2620000 {
+                        dspgpio0: keystone_dsp_gpio@240 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x240 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x240>;
+                        };
 
-                dspgpio1: keystone_dsp_gpio@2620244 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x244>;
-                };
+                        dspgpio1: keystone_dsp_gpio@244 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x244 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x244>;
+                        };
 
-                dspgpio2: keystone_dsp_gpio@2620248 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x248>;
-                };
+                        dspgpio2: keystone_dsp_gpio@248 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x248 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x248>;
+                        };
 
-                dspgpio3: keystone_dsp_gpio@262024c {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x24c>;
-                };
+                        dspgpio3: keystone_dsp_gpio@24c {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x24c 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x24c>;
+                        };
 
-                dspgpio4: keystone_dsp_gpio@2620250 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x250>;
-                };
+                        dspgpio4: keystone_dsp_gpio@250 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x250 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x250>;
+                        };
 
-                dspgpio5: keystone_dsp_gpio@2620254 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x254>;
-                };
+                        dspgpio5: keystone_dsp_gpio@254 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x254 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x254>;
+                        };
 
-                dspgpio6: keystone_dsp_gpio@2620258 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x258>;
-                };
+                        dspgpio6: keystone_dsp_gpio@258 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x258 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x258>;
+                        };
 
-                dspgpio7: keystone_dsp_gpio@262025c {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x25c>;
+                        dspgpio7: keystone_dsp_gpio@25c {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x25c 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x25c>;
+                        };
                 };
 
                 dsp0: dsp@10800000 {
diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi
index b61a830f4a4d..374c80124c4e 100644
--- a/arch/arm/boot/dts/keystone-k2l.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l.dtsi
@@ -289,32 +289,38 @@
                         clocks = <&clkosr>;
                 };
 
-                dspgpio0: keystone_dsp_gpio@2620240 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x240>;
-                };
+                devctrl: device-state-control@2620000 {
+                        dspgpio0: keystone_dsp_gpio@240 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x240 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x240>;
+                        };
 
-                dspgpio1: keystone_dsp_gpio@2620244 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x244>;
-                };
+                        dspgpio1: keystone_dsp_gpio@244 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x244 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x244>;
+                        };
 
-                dspgpio2: keystone_dsp_gpio@2620248 {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x248>;
-                };
+                        dspgpio2: keystone_dsp_gpio@248 {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x248 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x248>;
+                        };
 
-                dspgpio3: keystone_dsp_gpio@262024c {
-                        compatible = "ti,keystone-dsp-gpio";
-                        gpio-controller;
-                        #gpio-cells = <2>;
-                        gpio,syscon-dev = <&devctrl 0x24c>;
+                        dspgpio3: keystone_dsp_gpio@24c {
+                                compatible = "ti,keystone-dsp-gpio";
+                                reg = <0x24c 0x4>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                gpio,syscon-dev = <&devctrl 0x24c>;
+                        };
                 };
 
                 dsp0: dsp@10800000 {
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 93ea5c69ea77..c298675a29a5 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -87,15 +87,28 @@
                 };
 
                 devctrl: device-state-control@2620000 {
-                        compatible = "ti,keystone-devctrl", "syscon";
+                        compatible = "ti,keystone-devctrl", "syscon", "simple-mfd";
                         reg = <0x02620000 0x1000>;
-                };
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0x0 0x02620000 0x1000>;
+
+                        kirq0: keystone_irq@2a0 {
+                                compatible = "ti,keystone-irq";
+                                reg = <0x2a0 0x4>;
+                                interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                                ti,syscon-dev = <&devctrl 0x2a0>;
+                        };
 
-                rstctrl: reset-controller {
-                        compatible = "ti,keystone-reset";
-                        ti,syscon-pll = <&pllctrl 0xe4>;
-                        ti,syscon-dev = <&devctrl 0x328>;
-                        ti,wdt-list = <0>;
+                        rstctrl: reset-controller@328 {
+                                compatible = "ti,keystone-reset";
+                                reg = <0x328 0x10>;
+                                ti,syscon-pll = <&pllctrl 0xe4>;
+                                ti,syscon-dev = <&devctrl 0x328>;
+                                ti,wdt-list = <0>;
+                        };
                 };
 
                 /include/ "keystone-clocks.dtsi"
@@ -282,14 +295,6 @@
                                   1 0 0x21000A00 0x00000100>;
                 };
 
-                kirq0: keystone_irq@26202a0 {
-                        compatible = "ti,keystone-irq";
-                        interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
-                        interrupt-controller;
-                        #interrupt-cells = <1>;
-                        ti,syscon-dev = <&devctrl 0x2a0>;
-                };
-
                 pcie0: pcie@21800000 {
                         compatible = "ti,keystone-pcie", "snps,dw-pcie";
                         clocks = <&clkpcie>;
@@ -338,5 +343,12 @@
                                         <GIC_SPI 29 IRQ_TYPE_EDGE_RISING>;
                         };
                 };
+
+                emif: emif@21010000 {
+                        compatible = "ti,emif-keystone";
+                        reg = <0x21010000 0x200>;
+                        interrupts = <GIC_SPI 448 IRQ_TYPE_EDGE_RISING>;
+                        interrupt-parent = <&gic>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts
index d091ecb61cd2..17f48f88a983 100644
--- a/arch/arm/boot/dts/kirkwood-b3.dts
+++ b/arch/arm/boot/dts/kirkwood-b3.dts
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for Excito Bubba B3
  *
  * Copyright (C) 2013, Andrew Lunn <andrew@lunn.ch>
  *
- * This program 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.
  *
  * Note: This requires a new'ish version of u-boot, which disables the
  * L2 cache. If your B3 silently fails to boot, u-boot is probably too
diff --git a/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts b/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
index f16a73e49a88..07fbfca444d5 100644
--- a/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
+++ b/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for Seagate Blackarmor NAS220
  *
  * Copyright (C) 2014 Evgeni Dobrev <evgeni@studio-punkt.com>
- *
- * Licensed under GPLv2 or later.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-d2net.dts b/arch/arm/boot/dts/kirkwood-d2net.dts
index e1c25c35e9ce..bd3b266dd766 100644
--- a/arch/arm/boot/dts/kirkwood-d2net.dts
+++ b/arch/arm/boot/dts/kirkwood-d2net.dts
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for d2 Network v2
  *
  * Copyright (C) 2014 Simon Guinot <simon.guinot@sequanux.org>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
 */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6281.dts b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
index aee6f02b1c80..2adb17c955aa 100644
--- a/arch/arm/boot/dts/kirkwood-db-88f6281.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell DB-88F6281-BP Development Board Setup
  *
  * Saeed Bishara <saeed@marvell.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6282.dts b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
index e8b23e13ec0c..f84a48539917 100644
--- a/arch/arm/boot/dts/kirkwood-db-88f6282.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell DB-88F6282-BP Development Board Setup
  *
  * Saeed Bishara <saeed@marvell.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index 812df691ae3d..6fe2e31534af 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell DB-{88F6281,88F6282}-BP Development Board Setup
  *
  * Saeed Bishara <saeed@marvell.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions that are common between the 6281
  * and 6282 variants of the Marvell Kirkwood Development Board.
  */
diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts
index 4d2b15d6244a..31ceacd841de 100644
--- a/arch/arm/boot/dts/kirkwood-dir665.dts
+++ b/arch/arm/boot/dts/kirkwood-dir665.dts
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Claudio Leite <leitec@staticky.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds109.dts b/arch/arm/boot/dts/kirkwood-ds109.dts
index d4bcc1c7f6b3..29982e7acb7f 100644
--- a/arch/arm/boot/dts/kirkwood-ds109.dts
+++ b/arch/arm/boot/dts/kirkwood-ds109.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds110jv10.dts b/arch/arm/boot/dts/kirkwood-ds110jv10.dts
index 95bf83b91b4a..d68c616e9309 100644
--- a/arch/arm/boot/dts/kirkwood-ds110jv10.dts
+++ b/arch/arm/boot/dts/kirkwood-ds110jv10.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds111.dts b/arch/arm/boot/dts/kirkwood-ds111.dts
index a85a4664431b..e1420cbcd7e4 100644
--- a/arch/arm/boot/dts/kirkwood-ds111.dts
+++ b/arch/arm/boot/dts/kirkwood-ds111.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds112.dts b/arch/arm/boot/dts/kirkwood-ds112.dts
index 6cef4bdbc01b..f48609e95afe 100644
--- a/arch/arm/boot/dts/kirkwood-ds112.dts
+++ b/arch/arm/boot/dts/kirkwood-ds112.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds209.dts b/arch/arm/boot/dts/kirkwood-ds209.dts
index 6d25093a9ac4..f41fe95e055f 100644
--- a/arch/arm/boot/dts/kirkwood-ds209.dts
+++ b/arch/arm/boot/dts/kirkwood-ds209.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds210.dts b/arch/arm/boot/dts/kirkwood-ds210.dts
index 2f1933efcac1..729f959a7838 100644
--- a/arch/arm/boot/dts/kirkwood-ds210.dts
+++ b/arch/arm/boot/dts/kirkwood-ds210.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds212.dts b/arch/arm/boot/dts/kirkwood-ds212.dts
index 7f32e7abffac..416bab50d170 100644
--- a/arch/arm/boot/dts/kirkwood-ds212.dts
+++ b/arch/arm/boot/dts/kirkwood-ds212.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds212j.dts b/arch/arm/boot/dts/kirkwood-ds212j.dts
index f5c4213fc67c..14cf4d8afaf3 100644
--- a/arch/arm/boot/dts/kirkwood-ds212j.dts
+++ b/arch/arm/boot/dts/kirkwood-ds212j.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds409.dts b/arch/arm/boot/dts/kirkwood-ds409.dts
index e80a962ebba0..a8650f9e3eb7 100644
--- a/arch/arm/boot/dts/kirkwood-ds409.dts
+++ b/arch/arm/boot/dts/kirkwood-ds409.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds409slim.dts b/arch/arm/boot/dts/kirkwood-ds409slim.dts
index cae5af4b88b5..27a1d840bd15 100644
--- a/arch/arm/boot/dts/kirkwood-ds409slim.dts
+++ b/arch/arm/boot/dts/kirkwood-ds409slim.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds411.dts b/arch/arm/boot/dts/kirkwood-ds411.dts
index 72e58307416d..86907be70cf9 100644
--- a/arch/arm/boot/dts/kirkwood-ds411.dts
+++ b/arch/arm/boot/dts/kirkwood-ds411.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds411j.dts b/arch/arm/boot/dts/kirkwood-ds411j.dts
index 3348e330f074..bb3200daea1e 100644
--- a/arch/arm/boot/dts/kirkwood-ds411j.dts
+++ b/arch/arm/boot/dts/kirkwood-ds411j.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ds411slim.dts b/arch/arm/boot/dts/kirkwood-ds411slim.dts
index aaaf31b81522..9c5364a4e0a8 100644
--- a/arch/arm/boot/dts/kirkwood-ds411slim.dts
+++ b/arch/arm/boot/dts/kirkwood-ds411slim.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts
index 1b0f070c2676..6158214a939a 100644
--- a/arch/arm/boot/dts/kirkwood-laplug.dts
+++ b/arch/arm/boot/dts/kirkwood-laplug.dts
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2013 Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi
index b9125e5ed076..377b6e970259 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree common file for kirkwood-6282 based Buffalo Linkstation
  *
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.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, 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 "kirkwood.dtsi"
diff --git a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi
index 29d929535453..ba629e02ba31 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree common file for kirkwood-6281 based 2-Bay Buffalo Linkstation
  *
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.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, 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 "kirkwood.dtsi"
diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts
index 9cc05203baee..8bb381088910 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts
+++ b/arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Buffalo Linkstation LS-QVL
  *
@@ -6,44 +7,6 @@
  * Based on kirkwood-linkstation-lswvl.dts,
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts
index ff37e76ab551..3f2a0bfe03ed 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts
+++ b/arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Buffalo Linkstation LS-VL
  *
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts
index f602c059c718..c42d0da38fe7 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts
+++ b/arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Buffalo Linkstation LS-WSXL
  *
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts
index ef8fc1a077f8..e0f62adc0d5d 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts
+++ b/arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Buffalo Linkstation LS-WVL
  *
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts
index ce41d553b693..c6024b569423 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts
+++ b/arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Buffalo Linkstation LS-WXL
  *
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.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, 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-linkstation.dtsi b/arch/arm/boot/dts/kirkwood-linkstation.dtsi
index b459042a904a..407d6d8b3a7f 100644
--- a/arch/arm/boot/dts/kirkwood-linkstation.dtsi
+++ b/arch/arm/boot/dts/kirkwood-linkstation.dtsi
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree common file for kirkwood based Buffalo Linkstation
  *
  * Copyright (C) 2015, 2016
  * Roger Shimizu <rogershimizu@gmail.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, 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.
  */
 
 / {
diff --git a/arch/arm/boot/dts/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
index f21a50dd9869..a7d659b7145a 100644
--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kirkwood-viper.dts - Device Tree file for Linksys viper (E4200v2 / EA4500)
  *
@@ -6,9 +7,6 @@
  * (c) 2014 Luka Perkov <luka@openwrt.org>
  * (c) 2014 Randy C. Will <randall.will@gmail.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index 327023a477b8..86d532916d56 100644
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell 88F6281 GTW GE Board
  *
  * Lennert Buytenhek <buytenh@marvell.com>
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions that are common between the 6281
  * and 6282 variants of the Marvell Kirkwood Development Board.
  */
diff --git a/arch/arm/boot/dts/kirkwood-nas2big.dts b/arch/arm/boot/dts/kirkwood-nas2big.dts
index f53bcacf6b63..6a2934b7d0ce 100644
--- a/arch/arm/boot/dts/kirkwood-nas2big.dts
+++ b/arch/arm/boot/dts/kirkwood-nas2big.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for LaCie 2Big NAS
  *
@@ -5,9 +6,6 @@
  *
  * Author: Simon Guinot <simon.guinot@sequanux.org>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
 */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-net2big.dts b/arch/arm/boot/dts/kirkwood-net2big.dts
index 13a44773b6df..3e3ac289e5b0 100644
--- a/arch/arm/boot/dts/kirkwood-net2big.dts
+++ b/arch/arm/boot/dts/kirkwood-net2big.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for LaCie 2Big Network v2
  *
@@ -8,9 +9,6 @@
  * Based on netxbig_v2-setup.c,
  * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
 */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
index d2d44df9c8c0..cba8a2b6f6d9 100644
--- a/arch/arm/boot/dts/kirkwood-net5big.dts
+++ b/arch/arm/boot/dts/kirkwood-net5big.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for LaCie 5Big Network v2
  *
@@ -8,9 +9,6 @@
  * Based on netxbig_v2-setup.c,
  * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
 */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index c0413b63cf2e..cb564c3bcdc4 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for NETGEAR ReadyNAS Duo v2
  *
  * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- *
- * This program 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
index 2bfc6cfa151d..8cc8550242ef 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for NETGEAR ReadyNAS NV+ v2
  *
  * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- *
- * This program 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
index 52b58fe0c4fe..b5737026e244 100644
--- a/arch/arm/boot/dts/kirkwood-netxbig.dtsi
+++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree common file for LaCie 2Big and 5Big Network v2
  *
@@ -8,9 +9,6 @@
  * Based on netxbig_v2-setup.c,
  * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
 */
 
 #include <dt-bindings/leds/leds-netxbig.h>
diff --git a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
index 6ab104b4bb42..b69b096f267b 100644
--- a/arch/arm/boot/dts/kirkwood-nsa320.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa320.dts
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /* Device tree file for the Zyxel NSA 320 NAS box.
  *
  * Copyright (c) 2014, Adam Baker <linux@baker-net.org.uk>
  *
- * This program 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.
  *
  * Based upon the board setup file created by Peter Schildmann */
 
diff --git a/arch/arm/boot/dts/kirkwood-nsa325.dts b/arch/arm/boot/dts/kirkwood-nsa325.dts
index 36c64816bf7f..6f8085dbb1f4 100644
--- a/arch/arm/boot/dts/kirkwood-nsa325.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa325.dts
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /* Device tree file for the Zyxel NSA 325 NAS box.
  *
  * Copyright (c) 2015, Hans Ulli Kroll <ulli.kroll@googlemail.com>
  *
- * This program 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.
  *
  * Based upon the board setup file created by Peter Schildmann
  */
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 27cc913ca0f5..946f0f453dd1 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for OpenBlocks A7 board
  *
@@ -5,9 +6,6 @@
  *
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-openrd-base.dts b/arch/arm/boot/dts/kirkwood-openrd-base.dts
index 8af58999606d..094191ece3d7 100644
--- a/arch/arm/boot/dts/kirkwood-openrd-base.dts
+++ b/arch/arm/boot/dts/kirkwood-openrd-base.dts
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell OpenRD Base Board Description
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions that are specific to OpenRD
  * base variant of the Marvell Kirkwood Development Board.
  */
diff --git a/arch/arm/boot/dts/kirkwood-openrd-client.dts b/arch/arm/boot/dts/kirkwood-openrd-client.dts
index 96ff59d68f44..d4e0b8150a84 100644
--- a/arch/arm/boot/dts/kirkwood-openrd-client.dts
+++ b/arch/arm/boot/dts/kirkwood-openrd-client.dts
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell OpenRD Client Board Description
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions that are specific to OpenRD
  * client variant of the Marvell Kirkwood Development Board.
  */
diff --git a/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts b/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
index 9f12f8b53e24..888e13320c19 100644
--- a/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
+++ b/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell OpenRD Ultimate Board Description
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions that are specific to OpenRD
  * ultimate variant of the Marvell Kirkwood Development Board.
  */
diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
index 7175511a92da..47f03c69c55a 100644
--- a/arch/arm/boot/dts/kirkwood-openrd.dtsi
+++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell OpenRD (Base|Client|Ultimate) Board Description
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions that are common between the three
  * variants of the Marvell Kirkwood Development Board.
  */
diff --git a/arch/arm/boot/dts/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
index a190080c9c4f..f9e95e55f36d 100644
--- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts
+++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kirkwood-pogo_e02.dts - Device tree file for Pogoplug E02
  *
@@ -7,9 +8,6 @@
  *  Arch Linux ARM by Oleg Rakhmanov <moonman.ca@gmail.com>
  *  OpenWrt by Felix Kaechele <heffer@fedoraproject.org>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
index 5ce220ac9611..5aa4669ae254 100644
--- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
+++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
@@ -35,7 +35,7 @@
                 pinctrl-names = "default";
 
                 eject {
-                        debounce_interval = <50>;
+                        debounce-interval = <50>;
                         wakeup-source;
                         linux,code = <KEY_EJECTCD>;
                         label = "Eject Button";
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
index b8af907249fb..712d6042b132 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6192.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell RD88F6192 Board descrition
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions that are common between the three
  * variants of the Marvell Kirkwood Development Board.
  */
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
index 9ec5a65561e9..5da163591bbf 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell RD88F6181 A Board descrition
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions for the board with the A0 or
  * higher stepping of the SoC. The ethernet switch does not have a
  * "wan" port.
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
index 6a4a65ec7944..a9fee2c2bcaf 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell RD88F6181 Z0 stepping descrition
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions for the board using the Z0
  * stepping of the SoC. The ethernet switch has a "wan" port.
 */
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index 91f5da5dae5f..0f22f0e6f56b 100644
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell RD88F6181 Common Board descrition
  *
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
  * This file contains the definitions that are common between the two
  * variants of the Marvell Kirkwood Development Board.
  */
diff --git a/arch/arm/boot/dts/kirkwood-rs212.dts b/arch/arm/boot/dts/kirkwood-rs212.dts
index 2c722ecd5331..c51cea883215 100644
--- a/arch/arm/boot/dts/kirkwood-rs212.dts
+++ b/arch/arm/boot/dts/kirkwood-rs212.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-rs409.dts b/arch/arm/boot/dts/kirkwood-rs409.dts
index 921ca49e85a4..43673b03cb35 100644
--- a/arch/arm/boot/dts/kirkwood-rs409.dts
+++ b/arch/arm/boot/dts/kirkwood-rs409.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-rs411.dts b/arch/arm/boot/dts/kirkwood-rs411.dts
index 02852b0c809f..41fa63cec839 100644
--- a/arch/arm/boot/dts/kirkwood-rs411.dts
+++ b/arch/arm/boot/dts/kirkwood-rs411.dts
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index 7196c7f3e109..0a698d3b7393 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kirkwood-sheevaplug-common.dtsi - Common parts for Sheevaplugs
  *
  * Copyright (C) 2013 Simon Baatz <gmbnomis@gmail.com>
- *
- * Licensed under GPLv2
  */
 
 #include "kirkwood.dtsi"
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
index e2b4ea4f9e10..ae8f493c9a0f 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kirkwood-sheevaplug-esata.dts - Device tree file for eSATA Sheevaplug
  *
  * Copyright (C) 2013 Simon Baatz <gmbnomis@gmail.com>
- *
- * Licensed under GPLv2
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug.dts b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
index 82f6abf120fd..c73cc904e5c4 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kirkwood-sheevaplug.dts - Device tree file for Sheevaplug
  *
  * Copyright (C) 2013 Simon Baatz <gmbnomis@gmail.com>
- *
- * Licensed under GPLv2
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-synology.dtsi b/arch/arm/boot/dts/kirkwood-synology.dtsi
index 210d21a65bd1..c97ed29a0a0b 100644
--- a/arch/arm/boot/dts/kirkwood-synology.dtsi
+++ b/arch/arm/boot/dts/kirkwood-synology.dtsi
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Nodes for Marvell 628x Synology devices
  *
  * Andrew Lunn <andrew@lunn.ch>
  * Ben Peddell <klightspeed@killerwolves.net>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 / {
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index 3500f4738fb0..fe63b3a03a72 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for HP t5325 Thin Client"
  *
@@ -6,9 +7,6 @@
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  * Andrew Lunn <andrew@lunn.ch>
  *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
 */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ts419-6281.dts b/arch/arm/boot/dts/kirkwood-ts419-6281.dts
index aa22aa862857..4a42ebcca4f0 100644
--- a/arch/arm/boot/dts/kirkwood-ts419-6281.dts
+++ b/arch/arm/boot/dts/kirkwood-ts419-6281.dts
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for QNAP TS41X with 6281 SoC
  *
  * Copyright (C) 2013, Andrew Lunn <andrew@lunn.ch>
- *
- * This program 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ts419-6282.dts b/arch/arm/boot/dts/kirkwood-ts419-6282.dts
index e3e71f48acc8..be772e194c2b 100644
--- a/arch/arm/boot/dts/kirkwood-ts419-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts419-6282.dts
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree file for QNAP TS41X with 6282 SoC
  *
  * Copyright (C) 2013, Andrew Lunn <andrew@lunn.ch>
- *
- * This program 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.
  */
 
 /dts-v1/;
diff --git a/arch/arm/boot/dts/kirkwood-ts419.dtsi b/arch/arm/boot/dts/kirkwood-ts419.dtsi
index 02bd53762705..717236853e45 100644
--- a/arch/arm/boot/dts/kirkwood-ts419.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts419.dtsi
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Device Tree include file for QNAP TS41X
  *
  * Copyright (C) 2013, Andrew Lunn <andrew@lunn.ch>
- *
- * This program 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.
  */
 
 / {
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index eb2bf7409655..81c7eda2c442 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -382,7 +382,7 @@
 
                 audio0: audio-controller@a0000 {
                         compatible = "marvell,kirkwood-audio";
-                        #sound-dai-cells = <1>;
+                        #sound-dai-cells = <0>;
                         reg = <0xa0000 0x2210>;
                         interrupts = <24>;
                         clocks = <&gate_clk 9>;
diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
index a30ee9fcb3ae..b47cac23a04b 100644
--- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
+++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
@@ -88,10 +88,14 @@
 };
 
 &i2c2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c2_pins>;
         clock-frequency = <400000>;
 };
 
 &i2c3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c3_pins>;
         clock-frequency = <400000>;
 };
 
@@ -213,6 +217,18 @@
                         OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)        /* sys_boot1.gpio_3 */
                 >;
         };
+        i2c2_pins: pinmux_i2c2_pins {
+                pinctrl-single,pins = <
+                        OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)        /* i2c2_scl */
+                        OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)        /* i2c2_sda */
+                >;
+        };
+        i2c3_pins: pinmux_i2c3_pins {
+                pinctrl-single,pins = <
+                        OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)        /* i2c3_scl */
+                        OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)        /* i2c3_sda */
+                >;
+        };
 };
 
 &omap3_pmx_core2 {
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 47915447a826..3e174e474d3d 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -83,10 +83,14 @@
 };
 
 &i2c2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c2_pins>;
         clock-frequency = <400000>;
 };
 
 &i2c3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c3_pins>;
         clock-frequency = <400000>;
         at24@50 {
                 compatible = "atmel,24c64";
@@ -144,6 +148,18 @@
                         OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */
                 >;
         };
+        i2c2_pins: pinmux_i2c2_pins {
+                pinctrl-single,pins = <
+                        OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)        /* i2c2_scl */
+                        OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)        /* i2c2_sda */
+                >;
+        };
+        i2c3_pins: pinmux_i2c3_pins {
+                pinctrl-single,pins = <
+                        OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)        /* i2c3_scl */
+                        OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)        /* i2c3_sda */
+                >;
+        };
 };
 
 &uart2 {
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index c31dad98f989..fbd2897566c3 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -788,5 +788,21 @@
                         clock-names = "ipg", "per";
                         big-endian;
                 };
+
+                ocram1: sram@10000000 {
+                        compatible = "mmio-sram";
+                        reg = <0x0 0x10000000 0x0 0x10000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0x0 0x0 0x10000000 0x10000>;
+                };
+
+                ocram2: sram@10010000 {
+                        compatible = "mmio-sram";
+                        reg = <0x0 0x10010000 0x0 0x10000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0x0 0x0 0x10010000 0x10000>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index d2e3eeaa1a5f..dcc9292d2ffa 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -46,6 +46,7 @@
 #include <dt-bindings/clock/meson8b-clkc.h>
 #include <dt-bindings/gpio/meson8-gpio.h>
 #include <dt-bindings/reset/amlogic,meson8b-clkc-reset.h>
+#include <dt-bindings/reset/amlogic,meson8b-reset.h>
 #include "meson.dtsi"
 
 / {
@@ -187,6 +188,12 @@
                 reg = <0x8000 0x4>, <0x4000 0x460>;
         };
 
+        reset: reset-controller@4404 {
+                compatible = "amlogic,meson8b-reset";
+                reg = <0x4404 0x9c>;
+                #reset-cells = <1>;
+        };
+
         analog_top: analog-top@81a8 {
                 compatible = "amlogic,meson8-analog-top", "syscon";
                 reg = <0x81a8 0x14>;
@@ -383,10 +390,12 @@
         compatible = "amlogic,meson8-usb2-phy", "amlogic,meson-mx-usb2-phy";
         clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>;
         clock-names = "usb_general", "usb";
+        resets = <&reset RESET_USB_OTG>;
 };
 
 &usb1_phy {
         compatible = "amlogic,meson8-usb2-phy", "amlogic,meson-mx-usb2-phy";
         clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1>;
         clock-names = "usb_general", "usb";
+        resets = <&reset RESET_USB_OTG>;
 };
diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts
index 9ff6ca4e20d0..3a5603d95b70 100644
--- a/arch/arm/boot/dts/meson8b-odroidc1.dts
+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts
@@ -54,6 +54,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                mmc0 = &sd_card_slot;
         };
 
         memory {
@@ -69,6 +70,37 @@
                         default-state = "off";
                 };
         };
+
+        tflash_vdd: regulator-tflash_vdd {
+                /*
+                 * signal name from schematics: TFLASH_VDD_EN
+                 */
+                compatible = "regulator-fixed";
+
+                regulator-name = "TFLASH_VDD";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+
+                gpio = <&gpio GPIOY_12 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        tf_io: gpio-regulator-tf_io {
+                compatible = "regulator-gpio";
+
+                regulator-name = "TF_IO";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <3300000>;
+
+                /*
+                 * signal name from schematics: TF_3V3N_1V8_EN
+                 */
+                gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
+                gpios-states = <0>;
+
+                states = <3300000 0
+                          1800000 1>;
+        };
 };
 
 &uart_AO {
@@ -99,3 +131,59 @@
 &usb1 {
         status = "okay";
 };
+
+&sdio {
+        status = "okay";
+
+        pinctrl-0 = <&sd_b_pins>;
+        pinctrl-names = "default";
+
+        /* SD card */
+        sd_card_slot: slot@1 {
+                compatible = "mmc-slot";
+                reg = <1>;
+                status = "okay";
+
+                bus-width = <4>;
+                no-sdio;
+                cap-mmc-highspeed;
+                cap-sd-highspeed;
+                disable-wp;
+
+                cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
+                cd-inverted;
+
+                vmmc-supply = <&tflash_vdd>;
+                vqmmc-supply = <&tf_io>;
+        };
+};
+
+&ethmac {
+        status = "okay";
+
+        snps,reset-gpio = <&gpio GPIOH_4 GPIO_ACTIVE_HIGH>;
+        snps,reset-active-low;
+        snps,reset-delays-us = <0 10000 30000>;
+
+        pinctrl-0 = <&eth_rgmii_pins>;
+        pinctrl-names = "default";
+
+        phy-mode = "rgmii";
+        phy-handle = <&eth_phy>;
+        amlogic,tx-delay-ns = <4>;
+
+        mdio {
+                compatible = "snps,dwmac-mdio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                /* Realtek RTL8211F (0x001cc916) */
+                eth_phy: ethernet-phy@0 {
+                        reg = <0>;
+                        eee-broken-1000t;
+                        interrupt-parent = <&gpio_intc>;
+                        /* GPIOH_3 */
+                        interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index 7cd03ed3742e..553b82174604 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -152,7 +152,7 @@
 
         reset: reset-controller@4404 {
                 compatible = "amlogic,meson8b-reset";
-                reg = <0x4404 0x20>;
+                reg = <0x4404 0x9c>;
                 #reset-cells = <1>;
         };
 
@@ -183,7 +183,36 @@
                         reg-names = "mux", "pull", "pull-enable", "gpio";
                         gpio-controller;
                         #gpio-cells = <2>;
-                        gpio-ranges = <&pinctrl_cbus 0 0 130>;
+                        gpio-ranges = <&pinctrl_cbus 0 0 83>;
+                };
+
+                eth_rgmii_pins: eth-rgmii {
+                        mux {
+                                groups = "eth_tx_clk",
+                                         "eth_tx_en",
+                                         "eth_txd1_0",
+                                         "eth_txd1_1",
+                                         "eth_txd0_0",
+                                         "eth_txd0_1",
+                                         "eth_rx_clk",
+                                         "eth_rx_dv",
+                                         "eth_rxd1",
+                                         "eth_rxd0",
+                                         "eth_mdio_en",
+                                         "eth_mdc",
+                                         "eth_ref_clk",
+                                         "eth_txd2",
+                                         "eth_txd3";
+                                function = "ethernet";
+                        };
+                };
+
+                sd_b_pins: sd-b {
+                        mux {
+                                groups = "sd_d0_b", "sd_d1_b", "sd_d2_b",
+                                        "sd_d3_b", "sd_clk_b", "sd_cmd_b";
+                                function = "sd_b";
+                        };
                 };
         };
 };
@@ -203,8 +232,18 @@
 };
 
 &ethmac {
-        clocks = <&clkc CLKID_ETH>;
-        clock-names = "stmmaceth";
+        compatible = "amlogic,meson8b-dwmac", "snps,dwmac-3.70a", "snps,dwmac";
+
+        reg = <0xc9410000 0x10000
+               0xc1108140 0x4>;
+
+        clocks = <&clkc CLKID_ETH>,
+                 <&clkc CLKID_MPLL2>,
+                 <&clkc CLKID_MPLL2>;
+        clock-names = "stmmaceth", "clkin0", "clkin1";
+
+        resets = <&reset RESET_ETHERNET>;
+        reset-names = "stmmaceth";
 };
 
 &gpio_intc {
@@ -219,6 +258,18 @@
         clock-names = "core";
 };
 
+&i2c_AO {
+        clocks = <&clkc CLKID_CLK81>;
+};
+
+&i2c_A {
+        clocks = <&clkc CLKID_I2C>;
+};
+
+&i2c_B {
+        clocks = <&clkc CLKID_I2C>;
+};
+
 &L2 {
         arm,data-latency = <3 3 3>;
         arm,tag-latency = <2 2 2>;
diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index 4d61e5b1334a..ddc7a7bb33c0 100644
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -68,6 +68,19 @@
                         };
                 };
 
+                cpcap_audio: audio-codec {
+                        #sound-dai-cells = <1>;
+
+                        port@0 {
+                                cpcap_audio_codec0: endpoint {
+                                };
+                        };
+                        port@1 {
+                                cpcap_audio_codec1: endpoint {
+                                };
+                        };
+                };
+
                 cpcap_rtc: rtc {
                         compatible = "motorola,cpcap-rtc";
 
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
index 8e7c65464c9d..e10c03496524 100644
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi
@@ -28,7 +28,7 @@
         compatible = "mediatek,mt7623";
         interrupt-parent = <&sysirq>;
 
-        cpu_opp_table: opp_table {
+        cpu_opp_table: opp-table {
                 compatible = "operating-points-v2";
                 opp-shared;
 
@@ -94,6 +94,9 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a7";
                         reg = <0x1>;
+                        clocks = <&infracfg CLK_INFRA_CPUSEL>,
+                                 <&apmixedsys CLK_APMIXED_MAINPLL>;
+                        clock-names = "cpu", "intermediate";
                         operating-points-v2 = <&cpu_opp_table>;
                         clock-frequency = <1300000000>;
                 };
@@ -102,6 +105,9 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a7";
                         reg = <0x2>;
+                        clocks = <&infracfg CLK_INFRA_CPUSEL>,
+                                 <&apmixedsys CLK_APMIXED_MAINPLL>;
+                        clock-names = "cpu", "intermediate";
                         operating-points-v2 = <&cpu_opp_table>;
                         clock-frequency = <1300000000>;
                 };
@@ -110,6 +116,9 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a7";
                         reg = <0x3>;
+                        clocks = <&infracfg CLK_INFRA_CPUSEL>,
+                                 <&apmixedsys CLK_APMIXED_MAINPLL>;
+                        clock-names = "cpu", "intermediate";
                         operating-points-v2 = <&cpu_opp_table>;
                         clock-frequency = <1300000000>;
                 };
@@ -136,32 +145,32 @@
         };
 
         thermal-zones {
-                        cpu_thermal: cpu_thermal {
+                        cpu_thermal: cpu-thermal {
                                 polling-delay-passive = <1000>;
                                 polling-delay = <1000>;
 
                                 thermal-sensors = <&thermal 0>;
 
                                 trips {
-                                        cpu_passive: cpu_passive {
+                                        cpu_passive: cpu-passive {
                                                 temperature = <47000>;
                                                 hysteresis = <2000>;
                                                 type = "passive";
                                         };
 
-                                        cpu_active: cpu_active {
+                                        cpu_active: cpu-active {
                                                 temperature = <67000>;
                                                 hysteresis = <2000>;
                                                 type = "active";
                                         };
 
-                                        cpu_hot: cpu_hot {
+                                        cpu_hot: cpu-hot {
                                                 temperature = <87000>;
                                                 hysteresis = <2000>;
                                                 type = "hot";
                                         };
 
-                                        cpu_crit {
+                                        cpu-crit {
                                                 temperature = <107000>;
                                                 hysteresis = <2000>;
                                                 type = "critical";
@@ -668,6 +677,111 @@
                 #reset-cells = <1>;
         };
 
+        pcie: pcie@1a140000 {
+                compatible = "mediatek,mt7623-pcie";
+                device_type = "pci";
+                reg = <0 0x1a140000 0 0x1000>, /* PCIe shared registers */
+                      <0 0x1a142000 0 0x1000>, /* Port0 registers */
+                      <0 0x1a143000 0 0x1000>, /* Port1 registers */
+                      <0 0x1a144000 0 0x1000>; /* Port2 registers */
+                reg-names = "subsys", "port0", "port1", "port2";
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+                interrupt-map-mask = <0xf800 0 0 0>;
+                interrupt-map = <0x0000 0 0 0 &sysirq GIC_SPI 193 IRQ_TYPE_LEVEL_LOW>,
+                                <0x0800 0 0 0 &sysirq GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>,
+                                <0x1000 0 0 0 &sysirq GIC_SPI 195 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_ETHIF_SEL>,
+                         <&hifsys CLK_HIFSYS_PCIE0>,
+                         <&hifsys CLK_HIFSYS_PCIE1>,
+                         <&hifsys CLK_HIFSYS_PCIE2>;
+                clock-names = "free_ck", "sys_ck0", "sys_ck1", "sys_ck2";
+                resets = <&hifsys MT2701_HIFSYS_PCIE0_RST>,
+                         <&hifsys MT2701_HIFSYS_PCIE1_RST>,
+                         <&hifsys MT2701_HIFSYS_PCIE2_RST>;
+                reset-names = "pcie-rst0", "pcie-rst1", "pcie-rst2";
+                phys = <&pcie0_port PHY_TYPE_PCIE>,
+                       <&pcie1_port PHY_TYPE_PCIE>,
+                       <&u3port1 PHY_TYPE_PCIE>;
+                phy-names = "pcie-phy0", "pcie-phy1", "pcie-phy2";
+                power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>;
+                bus-range = <0x00 0xff>;
+                status = "disabled";
+                ranges = <0x81000000 0 0x1a160000 0 0x1a160000 0 0x00010000
+                          0x83000000 0 0x60000000 0 0x60000000 0 0x10000000>;
+
+                pcie@0,0 {
+                        reg = <0x0000 0 0 0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0 0 0 0 &sysirq GIC_SPI 193 IRQ_TYPE_LEVEL_LOW>;
+                        ranges;
+                        num-lanes = <1>;
+                        status = "disabled";
+                };
+
+                pcie@1,0 {
+                        reg = <0x0800 0 0 0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0 0 0 0 &sysirq GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>;
+                        ranges;
+                        num-lanes = <1>;
+                        status = "disabled";
+                };
+
+                pcie@2,0 {
+                        reg = <0x1000 0 0 0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0 0 0 0 &sysirq GIC_SPI 195 IRQ_TYPE_LEVEL_LOW>;
+                        ranges;
+                        num-lanes = <1>;
+                        status = "disabled";
+                };
+        };
+
+        pcie0_phy: pcie-phy@1a149000 {
+                compatible = "mediatek,generic-tphy-v1";
+                reg = <0 0x1a149000 0 0x0700>;
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+                status = "disabled";
+
+                pcie0_port: pcie-phy@1a149900 {
+                        reg = <0 0x1a149900 0 0x0700>;
+                        clocks = <&clk26m>;
+                        clock-names = "ref";
+                        #phy-cells = <1>;
+                        status = "okay";
+                };
+        };
+
+        pcie1_phy: pcie-phy@1a14a000 {
+                compatible = "mediatek,generic-tphy-v1";
+                reg = <0 0x1a14a000 0 0x0700>;
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+                status = "disabled";
+
+                pcie1_port: pcie-phy@1a14a900 {
+                        reg = <0 0x1a14a900 0 0x0700>;
+                        clocks = <&clk26m>;
+                        clock-names = "ref";
+                        #phy-cells = <1>;
+                        status = "okay";
+                };
+        };
+
         usb1: usb@1a1c0000 {
                 compatible = "mediatek,mt7623-xhci",
                              "mediatek,mt8173-xhci";
diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
index 7bf5aa2237c9..bbf56f855e46 100644
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
@@ -39,7 +39,34 @@
                 };
         };
 
-        gpio_keys {
+        reg_1p8v: regulator-1p8v {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-1.8V";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-3.3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
+        reg_5v: regulator-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-5V";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
+        gpio-keys {
                 compatible = "gpio-keys";
                 pinctrl-names = "default";
                 pinctrl-0 = <&key_pins_a>;
@@ -120,7 +147,6 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <0>;
-                        pinctrl-names = "default";
                         reset-gpios = <&pio 33 0>;
                         core-supply = <&mt6323_vpa_reg>;
                         io-supply = <&mt6323_vemc3v3_reg>;
@@ -191,8 +217,8 @@
         bus-width = <8>;
         max-frequency = <50000000>;
         cap-mmc-highspeed;
-        vmmc-supply = <&mt6323_vemc3v3_reg>;
-        vqmmc-supply = <&mt6323_vio18_reg>;
+        vmmc-supply = <&reg_3p3v>;
+        vqmmc-supply = <&reg_1p8v>;
         non-removable;
 };
 
@@ -205,20 +231,42 @@
         max-frequency = <50000000>;
         cap-sd-highspeed;
         cd-gpios = <&pio 261 GPIO_ACTIVE_LOW>;
-        vmmc-supply = <&mt6323_vmch_reg>;
-        vqmmc-supply = <&mt6323_vio18_reg>;
+        vmmc-supply = <&reg_3p3v>;
+        vqmmc-supply = <&reg_3p3v>;
+};
+
+&pcie {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pcie_default>;
+        status = "okay";
+
+        pcie@0,0 {
+                status = "okay";
+        };
+
+        pcie@1,0 {
+                status = "okay";
+        };
+};
+
+&pcie0_phy {
+        status = "okay";
+};
+
+&pcie1_phy {
+        status = "okay";
 };
 
 &pio {
         cir_pins_a:cir@0 {
-                pins_cir {
+                pins-cir {
                         pinmux = <MT7623_PIN_46_IR_FUNC_IR>;
                         bias-disable;
                 };
         };
 
         i2c0_pins_a: i2c@0 {
-                pins_i2c0 {
+                pins-i2c0 {
                         pinmux = <MT7623_PIN_75_SDA0_FUNC_SDA0>,
                                  <MT7623_PIN_76_SCL0_FUNC_SCL0>;
                         bias-disable;
@@ -226,7 +274,7 @@
         };
 
         i2c1_pins_a: i2c@1 {
-                pin_i2c1 {
+                pin-i2c1 {
                         pinmux = <MT7623_PIN_57_SDA1_FUNC_SDA1>,
                                  <MT7623_PIN_58_SCL1_FUNC_SCL1>;
                         bias-disable;
@@ -234,7 +282,7 @@
         };
 
         i2s0_pins_a: i2s@0 {
-                pin_i2s0 {
+                pin-i2s0 {
                         pinmux = <MT7623_PIN_49_I2S0_DATA_FUNC_I2S0_DATA>,
                                  <MT7623_PIN_72_I2S0_DATA_IN_FUNC_I2S0_DATA_IN>,
                                  <MT7623_PIN_73_I2S0_LRCK_FUNC_I2S0_LRCK>,
@@ -246,7 +294,7 @@
         };
 
         i2s1_pins_a: i2s@1 {
-                pin_i2s1 {
+                pin-i2s1 {
                         pinmux = <MT7623_PIN_33_I2S1_DATA_FUNC_I2S1_DATA>,
                                  <MT7623_PIN_34_I2S1_DATA_IN_FUNC_I2S1_DATA_IN>,
                                  <MT7623_PIN_35_I2S1_BCK_FUNC_I2S1_BCK>,
@@ -258,7 +306,7 @@
         };
 
         key_pins_a: keys@0 {
-                pins_keys {
+                pins-keys {
                         pinmux = <MT7623_PIN_256_GPIO256_FUNC_GPIO256>,
                                  <MT7623_PIN_257_GPIO257_FUNC_GPIO257> ;
                         input-enable;
@@ -266,7 +314,7 @@
         };
 
         led_pins_a: leds@0 {
-                pins_leds {
+                pins-leds {
                         pinmux = <MT7623_PIN_239_EXT_SDIO0_FUNC_GPIO239>,
                                  <MT7623_PIN_240_EXT_XCS_FUNC_GPIO240>,
                                  <MT7623_PIN_241_EXT_SCK_FUNC_GPIO241>;
@@ -274,7 +322,7 @@
         };
 
         mmc0_pins_default: mmc0default {
-                pins_cmd_dat {
+                pins-cmd-dat {
                         pinmux = <MT7623_PIN_111_MSDC0_DAT7_FUNC_MSDC0_DAT7>,
                                  <MT7623_PIN_112_MSDC0_DAT6_FUNC_MSDC0_DAT6>,
                                  <MT7623_PIN_113_MSDC0_DAT5_FUNC_MSDC0_DAT5>,
@@ -288,19 +336,19 @@
                         bias-pull-up;
                 };
 
-                pins_clk {
+                pins-clk {
                         pinmux = <MT7623_PIN_117_MSDC0_CLK_FUNC_MSDC0_CLK>;
                         bias-pull-down;
                 };
 
-                pins_rst {
+                pins-rst {
                         pinmux = <MT7623_PIN_115_MSDC0_RSTB_FUNC_MSDC0_RSTB>;
                         bias-pull-up;
                 };
         };
 
         mmc0_pins_uhs: mmc0 {
-                pins_cmd_dat {
+                pins-cmd-dat {
                         pinmux = <MT7623_PIN_111_MSDC0_DAT7_FUNC_MSDC0_DAT7>,
                                  <MT7623_PIN_112_MSDC0_DAT6_FUNC_MSDC0_DAT6>,
                                  <MT7623_PIN_113_MSDC0_DAT5_FUNC_MSDC0_DAT5>,
@@ -315,20 +363,20 @@
                         bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                 };
 
-                pins_clk {
+                pins-clk {
                         pinmux = <MT7623_PIN_117_MSDC0_CLK_FUNC_MSDC0_CLK>;
                         drive-strength = <MTK_DRIVE_2mA>;
                         bias-pull-down = <MTK_PUPD_SET_R1R0_01>;
                 };
 
-                pins_rst {
+                pins-rst {
                         pinmux = <MT7623_PIN_115_MSDC0_RSTB_FUNC_MSDC0_RSTB>;
                         bias-pull-up;
                 };
         };
 
         mmc1_pins_default: mmc1default {
-                pins_cmd_dat {
+                pins-cmd-dat {
                         pinmux = <MT7623_PIN_107_MSDC1_DAT0_FUNC_MSDC1_DAT0>,
                                  <MT7623_PIN_108_MSDC1_DAT1_FUNC_MSDC1_DAT1>,
                                  <MT7623_PIN_109_MSDC1_DAT2_FUNC_MSDC1_DAT2>,
@@ -339,26 +387,26 @@
                         bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
                 };
 
-                pins_clk {
+                pins-clk {
                         pinmux = <MT7623_PIN_106_MSDC1_CLK_FUNC_MSDC1_CLK>;
                         bias-pull-down;
                         drive-strength = <MTK_DRIVE_4mA>;
                 };
 
-                pins_wp {
+                pins-wp {
                         pinmux = <MT7623_PIN_29_EINT7_FUNC_MSDC1_WP>;
                         input-enable;
                         bias-pull-up;
                 };
 
-                pins_insert {
+                pins-insert {
                         pinmux = <MT7623_PIN_261_MSDC1_INS_FUNC_GPIO261>;
                         bias-pull-up;
                 };
         };
 
         mmc1_pins_uhs: mmc1 {
-                pins_cmd_dat {
+                pins-cmd-dat {
                         pinmux = <MT7623_PIN_107_MSDC1_DAT0_FUNC_MSDC1_DAT0>,
                                  <MT7623_PIN_108_MSDC1_DAT1_FUNC_MSDC1_DAT1>,
                                  <MT7623_PIN_109_MSDC1_DAT2_FUNC_MSDC1_DAT2>,
@@ -369,15 +417,23 @@
                         bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
                 };
 
-                pins_clk {
+                pins-clk {
                         pinmux = <MT7623_PIN_106_MSDC1_CLK_FUNC_MSDC1_CLK>;
                         drive-strength = <MTK_DRIVE_4mA>;
                         bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                 };
         };
 
+        pcie_default: pcie_pin_default {
+                pins_cmd_dat {
+                        pinmux = <MT7623_PIN_208_AUD_EXT_CK1_FUNC_PCIE0_PERST_N>,
+                                 <MT7623_PIN_209_AUD_EXT_CK2_FUNC_PCIE1_PERST_N>;
+                        bias-disable;
+                };
+        };
+
         pwm_pins_a: pwm@0 {
-                pins_pwm {
+                pins-pwm {
                         pinmux = <MT7623_PIN_203_PWM0_FUNC_PWM0>,
                                  <MT7623_PIN_204_PWM1_FUNC_PWM1>,
                                  <MT7623_PIN_205_PWM2_FUNC_PWM2>,
@@ -387,7 +443,7 @@
         };
 
         spi0_pins_a: spi@0 {
-                pins_spi {
+                pins-spi {
                         pinmux = <MT7623_PIN_53_SPI0_CSN_FUNC_SPI0_CS>,
                                 <MT7623_PIN_54_SPI0_CK_FUNC_SPI0_CK>,
                                 <MT7623_PIN_55_SPI0_MI_FUNC_SPI0_MI>,
@@ -397,18 +453,25 @@
         };
 
         uart0_pins_a: uart@0 {
-                pins_dat {
+                pins-dat {
                         pinmux = <MT7623_PIN_79_URXD0_FUNC_URXD0>,
                                  <MT7623_PIN_80_UTXD0_FUNC_UTXD0>;
                 };
         };
 
         uart1_pins_a: uart@1 {
-                pins_dat {
+                pins-dat {
                         pinmux = <MT7623_PIN_81_URXD1_FUNC_URXD1>,
                                  <MT7623_PIN_82_UTXD1_FUNC_UTXD1>;
                 };
         };
+
+        uart2_pins_a: uart@2 {
+                pins-dat {
+                        pinmux = <MT7623_PIN_14_GPIO14_FUNC_URXD2>,
+                                 <MT7623_PIN_15_GPIO15_FUNC_UTXD2>;
+                };
+        };
 };
 
 &pwm {
@@ -454,26 +517,30 @@
 &uart0 {
         pinctrl-names = "default";
         pinctrl-0 = <&uart0_pins_a>;
-        status = "disabled";
+        status = "okay";
 };
 
 &uart1 {
         pinctrl-names = "default";
         pinctrl-0 = <&uart1_pins_a>;
-        status = "disabled";
+        status = "okay";
 };
 
 &uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart2_pins_a>;
         status = "okay";
 };
 
 &usb1 {
-        vusb33-supply = <&mt6323_vusb_reg>;
+        vusb33-supply = <&reg_3p3v>;
+        vbus-supply = <&reg_5v>;
         status = "okay";
 };
 
 &usb2 {
-        vusb33-supply = <&mt6323_vusb_reg>;
+        vusb33-supply = <&reg_3p3v>;
+        vbus-supply = <&reg_5v>;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/mt7623n-rfb-nand.dts b/arch/arm/boot/dts/mt7623n-rfb-nand.dts
index e66de8611650..f729c718aba1 100644
--- a/arch/arm/boot/dts/mt7623n-rfb-nand.dts
+++ b/arch/arm/boot/dts/mt7623n-rfb-nand.dts
@@ -81,13 +81,13 @@
 
 &pio {
         nand_pins_default: nanddefault {
-                pins_ale {
+                pins-ale {
                         pinmux = <MT7623_PIN_116_MSDC0_CMD_FUNC_NALE>;
                         drive-strength = <MTK_DRIVE_8mA>;
                         bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                 };
 
-                pins_dat {
+                pins-dat {
                         pinmux = <MT7623_PIN_111_MSDC0_DAT7_FUNC_NLD7>,
                                  <MT7623_PIN_112_MSDC0_DAT6_FUNC_NLD6>,
                                  <MT7623_PIN_114_MSDC0_DAT4_FUNC_NLD4>,
@@ -102,7 +102,7 @@
                         bias-pull-up;
                 };
 
-                pins_we {
+                pins-we {
                         pinmux = <MT7623_PIN_117_MSDC0_CLK_FUNC_NWEB>;
                         drive-strength = <MTK_DRIVE_8mA>;
                         bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
diff --git a/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
new file mode 100644
index 000000000000..d2d0761295a4
--- /dev/null
+++ b/arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi
@@ -0,0 +1,187 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2018 Nuvoton Technology tomer.maimon@nuvoton.com
+// Copyright 2018 Google, Inc.
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        interrupt-parent = <&gic>;
+
+        /* external reference clock */
+        clk_refclk: clk_refclk {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <25000000>;
+                clock-output-names = "refclk";
+        };
+
+        /* external reference clock for cpu. float in normal operation */
+        clk_sysbypck: clk_sysbypck {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <800000000>;
+                clock-output-names = "sysbypck";
+        };
+
+        /* external reference clock for MC. float in normal operation */
+        clk_mcbypck: clk_mcbypck {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <800000000>;
+                clock-output-names = "mcbypck";
+        };
+
+         /* external clock signal rg1refck, supplied by the phy */
+        clk_rg1refck: clk_rg1refck {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <125000000>;
+                clock-output-names = "clk_rg1refck";
+        };
+
+         /* external clock signal rg2refck, supplied by the phy */
+        clk_rg2refck: clk_rg2refck {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <125000000>;
+                clock-output-names = "clk_rg2refck";
+        };
+
+        clk_xin: clk_xin {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <50000000>;
+                clock-output-names = "clk_xin";
+        };
+
+        soc {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
+                ranges = <0x0 0xf0000000 0x00900000>;
+
+                gcr: gcr@800000 {
+                        compatible = "nuvoton,npcm750-gcr", "syscon",
+                                "simple-mfd";
+                        reg = <0x800000 0x1000>;
+                };
+
+                scu: scu@3fe000 {
+                        compatible = "arm,cortex-a9-scu";
+                        reg = <0x3fe000 0x1000>;
+                };
+
+                l2: cache-controller@3fc000 {
+                        compatible = "arm,pl310-cache";
+                        reg = <0x3fc000 0x1000>;
+                        interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                        cache-unified;
+                        cache-level = <2>;
+                        clocks = <&clk 10>;
+                        arm,shared-override;
+                };
+
+                gic: interrupt-controller@3ff000 {
+                        compatible = "arm,cortex-a9-gic";
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        reg = <0x3ff000 0x1000>,
+                                <0x3fe100 0x100>;
+                };
+        };
+
+        ahb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
+                ranges;
+
+                clk: clock-controller@f0801000 {
+                        compatible = "nuvoton,npcm750-clk", "syscon";
+                        #clock-cells = <1>;
+                        clock-controller;
+                        reg = <0xf0801000 0x1000>;
+                        clock-names = "refclk", "sysbypck", "mcbypck";
+                        clocks = <&clk_refclk>, <&clk_sysbypck>, <&clk_mcbypck>;
+                };
+
+                apb {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "simple-bus";
+                        interrupt-parent = <&gic>;
+                        ranges = <0x0 0xf0000000 0x00300000>;
+
+                        timer0: timer@8000 {
+                                compatible = "nuvoton,npcm750-timer";
+                                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+                                reg = <0x8000 0x50>;
+                                clocks = <&clk 5>;
+                        };
+
+                        watchdog0: watchdog@801C {
+                                compatible = "nuvoton,npcm750-wdt";
+                                interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
+                                reg = <0x801C 0x4>;
+                                status = "disabled";
+                                clocks = <&clk 5>;
+                        };
+
+                        watchdog1: watchdog@901C {
+                                compatible = "nuvoton,npcm750-wdt";
+                                interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+                                reg = <0x901C 0x4>;
+                                status = "disabled";
+                                clocks = <&clk 5>;
+                        };
+
+                        watchdog2: watchdog@a01C {
+                                compatible = "nuvoton,npcm750-wdt";
+                                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+                                reg = <0xa01C 0x4>;
+                                status = "disabled";
+                                clocks = <&clk 5>;
+                        };
+
+                        serial0: serial@1000 {
+                                compatible = "nuvoton,npcm750-uart";
+                                reg = <0x1000 0x1000>;
+                                clocks = <&clk 6>;
+                                interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
+                                reg-shift = <2>;
+                                status = "disabled";
+                        };
+
+                        serial1: serial@2000 {
+                                compatible = "nuvoton,npcm750-uart";
+                                reg = <0x2000 0x1000>;
+                                clocks = <&clk 6>;
+                                interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                                reg-shift = <2>;
+                                status = "disabled";
+                        };
+
+                        serial2: serial@3000 {
+                                compatible = "nuvoton,npcm750-uart";
+                                reg = <0x3000 0x1000>;
+                                clocks = <&clk 6>;
+                                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                                reg-shift = <2>;
+                                status = "disabled";
+                        };
+
+                        serial3: serial@4000 {
+                                compatible = "nuvoton,npcm750-uart";
+                                reg = <0x4000 0x1000>;
+                                clocks = <&clk 6>;
+                                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                                reg-shift = <2>;
+                                status = "disabled";
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/nuvoton-npcm750-evb.dts b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
new file mode 100644
index 000000000000..15f744f1beea
--- /dev/null
+++ b/arch/arm/boot/dts/nuvoton-npcm750-evb.dts
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2018 Nuvoton Technology tomer.maimon@nuvoton.com
+// Copyright 2018 Google, Inc.
+
+/dts-v1/;
+#include "nuvoton-npcm750.dtsi"
+
+/ {
+        model = "Nuvoton npcm750 Development Board (Device Tree)";
+        compatible = "nuvoton,npcm750";
+
+        chosen {
+                stdout-path = &serial3;
+        };
+
+        memory {
+                reg = <0 0x40000000>;
+        };
+};
+
+&watchdog1 {
+        status = "okay";
+};
+
+&serial0 {
+        status = "okay";
+};
+
+&serial1 {
+        status = "okay";
+};
+
+&serial2 {
+        status = "okay";
+};
+
+&serial3 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/nuvoton-npcm750.dtsi b/arch/arm/boot/dts/nuvoton-npcm750.dtsi
new file mode 100644
index 000000000000..6ac340533587
--- /dev/null
+++ b/arch/arm/boot/dts/nuvoton-npcm750.dtsi
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2018 Nuvoton Technology tomer.maimon@nuvoton.com
+// Copyright 2018 Google, Inc.
+
+#include "nuvoton-common-npcm7xx.dtsi"
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        interrupt-parent = <&gic>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                enable-method = "nuvoton,npcm750-smp";
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        clocks = <&clk 0>;
+                        clock-names = "clk_cpu";
+                        reg = <0>;
+                        next-level-cache = <&l2>;
+                };
+
+                cpu@1 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        clocks = <&clk 0>;
+                        clock-names = "clk_cpu";
+                        reg = <1>;
+                        next-level-cache = <&l2>;
+                };
+        };
+        soc {
+                timer@3fe600 {
+                        compatible = "arm,cortex-a9-twd-timer";
+                        reg = <0x3fe600 0x20>;
+                        interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
+                                                  IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&clk 5>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
index e44d93fc644c..ded5fcf084eb 100644
--- a/arch/arm/boot/dts/omap3-n9.dts
+++ b/arch/arm/boot/dts/omap3-n9.dts
@@ -39,6 +39,13 @@
         };
 };
 
+&i2c3 {
+        ak8975@0f {
+                compatible = "asahi-kasei,ak8975";
+                reg = <0x0f>;
+        };
+};
+
 &isp {
         vdd-csiphy1-supply = <&vaux2>;
         vdd-csiphy2-supply = <&vaux2>;
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index a005802cd52b..4043ecb38016 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -557,6 +557,7 @@
                         dma-names = "tx", "rx";
                         clocks = <&mcbsp4_fck>;
                         clock-names = "fck";
+                        #sound-dai-cells = <0>;
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index b21084da490b..bdf73cbcec3a 100644
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -70,8 +70,30 @@
                 regulator-always-on;
         };
 
-        /* HS USB Host PHY on PORT 1 */
-        hsusb1_phy: hsusb1_phy {
+        /* FS USB Host PHY on port 1 for mdm6600 */
+        fsusb1_phy: usb-phy@1 {
+                compatible = "motorola,mapphone-mdm6600";
+                pinctrl-0 = <&usb_mdm6600_pins>;
+                pinctrl-names = "default";
+                enable-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;     /* gpio_95 */
+                power-gpios = <&gpio2 22 GPIO_ACTIVE_HIGH>;     /* gpio_54 */
+                reset-gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>;     /* gpio_49 */
+                /* mode: gpio_148 gpio_149 */
+                motorola,mode-gpios = <&gpio5 20 GPIO_ACTIVE_HIGH>,
+                                      <&gpio5 21 GPIO_ACTIVE_HIGH>;
+                /* cmd: gpio_103 gpio_104 gpio_142 */
+                motorola,cmd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>,
+                                     <&gpio4 8 GPIO_ACTIVE_HIGH>,
+                                     <&gpio5 14 GPIO_ACTIVE_HIGH>;
+                /* status: gpio_52 gpio_53 gpio_55 */
+                motorola,status-gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>,
+                                        <&gpio2 21 GPIO_ACTIVE_HIGH>,
+                                        <&gpio2 23 GPIO_ACTIVE_HIGH>;
+                #phy-cells = <0>;
+        };
+
+        /* HS USB host TLL nop-phy on port 2 for w3glte */
+        hsusb2_phy: usb-phy@2 {
                 compatible = "usb-nop-xceiv";
                 #phy-cells = <0>;
         };
@@ -117,6 +139,26 @@
 
                 };
         };
+
+        soundcard {
+                compatible = "audio-graph-card";
+                label = "Droid 4 Audio";
+
+                simple-graph-card,widgets =
+                        "Speaker", "Earpiece",
+                        "Speaker", "Loudspeaker",
+                        "Headphone", "Headphone Jack",
+                        "Microphone", "Internal Mic";
+
+                simple-graph-card,routing =
+                        "Earpiece", "EP",
+                        "Loudspeaker", "SPKR",
+                        "Headphone Jack", "HSL",
+                        "Headphone Jack", "HSR",
+                        "MICR", "Internal Mic";
+
+                dais = <&mcbsp2_port>, <&mcbsp3_port>;
+        };
 };
 
 &dss {
@@ -124,13 +166,6 @@
 };
 
 &gpio6 {
-        touchscreen_reset {
-                gpio-hog;
-                gpios = <13 0>;
-                output-high;
-                line-name = "touchscreen-reset";
-        };
-
         pwm8: dmtimer-pwm-8 {
                 pinctrl-names = "default";
                 pinctrl-0 = <&vibrator_direction_pin>;
@@ -362,22 +397,18 @@
         };
 };
 
-/*
- * REVISIT: Add gpio173 reset pin handling to the driver, see gpio-hog above.
- * If the GPIO reset is used, we probably need to have /lib/firmware/maxtouch.fw
- * available. See "mxt-app" and "droid4-touchscreen-firmware" tools for more
- * information.
- */
 &i2c2 {
-        tsp@4a {
+        touchscreen@4a {
                 compatible = "atmel,maxtouch";
                 reg = <0x4a>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&touchscreen_pins>;
 
+                reset-gpios = <&gpio6 13 GPIO_ACTIVE_HIGH>; /* gpio173 */
+
                 /* gpio_183 with sys_nirq2 pad as wakeup */
-                interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING
-                                       &omap4_pmx_core 0x160>;
+                interrupts-extended = <&gpio6 23 IRQ_TYPE_EDGE_FALLING>,
+                                      <&omap4_pmx_core 0x160>;
                 interrupt-names = "irq", "wakeup";
                 wakeup-source;
         };
@@ -435,6 +466,7 @@
 
         touchscreen_pins: pinmux_touchscreen_pins {
                 pinctrl-single,pins = <
+                OMAP4_IOPAD(0x180, PIN_OUTPUT | MUX_MODE3)
                 OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP | MUX_MODE3)
                 >;
         };
@@ -445,6 +477,43 @@
                 >;
         };
 
+        usb_mdm6600_pins: pinmux_usb_mdm6600_pins {
+                pinctrl-single,pins = <
+                /* enable 0x4a1000d8 usbb1_ulpitll_dat7.gpio_95 ag16 */
+                OMAP4_IOPAD(0x0d8, PIN_INPUT | MUX_MODE3)
+
+                /* power 0x4a10007c gpmc_nwp.gpio_54 c25 */
+                OMAP4_IOPAD(0x07c, PIN_OUTPUT | MUX_MODE3)
+
+                /* reset 0x4a100072 gpmc_a25.gpio_49 d20 */
+                OMAP4_IOPAD(0x072, PIN_OUTPUT | MUX_MODE3)
+
+                /* mode0/bpwake 0x4a10014e sdmmc5_dat1.gpio_148 af4 */
+                OMAP4_IOPAD(0x14e, PIN_OUTPUT | MUX_MODE3)
+
+                /* mode1/apwake 0x4a100150 sdmmc5_dat2.gpio_149 ag3 */
+                OMAP4_IOPAD(0x150, PIN_OFF_OUTPUT_LOW | PIN_INPUT | MUX_MODE3)
+
+                /* status0 0x4a10007e gpmc_clk.gpio_55 b22 */
+                OMAP4_IOPAD(0x07e, PIN_INPUT | MUX_MODE3)
+
+                /* status1 0x4a10007a gpmc_ncs3.gpio_53 c22 */
+                OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3)
+
+                /* status2 0x4a100078 gpmc_ncs2.gpio_52 d21 */
+                OMAP4_IOPAD(0x078, PIN_INPUT | MUX_MODE3)
+
+                /* cmd0 0x4a100094 gpmc_ncs6.gpio_103 c24 */
+                OMAP4_IOPAD(0x094, PIN_OUTPUT | MUX_MODE3)
+
+                /* cmd1 0x4a100096 gpmc_ncs7.gpio_104 d24 */
+                OMAP4_IOPAD(0x096, PIN_OUTPUT | MUX_MODE3)
+
+                /* cmd2 0x4a100142 uart3_rts_sd.gpio_142 f28 */
+                OMAP4_IOPAD(0x142, PIN_OUTPUT | MUX_MODE3)
+                >;
+        };
+
         usb_ulpi_pins: pinmux_usb_ulpi_pins {
                 pinctrl-single,pins = <
                 OMAP4_IOPAD(0x196, MUX_MODE7)
@@ -484,6 +553,28 @@
                 >;
         };
 
+        /*
+         * Note that the v3.0.8 stock userspace dynamically remuxes uart1
+         * rts pin probably for PM purposes to PIN_INPUT_PULLUP | MUX_MODE7
+         * when not used. If needed, we can add rts pin remux later based
+         * on power measurements.
+         */
+        uart1_pins: pinmux_uart1_pins {
+                pinctrl-single,pins = <
+                /* 0x4a10013c mcspi1_cs2.uart1_cts ag23 */
+                OMAP4_IOPAD(0x13c, PIN_INPUT_PULLUP | MUX_MODE1)
+
+                /* 0x4a10013e mcspi1_cs3.uart1_rts ah23 */
+                OMAP4_IOPAD(0x13e, MUX_MODE1)
+
+                /* 0x4a100140 uart3_cts_rctx.uart1_tx f27 */
+                OMAP4_IOPAD(0x140, PIN_OUTPUT | MUX_MODE1)
+
+                /* 0x4a1001ca dpm_emu14.uart1_rx aa3 */
+                OMAP4_IOPAD(0x1ca, PIN_INPUT_PULLUP | MUX_MODE2)
+                >;
+        };
+
         /* uart3_tx_irtx and uart3_rx_irrx */
         uart3_pins: pinmux_uart3_pins {
                 pinctrl-single,pins = <
@@ -512,6 +603,24 @@
                 OMAP4_IOPAD(0x112, PIN_OUTPUT_PULLUP | MUX_MODE5)       /* uart4_rts */
                 >;
         };
+
+        mcbsp2_pins: pinmux_mcbsp2_pins {
+                pinctrl-single,pins = <
+                OMAP4_IOPAD(0x0f6, PIN_INPUT | MUX_MODE0)       /* abe_mcbsp2_clkx */
+                OMAP4_IOPAD(0x0f8, PIN_INPUT | MUX_MODE0)       /* abe_mcbsp2_dr */
+                OMAP4_IOPAD(0x0fa, PIN_OUTPUT | MUX_MODE0)      /* abe_mcbsp2_dx */
+                OMAP4_IOPAD(0x0fc, PIN_INPUT | MUX_MODE0)       /* abe_mcbsp2_fsx */
+                >;
+        };
+
+        mcbsp3_pins: pinmux_mcbsp3_pins {
+                pinctrl-single,pins = <
+                OMAP4_IOPAD(0x106, PIN_INPUT | MUX_MODE1)       /* abe_mcbsp3_dr */
+                OMAP4_IOPAD(0x108, PIN_OUTPUT | MUX_MODE1)      /* abe_mcbsp3_dx */
+                OMAP4_IOPAD(0x10a, PIN_INPUT | MUX_MODE1)       /* abe_mcbsp3_clkx */
+                OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1)       /* abe_mcbsp3_fsx */
+                >;
+        };
 };
 
 &omap4_pmx_wkup {
@@ -535,6 +644,17 @@
         };
 };
 
+/*
+ * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for
+ * uart1 wakeirq.
+ */
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_pins>;
+        interrupts-extended = <&wakeupgen GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH
+                               &omap4_pmx_core 0xfc>;
+};
+
 &uart3 {
         interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
                                &omap4_pmx_core 0x17c>;
@@ -551,8 +671,13 @@
         };
 };
 
+&usbhsohci {
+        phys = <&fsusb1_phy>;
+        phy-names = "usb";
+};
+
 &usbhsehci {
-        phys = <&hsusb1_phy>;
+        phys = <&hsusb2_phy>;
 };
 
 &usbhshost {
@@ -597,3 +722,43 @@
                                   "0", "0", "1";
         };
 };
+
+&mcbsp2 {
+        #sound-dai-cells = <0>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcbsp2_pins>;
+        status = "okay";
+
+        mcbsp2_port: port {
+                cpu_dai2: endpoint {
+                        dai-format = "i2s";
+                        remote-endpoint = <&cpcap_audio_codec0>;
+                        frame-master = <&cpcap_audio_codec0>;
+                        bitclock-master = <&cpcap_audio_codec0>;
+                };
+        };
+};
+
+&mcbsp3 {
+        #sound-dai-cells = <0>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcbsp3_pins>;
+        status = "okay";
+
+        mcbsp3_port: port {
+                cpu_dai3: endpoint {
+                        dai-format = "dsp_a";
+                        frame-master = <&cpcap_audio_codec1>;
+                        bitclock-master = <&cpcap_audio_codec1>;
+                        remote-endpoint = <&cpcap_audio_codec1>;
+                };
+        };
+};
+
+&cpcap_audio_codec0 {
+        remote-endpoint = <&cpu_dai2>;
+};
+
+&cpcap_audio_codec1 {
+        remote-endpoint = <&cpu_dai3>;
+};
diff --git a/arch/arm/boot/dts/omap443x.dtsi b/arch/arm/boot/dts/omap443x.dtsi
index 03c8ad91ddac..cbcdcb4e7d1c 100644
--- a/arch/arm/boot/dts/omap443x.dtsi
+++ b/arch/arm/boot/dts/omap443x.dtsi
@@ -24,8 +24,6 @@
                         clock-latency = <300000>; /* From legacy driver */
 
                         /* cooling options */
-                        cooling-min-level = <0>;
-                        cooling-max-level = <3>;
                         #cooling-cells = <2>; /* min followed by max */
                 };
         };
diff --git a/arch/arm/boot/dts/omap4460.dtsi b/arch/arm/boot/dts/omap4460.dtsi
index c43f2a2d0a1e..ad97493e4e46 100644
--- a/arch/arm/boot/dts/omap4460.dtsi
+++ b/arch/arm/boot/dts/omap4460.dtsi
@@ -22,8 +22,6 @@
                         clock-latency = <300000>; /* From legacy driver */
 
                         /* cooling options */
-                        cooling-min-level = <0>;
-                        cooling-max-level = <2>;
                         #cooling-cells = <2>; /* min followed by max */
                 };
         };
diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 1b20838bb9a4..3b2244560c28 100644
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -659,8 +659,8 @@
                 v2v1-supply = <&smps9_reg>;
                 enable-active-high;
 
-                clocks = <&clk32kgaudio>;
-                clock-names = "clk32k";
+                clocks = <&clk32kgaudio>, <&fref_xtal_ck>;
+                clock-names = "clk32k", "mclk";
         };
 };
 
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 35d4298da83d..732b61a0e990 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -55,8 +55,6 @@
                         clock-latency = <300000>; /* From omap-cpufreq driver */
 
                         /* cooling options */
-                        cooling-min-level = <0>;
-                        cooling-max-level = <2>;
                         #cooling-cells = <2>; /* min followed by max */
                 };
                 cpu@1 {
@@ -289,6 +287,28 @@
                                 pinctrl-single,register-width = <16>;
                                 pinctrl-single,function-mask = <0x7fff>;
                         };
+
+                        omap5_scm_wkup_pad_conf: omap5_scm_wkup_pad_conf@cda0 {
+                                compatible = "ti,omap5-scm-wkup-pad-conf",
+                                             "simple-bus";
+                                reg = <0xcda0 0x60>;
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0xcda0 0x60>;
+
+                                scm_wkup_pad_conf: scm_conf@0 {
+                                        compatible = "syscon", "simple-bus";
+                                        reg = <0x0 0x60>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        ranges = <0 0x0 0x60>;
+
+                                        scm_wkup_pad_conf_clocks: clocks@0 {
+                                                #address-cells = <1>;
+                                                #size-cells = <0>;
+                                        };
+                                };
+                        };
                 };
 
                 ocmcram: ocmcram@40300000 {
diff --git a/arch/arm/boot/dts/omap54xx-clocks.dtsi b/arch/arm/boot/dts/omap54xx-clocks.dtsi
index 9619a746d657..ecc5573d264c 100644
--- a/arch/arm/boot/dts/omap54xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap54xx-clocks.dtsi
@@ -1179,3 +1179,13 @@
                 };
         };
 };
+
+&scm_wkup_pad_conf_clocks {
+        fref_xtal_ck: fref_xtal_ck {
+                #clock-cells = <0>;
+                compatible = "ti,gate-clock";
+                clocks = <&sys_clkin>;
+                ti,bit-shift = <28>;
+                reg = <0x14>;
+        };
+};
diff --git a/arch/arm/boot/dts/orion5x-lacie-d2-network.dts b/arch/arm/boot/dts/orion5x-lacie-d2-network.dts
index c701e8d16bbb..8c2449da6f00 100644
--- a/arch/arm/boot/dts/orion5x-lacie-d2-network.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-d2-network.dts
@@ -24,7 +24,7 @@
 
         chosen {
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
-                linux,stdout-path = &uart0;
+                stdout-path = &uart0;
         };
 
         soc {
diff --git a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
index 89ff404a528c..b545d0f228a5 100644
--- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
@@ -30,7 +30,7 @@
 
         chosen {
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
-                linux,stdout-path = &uart0;
+                stdout-path = &uart0;
         };
 
         soc {
diff --git a/arch/arm/boot/dts/orion5x-linkstation.dtsi b/arch/arm/boot/dts/orion5x-linkstation.dtsi
index e9991c83d7b7..ebd93df5d07a 100644
--- a/arch/arm/boot/dts/orion5x-linkstation.dtsi
+++ b/arch/arm/boot/dts/orion5x-linkstation.dtsi
@@ -48,7 +48,7 @@
 / {
         chosen {
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
-                linux,stdout-path = &uart0;
+                stdout-path = &uart0;
         };
 
         soc {
diff --git a/arch/arm/boot/dts/orion5x-lswsgl.dts b/arch/arm/boot/dts/orion5x-lswsgl.dts
index ea966ec03dd0..0d97ded66257 100644
--- a/arch/arm/boot/dts/orion5x-lswsgl.dts
+++ b/arch/arm/boot/dts/orion5x-lswsgl.dts
@@ -60,7 +60,7 @@
 
         chosen {
                 bootargs = "console=ttyS0,115200 earlyprintk";
-                linux,stdout-path = &uart0;
+                stdout-path = &uart0;
         };
 
         soc {
diff --git a/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts b/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
index ff3484904294..0324cb54939d 100644
--- a/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
+++ b/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
@@ -24,7 +24,7 @@
 
         chosen {
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
-                linux,stdout-path = &uart0;
+                stdout-path = &uart0;
         };
 
         soc {
diff --git a/arch/arm/boot/dts/orion5x-rd88f5182-nas.dts b/arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
index 6fb052507b36..d1817af53e0b 100644
--- a/arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
+++ b/arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
@@ -21,7 +21,7 @@
 
         chosen {
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
-                linux,stdout-path = &uart0;
+                stdout-path = &uart0;
         };
 
         soc {
diff --git a/arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts b/arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts
index 1297414dd649..0c9729306089 100644
--- a/arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts
+++ b/arch/arm/boot/dts/picoxcell-pc7302-pc3x2.dts
@@ -23,7 +23,7 @@
         };
 
         chosen {
-                linux,stdout-path = &uart0;
+                stdout-path = &uart0;
         };
 
         clocks {
diff --git a/arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts b/arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts
index 9e317a4f431c..86f26715b619 100644
--- a/arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts
+++ b/arch/arm/boot/dts/picoxcell-pc7302-pc3x3.dts
@@ -23,7 +23,7 @@
         };
 
         chosen {
-                linux,stdout-path = &uart0;
+                stdout-path = &uart0;
         };
 
         clocks {
diff --git a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
index b818ebce0978..209eb21cea00 100644
--- a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
@@ -133,7 +133,7 @@
                                 clock-frequency = <200000>;
 
                                 eeprom@50 {
-                                        compatible = "24c02";
+                                        compatible = "atmel,24c02";
                                         reg = <0x50>;
                                         pagesize = <32>;
                                 };
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 3ca96e361878..5341a39c0392 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -316,6 +316,23 @@
                 };
         };
 
+
+        /*
+         * These channels from the ADC are simply hardware monitors.
+         * That is why the ADC is referred to as "HKADC" - HouseKeeping
+         * ADC.
+         */
+        iio-hwmon {
+                compatible = "iio-hwmon";
+                io-channels = <&xoadc 0x00 0x01>, /* Battery */
+                            <&xoadc 0x00 0x02>, /* DC in (charger) */
+                            <&xoadc 0x00 0x04>, /* VPH the main system voltage */
+                            <&xoadc 0x00 0x0b>, /* Die temperature */
+                            <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
+                            <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
+                            <&xoadc 0x00 0x0e>; /* Charger temperature */
+        };
+
         soc: soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -770,6 +787,52 @@
                                         debounce = <15625>;
                                         pull-up;
                                 };
+
+                                xoadc: xoadc@197 {
+                                        compatible = "qcom,pm8921-adc";
+                                        reg = <197>;
+                                        interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
+                                        #address-cells = <2>;
+                                        #size-cells = <0>;
+                                        #io-channel-cells = <2>;
+
+                                        vcoin: adc-channel@00 {
+                                                reg = <0x00 0x00>;
+                                        };
+                                        vbat: adc-channel@01 {
+                                                reg = <0x00 0x01>;
+                                        };
+                                        dcin: adc-channel@02 {
+                                                reg = <0x00 0x02>;
+                                        };
+                                        vph_pwr: adc-channel@04 {
+                                                reg = <0x00 0x04>;
+                                        };
+                                        batt_therm: adc-channel@08 {
+                                                reg = <0x00 0x08>;
+                                        };
+                                        batt_id: adc-channel@09 {
+                                                reg = <0x00 0x09>;
+                                        };
+                                        usb_vbus: adc-channel@0a {
+                                                reg = <0x00 0x0a>;
+                                        };
+                                        die_temp: adc-channel@0b {
+                                                reg = <0x00 0x0b>;
+                                        };
+                                        ref_625mv: adc-channel@0c {
+                                                reg = <0x00 0x0c>;
+                                        };
+                                        ref_1250mv: adc-channel@0d {
+                                                reg = <0x00 0x0d>;
+                                        };
+                                        chg_temp: adc-channel@0e {
+                                                reg = <0x00 0x0e>;
+                                        };
+                                        ref_muxoff: adc-channel@0f {
+                                                reg = <0x00 0x0f>;
+                                        };
+                                };
                         };
                 };
 
diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
new file mode 100644
index 000000000000..eaa1001d0a46
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "qcom-msm8974pro.dtsi"
+#include "qcom-pm8841.dtsi"
+#include "qcom-pm8941.dtsi"
+
+/ {
+        model = "Samsung Galaxy S5";
+        compatible = "samsung,klte", "qcom,msm8974";
+
+        aliases {
+                serial0 = &blsp1_uart1;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+};
+
+&soc {
+        serial@f991e000 {
+                status = "ok";
+        };
+
+};
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
index e87f2c99060d..701b396719c7 100644
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
@@ -491,7 +491,7 @@
                 pinctrl-0 = <&i2c8_pins>;
 
                 synaptics@2c {
-                        compatible = "syna,rmi-i2c";
+                        compatible = "syna,rmi4-i2c";
                         reg = <0x2c>;
 
                         interrupt-parent = <&msmgpio>;
@@ -506,6 +506,8 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&ts_int_pin>;
 
+                        syna,startup-delay-ms = <10>;
+
                         rmi-f01@1 {
                                 reg = <0x1>;
                                 syna,nosleep = <1>;
diff --git a/arch/arm/boot/dts/r8a7743-iwg20m.dtsi b/arch/arm/boot/dts/r8a7743-iwg20m.dtsi
index 75a8ca571846..1d3e9503c5bd 100644
--- a/arch/arm/boot/dts/r8a7743-iwg20m.dtsi
+++ b/arch/arm/boot/dts/r8a7743-iwg20m.dtsi
@@ -34,6 +34,10 @@
         };
 };
 
+&cmt0 {
+        status = "okay";
+};
+
 &extal_clk {
         clock-frequency = <20000000>;
 };
diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index 0b74c6c7d21d..1d9073ba0ce0 100644
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -141,29 +141,6 @@
                 #size-cells = <2>;
                 ranges;
 
-                apmu@e6152000 {
-                        compatible = "renesas,r8a7743-apmu", "renesas,apmu";
-                        reg = <0 0xe6152000 0 0x188>;
-                        cpus = <&cpu0 &cpu1>;
-                };
-
-                gic: interrupt-controller@f1001000 {
-                        compatible = "arm,gic-400";
-                        #interrupt-cells = <3>;
-                        #address-cells = <0>;
-                        interrupt-controller;
-                        reg = <0 0xf1001000 0 0x1000>,
-                              <0 0xf1002000 0 0x2000>,
-                              <0 0xf1004000 0 0x2000>,
-                              <0 0xf1006000 0 0x2000>;
-                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
-                                                 IRQ_TYPE_LEVEL_HIGH)>;
-                        clocks = <&cpg CPG_MOD 408>;
-                        clock-names = "clk";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 408>;
-                };
-
                 gpio0: gpio@e6050000 {
                         compatible = "renesas,gpio-r8a7743",
                                      "renesas,rcar-gen2-gpio";
@@ -284,6 +261,48 @@
                         resets = <&cpg 904>;
                 };
 
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a7743";
+                        reg = <0 0xe6060000 0 0x250>;
+                };
+
+                tpu: pwm@e60f0000 {
+                        compatible = "renesas,tpu-r8a7743", "renesas,tpu";
+                        reg = <0 0xe60f0000 0 0x148>;
+                        clocks = <&cpg CPG_MOD 304>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 304>;
+                        #pwm-cells = <3>;
+                        status = "disabled";
+                };
+
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a7743-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>, <&usb_extal_clk>;
+                        clock-names = "extal", "usb_extal";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
+
+                apmu@e6152000 {
+                        compatible = "renesas,r8a7743-apmu", "renesas,apmu";
+                        reg = <0 0xe6152000 0 0x188>;
+                        cpus = <&cpu0 &cpu1>;
+                };
+
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a7743-rst";
+                        reg = <0 0xe6160000 0 0x100>;
+                };
+
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a7743-sysc";
+                        reg = <0 0xe6180000 0 0x200>;
+                        #power-domain-cells = <1>;
+                };
+
                 irqc: interrupt-controller@e61c0000 {
                         compatible = "renesas,irqc-r8a7743", "renesas,irqc";
                         #interrupt-cells = <2>;
@@ -316,227 +335,89 @@
                         #thermal-sensor-cells = <0>;
                 };
 
-                cmt0: timer@ffca0000 {
-                        compatible = "renesas,r8a7743-cmt0",
-                                     "renesas,rcar-gen2-cmt0";
-                        reg = <0 0xffca0000 0 0x1004>;
-                        interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 124>;
-                        clock-names = "fck";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 124>;
+                ipmmu_sy0: mmu@e6280000 {
+                        compatible = "renesas,ipmmu-r8a7743",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6280000 0 0x1000>;
+                        interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
                         status = "disabled";
                 };
 
-                cmt1: timer@e6130000 {
-                        compatible = "renesas,r8a7743-cmt1",
-                                     "renesas,rcar-gen2-cmt1";
-                        reg = <0 0xe6130000 0 0x1004>;
-                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 329>;
-                        clock-names = "fck";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 329>;
+                ipmmu_sy1: mmu@e6290000 {
+                        compatible = "renesas,ipmmu-r8a7743",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6290000 0 0x1000>;
+                        interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
                         status = "disabled";
                 };
 
-                cpg: clock-controller@e6150000 {
-                        compatible = "renesas,r8a7743-cpg-mssr";
-                        reg = <0 0xe6150000 0 0x1000>;
-                        clocks = <&extal_clk>, <&usb_extal_clk>;
-                        clock-names = "extal", "usb_extal";
-                        #clock-cells = <2>;
-                        #power-domain-cells = <0>;
-                        #reset-cells = <1>;
-                };
-
-                prr: chipid@ff000044 {
-                        compatible = "renesas,prr";
-                        reg = <0 0xff000044 0 4>;
-                };
-
-                rst: reset-controller@e6160000 {
-                        compatible = "renesas,r8a7743-rst";
-                        reg = <0 0xe6160000 0 0x100>;
-                };
-
-                sysc: system-controller@e6180000 {
-                        compatible = "renesas,r8a7743-sysc";
-                        reg = <0 0xe6180000 0 0x200>;
-                        #power-domain-cells = <1>;
+                ipmmu_ds: mmu@e6740000 {
+                        compatible = "renesas,ipmmu-r8a7743",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6740000 0 0x1000>;
+                        interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
                 };
 
-                pfc: pin-controller@e6060000 {
-                        compatible = "renesas,pfc-r8a7743";
-                        reg = <0 0xe6060000 0 0x250>;
+                ipmmu_mp: mmu@ec680000 {
+                        compatible = "renesas,ipmmu-r8a7743",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xec680000 0 0x1000>;
+                        interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
                 };
 
-                dmac0: dma-controller@e6700000 {
-                        compatible = "renesas,dmac-r8a7743",
-                                     "renesas,rcar-dmac";
-                        reg = <0 0xe6700000 0 0x20000>;
-                        interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "error",
-                                        "ch0", "ch1", "ch2", "ch3",
-                                        "ch4", "ch5", "ch6", "ch7",
-                                        "ch8", "ch9", "ch10", "ch11",
-                                        "ch12", "ch13", "ch14";
-                        clocks = <&cpg CPG_MOD 219>;
-                        clock-names = "fck";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 219>;
-                        #dma-cells = <1>;
-                        dma-channels = <15>;
+                ipmmu_mx: mmu@fe951000 {
+                        compatible = "renesas,ipmmu-r8a7743",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xfe951000 0 0x1000>;
+                        interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
                 };
 
-                dmac1: dma-controller@e6720000 {
-                        compatible = "renesas,dmac-r8a7743",
-                                     "renesas,rcar-dmac";
-                        reg = <0 0xe6720000 0 0x20000>;
-                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "error",
-                                        "ch0", "ch1", "ch2", "ch3",
-                                        "ch4", "ch5", "ch6", "ch7",
-                                        "ch8", "ch9", "ch10", "ch11",
-                                        "ch12", "ch13", "ch14";
-                        clocks = <&cpg CPG_MOD 218>;
-                        clock-names = "fck";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 218>;
-                        #dma-cells = <1>;
-                        dma-channels = <15>;
+                ipmmu_gp: mmu@e62a0000 {
+                        compatible = "renesas,ipmmu-r8a7743",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe62a0000 0 0x1000>;
+                        interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
                 };
 
-                audma0: dma-controller@ec700000 {
-                        compatible = "renesas,dmac-r8a7743",
-                                     "renesas,rcar-dmac";
-                        reg = <0 0xec700000 0 0x10000>;
-                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "error",
-                                          "ch0", "ch1", "ch2", "ch3",
-                                          "ch4", "ch5", "ch6", "ch7",
-                                          "ch8", "ch9", "ch10", "ch11",
-                                          "ch12";
-                        clocks = <&cpg CPG_MOD 502>;
-                        clock-names = "fck";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 502>;
-                        #dma-cells = <1>;
-                        dma-channels = <13>;
+                icram0: sram@e63a0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63a0000 0 0x12000>;
                 };
 
-                audma1: dma-controller@ec720000 {
-                        compatible = "renesas,dmac-r8a7743",
-                                     "renesas,rcar-dmac";
-                        reg = <0 0xec720000 0 0x10000>;
-                        interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "error",
-                                          "ch0", "ch1", "ch2", "ch3",
-                                          "ch4", "ch5", "ch6", "ch7",
-                                          "ch8", "ch9", "ch10", "ch11",
-                                          "ch12";
-                        clocks = <&cpg CPG_MOD 501>;
-                        clock-names = "fck";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 501>;
-                        #dma-cells = <1>;
-                        dma-channels = <13>;
-                };
+                icram1: sram@e63c0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63c0000 0 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0 0xe63c0000 0x1000>;
 
-                usb_dmac0: dma-controller@e65a0000 {
-                        compatible = "renesas,r8a7743-usb-dmac",
-                                     "renesas,usb-dmac";
-                        reg = <0 0xe65a0000 0 0x100>;
-                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "ch0", "ch1";
-                        clocks = <&cpg CPG_MOD 330>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 330>;
-                        #dma-cells = <1>;
-                        dma-channels = <2>;
+                        smp-sram@0 {
+                                compatible = "renesas,smp-sram";
+                                reg = <0 0x10>;
+                        };
                 };
 
-                usb_dmac1: dma-controller@e65b0000 {
-                        compatible = "renesas,r8a7743-usb-dmac",
-                                     "renesas,usb-dmac";
-                        reg = <0 0xe65b0000 0 0x100>;
-                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "ch0", "ch1";
-                        clocks = <&cpg CPG_MOD 331>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 331>;
-                        #dma-cells = <1>;
-                        dma-channels = <2>;
+                icram2: sram@e6300000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe6300000 0 0x40000>;
                 };
 
-                /* The memory map in the User's Manual maps the cores to bus
-                 *  numbers
+                /* The memory map in the User's Manual maps the cores to
+                 * bus numbers
                  */
                 i2c0: i2c@e6508000 {
                         #address-cells = <1>;
@@ -675,6 +556,168 @@
                         status = "disabled";
                 };
 
+                hsusb: usb@e6590000 {
+                        compatible = "renesas,usbhs-r8a7743",
+                                     "renesas,rcar-gen2-usbhs";
+                        reg = <0 0xe6590000 0 0x100>;
+                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
+                               <&usb_dmac1 0>, <&usb_dmac1 1>;
+                        dma-names = "ch0", "ch1", "ch2", "ch3";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        renesas,buswait = <4>;
+                        phys = <&usb0 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
+
+                usbphy: usb-phy@e6590100 {
+                        compatible = "renesas,usb-phy-r8a7743",
+                                     "renesas,rcar-gen2-usb-phy";
+                        reg = <0 0xe6590100 0 0x100>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        clock-names = "usbhs";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        status = "disabled";
+
+                        usb0: usb-channel@0 {
+                                reg = <0>;
+                                #phy-cells = <1>;
+                        };
+                        usb2: usb-channel@2 {
+                                reg = <2>;
+                                #phy-cells = <1>;
+                        };
+                };
+
+                usb_dmac0: dma-controller@e65a0000 {
+                        compatible = "renesas,r8a7743-usb-dmac",
+                                     "renesas,usb-dmac";
+                        reg = <0 0xe65a0000 0 0x100>;
+                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1";
+                        clocks = <&cpg CPG_MOD 330>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 330>;
+                        #dma-cells = <1>;
+                        dma-channels = <2>;
+                };
+
+                usb_dmac1: dma-controller@e65b0000 {
+                        compatible = "renesas,r8a7743-usb-dmac",
+                                     "renesas,usb-dmac";
+                        reg = <0 0xe65b0000 0 0x100>;
+                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1";
+                        clocks = <&cpg CPG_MOD 331>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 331>;
+                        #dma-cells = <1>;
+                        dma-channels = <2>;
+                };
+
+                dmac0: dma-controller@e6700000 {
+                        compatible = "renesas,dmac-r8a7743",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6700000 0 0x20000>;
+                        interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 219>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 219>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
+
+                dmac1: dma-controller@e6720000 {
+                        compatible = "renesas,dmac-r8a7743",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6720000 0 0x20000>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 218>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 218>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
+
+                avb: ethernet@e6800000 {
+                        compatible = "renesas,etheravb-r8a7743",
+                                     "renesas,etheravb-rcar-gen2";
+                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 812>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 812>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                qspi: spi@e6b10000 {
+                        compatible = "renesas,qspi-r8a7743", "renesas,qspi";
+                        reg = <0 0xe6b10000 0 0x2c>;
+                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 917>;
+                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                               <&dmac1 0x17>, <&dmac1 0x18>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        num-cs = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        resets = <&cpg 917>;
+                        status = "disabled";
+                };
+
                 scifa0: serial@e6c40000 {
                         compatible = "renesas,scifa-r8a7743",
                                      "renesas,rcar-gen2-scifa", "renesas,scifa";
@@ -954,88 +997,6 @@
                         status = "disabled";
                 };
 
-                icram2: sram@e6300000 {
-                        compatible = "mmio-sram";
-                        reg = <0 0xe6300000 0 0x40000>;
-                };
-
-                icram0: sram@e63a0000 {
-                        compatible = "mmio-sram";
-                        reg = <0 0xe63a0000 0 0x12000>;
-                };
-
-                icram1: sram@e63c0000 {
-                        compatible = "mmio-sram";
-                        reg = <0 0xe63c0000 0 0x1000>;
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges = <0 0 0xe63c0000 0x1000>;
-
-                        smp-sram@0 {
-                                compatible = "renesas,smp-sram";
-                                reg = <0 0x10>;
-                        };
-                };
-
-                ether: ethernet@ee700000 {
-                        compatible = "renesas,ether-r8a7743",
-                                     "renesas,rcar-gen2-ether";
-                        reg = <0 0xee700000 0 0x400>;
-                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 813>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 813>;
-                        phy-mode = "rmii";
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                avb: ethernet@e6800000 {
-                        compatible = "renesas,etheravb-r8a7743",
-                                     "renesas,etheravb-rcar-gen2";
-                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 812>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 812>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                mmcif0: mmc@ee200000 {
-                        compatible = "renesas,mmcif-r8a7743",
-                                     "renesas,sh-mmcif";
-                        reg = <0 0xee200000 0 0x80>;
-                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 315>;
-                        dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                               <&dmac1 0xd1>, <&dmac1 0xd2>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 315>;
-                        reg-io-width = <4>;
-                        max-frequency = <97500000>;
-                        status = "disabled";
-                };
-
-                qspi: spi@e6b10000 {
-                        compatible = "renesas,qspi-r8a7743", "renesas,qspi";
-                        reg = <0 0xe6b10000 0 0x2c>;
-                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 917>;
-                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                               <&dmac1 0x17>, <&dmac1 0x18>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        num-cs = <1>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        resets = <&cpg 917>;
-                        status = "disabled";
-                };
-
                 msiof0: spi@e6e20000 {
                         compatible = "renesas,msiof-r8a7743",
                                      "renesas,rcar-gen2-msiof";
@@ -1084,26 +1045,6 @@
                         status = "disabled";
                 };
 
-                /*
-                 * pci1 and xhci share the same phy, therefore only one of them
-                 * can be active at any one time. If both of them are enabled,
-                 * a race condition will determine who'll control the phy.
-                 * A firmware file is needed by the xhci driver in order for
-                 * USB 3.0 to work properly.
-                 */
-                xhci: usb@ee000000 {
-                        compatible = "renesas,xhci-r8a7743",
-                                     "renesas,rcar-gen2-xhci";
-                        reg = <0 0xee000000 0 0xc00>;
-                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 328>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 328>;
-                        phys = <&usb2 1>;
-                        phy-names = "usb";
-                        status = "disabled";
-                };
-
                 pwm0: pwm@e6e30000 {
                         compatible = "renesas,pwm-r8a7743", "renesas,pwm-rcar";
                         reg = <0 0xe6e30000 0 0x8>;
@@ -1174,98 +1115,32 @@
                         status = "disabled";
                 };
 
-                tpu: pwm@e60f0000 {
-                        compatible = "renesas,tpu-r8a7743", "renesas,tpu";
-                        reg = <0 0xe60f0000 0 0x148>;
-                        clocks = <&cpg CPG_MOD 304>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 304>;
-                        #pwm-cells = <3>;
-                        status = "disabled";
-                };
-
-                sdhi0: sd@ee100000 {
-                        compatible = "renesas,sdhi-r8a7743",
-                                     "renesas,rcar-gen2-sdhi";
-                        reg = <0 0xee100000 0 0x328>;
-                        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 314>;
-                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                               <&dmac1 0xcd>, <&dmac1 0xce>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        max-frequency = <195000000>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 314>;
-                        status = "disabled";
-                };
-
-                sdhi1: sd@ee140000 {
-                        compatible = "renesas,sdhi-r8a7743",
-                                     "renesas,rcar-gen2-sdhi";
-                        reg = <0 0xee140000 0 0x100>;
-                        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 312>;
-                        dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                               <&dmac1 0xc1>, <&dmac1 0xc2>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        max-frequency = <97500000>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 312>;
-                        status = "disabled";
-                };
-
-                sdhi2: sd@ee160000 {
-                        compatible = "renesas,sdhi-r8a7743",
-                                     "renesas,rcar-gen2-sdhi";
-                        reg = <0 0xee160000 0 0x100>;
-                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 311>;
-                        dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                               <&dmac1 0xd3>, <&dmac1 0xd4>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        max-frequency = <97500000>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 311>;
-                        status = "disabled";
-                };
-
-                hsusb: usb@e6590000 {
-                        compatible = "renesas,usbhs-r8a7743",
-                                     "renesas,rcar-gen2-usbhs";
-                        reg = <0 0xe6590000 0 0x100>;
-                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 704>;
-                        dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
-                               <&usb_dmac1 0>, <&usb_dmac1 1>;
-                        dma-names = "ch0", "ch1", "ch2", "ch3";
+                can0: can@e6e80000 {
+                        compatible = "renesas,can-r8a7743",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e80000 0 0x1000>;
+                        interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 916>,
+                                 <&cpg CPG_CORE R8A7743_CLK_RCAN>,
+                                 <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
                         power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 704>;
-                        renesas,buswait = <4>;
-                        phys = <&usb0 1>;
-                        phy-names = "usb";
+                        resets = <&cpg 916>;
                         status = "disabled";
                 };
 
-                usbphy: usb-phy@e6590100 {
-                        compatible = "renesas,usb-phy-r8a7743",
-                                     "renesas,rcar-gen2-usb-phy";
-                        reg = <0 0xe6590100 0 0x100>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        clocks = <&cpg CPG_MOD 704>;
-                        clock-names = "usbhs";
+                can1: can@e6e88000 {
+                        compatible = "renesas,can-r8a7743",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e88000 0 0x1000>;
+                        interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 915>,
+                                 <&cpg CPG_CORE R8A7743_CLK_RCAN>,
+                                 <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
                         power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 704>;
+                        resets = <&cpg 915>;
                         status = "disabled";
-
-                        usb0: usb-channel@0 {
-                                reg = <0>;
-                                #phy-cells = <1>;
-                        };
-                        usb2: usb-channel@2 {
-                                reg = <2>;
-                                #phy-cells = <1>;
-                        };
                 };
 
                 vin0: video@e6ef0000 {
@@ -1301,162 +1176,6 @@
                         status = "disabled";
                 };
 
-                du: display@feb00000 {
-                        compatible = "renesas,du-r8a7743";
-                        reg = <0 0xfeb00000 0 0x40000>,
-                              <0 0xfeb90000 0 0x1c>;
-                        reg-names = "du", "lvds.0";
-                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 724>,
-                                 <&cpg CPG_MOD 723>,
-                                 <&cpg CPG_MOD 726>;
-                        clock-names = "du.0", "du.1", "lvds.0";
-                        status = "disabled";
-
-                        ports {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-
-                                port@0 {
-                                        reg = <0>;
-                                        du_out_rgb: endpoint {
-                                        };
-                                };
-                                port@1 {
-                                        reg = <1>;
-                                        du_out_lvds0: endpoint {
-                                        };
-                                };
-                        };
-                };
-
-                can0: can@e6e80000 {
-                        compatible = "renesas,can-r8a7743",
-                                     "renesas,rcar-gen2-can";
-                        reg = <0 0xe6e80000 0 0x1000>;
-                        interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 916>,
-                                 <&cpg CPG_CORE R8A7743_CLK_RCAN>,
-                                 <&can_clk>;
-                        clock-names = "clkp1", "clkp2", "can_clk";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 916>;
-                        status = "disabled";
-                };
-
-                can1: can@e6e88000 {
-                        compatible = "renesas,can-r8a7743",
-                                     "renesas,rcar-gen2-can";
-                        reg = <0 0xe6e88000 0 0x1000>;
-                        interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 915>,
-                                 <&cpg CPG_CORE R8A7743_CLK_RCAN>,
-                                 <&can_clk>;
-                        clock-names = "clkp1", "clkp2", "can_clk";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 915>;
-                        status = "disabled";
-                };
-
-                pci0: pci@ee090000 {
-                        compatible = "renesas,pci-r8a7743",
-                                     "renesas,pci-rcar-gen2";
-                        device_type = "pci";
-                        reg = <0 0xee090000 0 0xc00>,
-                              <0 0xee080000 0 0x1100>;
-                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 703>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 703>;
-                        status = "disabled";
-
-                        bus-range = <0 0>;
-                        #address-cells = <3>;
-                        #size-cells = <2>;
-                        #interrupt-cells = <1>;
-                        ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
-                        interrupt-map-mask = <0xff00 0 0 0x7>;
-                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                         0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                         0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-
-                        usb@1,0 {
-                                reg = <0x800 0 0 0 0>;
-                                phys = <&usb0 0>;
-                                phy-names = "usb";
-                        };
-
-                        usb@2,0 {
-                                reg = <0x1000 0 0 0 0>;
-                                phys = <&usb0 0>;
-                                phy-names = "usb";
-                        };
-                };
-
-                pci1: pci@ee0d0000 {
-                        compatible = "renesas,pci-r8a7743",
-                                     "renesas,pci-rcar-gen2";
-                        device_type = "pci";
-                        reg = <0 0xee0d0000 0 0xc00>,
-                              <0 0xee0c0000 0 0x1100>;
-                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 703>;
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 703>;
-                        status = "disabled";
-
-                        bus-range = <1 1>;
-                        #address-cells = <3>;
-                        #size-cells = <2>;
-                        #interrupt-cells = <1>;
-                        ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
-                        interrupt-map-mask = <0xff00 0 0 0x7>;
-                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                         0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                         0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-
-                        usb@1,0 {
-                                reg = <0x10800 0 0 0 0>;
-                                phys = <&usb2 0>;
-                                phy-names = "usb";
-                        };
-
-                        usb@2,0 {
-                                reg = <0x11000 0 0 0 0>;
-                                phys = <&usb2 0>;
-                                phy-names = "usb";
-                        };
-                };
-
-                pciec: pcie@fe000000 {
-                        compatible = "renesas,pcie-r8a7743",
-                                     "renesas,pcie-rcar-gen2";
-                        reg = <0 0xfe000000 0 0x80000>;
-                        #address-cells = <3>;
-                        #size-cells = <2>;
-                        bus-range = <0x00 0xff>;
-                        device_type = "pci";
-                        ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
-                                  0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
-                                  0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
-                                  0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
-                        /* Map all possible DDR as inbound ranges */
-                        dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
-                                      0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
-                        interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-                        #interrupt-cells = <1>;
-                        interrupt-map-mask = <0 0 0 0>;
-                        interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
-                        clock-names = "pcie", "pcie_bus";
-                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                        resets = <&cpg 319>;
-                        status = "disabled";
-                };
-
                 rcar_sound: sound@ec500000 {
                         /*
                          * #sound-dai-cells is required
@@ -1641,6 +1360,369 @@
                                 };
                         };
                 };
+
+                audma0: dma-controller@ec700000 {
+                        compatible = "renesas,dmac-r8a7743",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec700000 0 0x10000>;
+                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 502>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 502>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
+
+                audma1: dma-controller@ec720000 {
+                        compatible = "renesas,dmac-r8a7743",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec720000 0 0x10000>;
+                        interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 501>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 501>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
+
+                /*
+                 * pci1 and xhci share the same phy, therefore only one of them
+                 * can be active at any one time. If both of them are enabled,
+                 * a race condition will determine who'll control the phy.
+                 * A firmware file is needed by the xhci driver in order for
+                 * USB 3.0 to work properly.
+                 */
+                xhci: usb@ee000000 {
+                        compatible = "renesas,xhci-r8a7743",
+                                     "renesas,rcar-gen2-xhci";
+                        reg = <0 0xee000000 0 0xc00>;
+                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 328>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 328>;
+                        phys = <&usb2 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
+
+                pci0: pci@ee090000 {
+                        compatible = "renesas,pci-r8a7743",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee090000 0 0xc00>,
+                              <0 0xee080000 0 0x1100>;
+                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x800 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
+
+                        usb@2,0 {
+                                reg = <0x1000 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
+                };
+
+                pci1: pci@ee0d0000 {
+                        compatible = "renesas,pci-r8a7743",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee0d0000 0 0xc00>,
+                              <0 0xee0c0000 0 0x1100>;
+                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <1 1>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x10800 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
+
+                        usb@2,0 {
+                                reg = <0x11000 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
+                };
+
+                sdhi0: sd@ee100000 {
+                        compatible = "renesas,sdhi-r8a7743",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee100000 0 0x328>;
+                        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 314>;
+                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                               <&dmac1 0xcd>, <&dmac1 0xce>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <195000000>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 314>;
+                        status = "disabled";
+                };
+
+                sdhi1: sd@ee140000 {
+                        compatible = "renesas,sdhi-r8a7743",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee140000 0 0x100>;
+                        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 312>;
+                        dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                               <&dmac1 0xc1>, <&dmac1 0xc2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 312>;
+                        status = "disabled";
+                };
+
+                sdhi2: sd@ee160000 {
+                        compatible = "renesas,sdhi-r8a7743",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee160000 0 0x100>;
+                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 311>;
+                        dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                               <&dmac1 0xd3>, <&dmac1 0xd4>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 311>;
+                        status = "disabled";
+                };
+
+                mmcif0: mmc@ee200000 {
+                        compatible = "renesas,mmcif-r8a7743",
+                                     "renesas,sh-mmcif";
+                        reg = <0 0xee200000 0 0x80>;
+                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 315>;
+                        dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                               <&dmac1 0xd1>, <&dmac1 0xd2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 315>;
+                        reg-io-width = <4>;
+                        max-frequency = <97500000>;
+                        status = "disabled";
+                };
+
+                ether: ethernet@ee700000 {
+                        compatible = "renesas,ether-r8a7743",
+                                     "renesas,rcar-gen2-ether";
+                        reg = <0 0xee700000 0 0x400>;
+                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 813>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 813>;
+                        phy-mode = "rmii";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                gic: interrupt-controller@f1001000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        #address-cells = <0>;
+                        interrupt-controller;
+                        reg = <0 0xf1001000 0 0x1000>, <0 0xf1002000 0 0x2000>,
+                              <0 0xf1004000 0 0x2000>, <0 0xf1006000 0 0x2000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 408>;
+                };
+
+                pciec: pcie@fe000000 {
+                        compatible = "renesas,pcie-r8a7743",
+                                     "renesas,pcie-rcar-gen2";
+                        reg = <0 0xfe000000 0 0x80000>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        bus-range = <0x00 0xff>;
+                        device_type = "pci";
+                        ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+                                  0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+                                  0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+                                  0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+                        /* Map all possible DDR as inbound ranges */
+                        dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+                                      0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
+                        interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
+                        clock-names = "pcie", "pcie_bus";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 319>;
+                        status = "disabled";
+                };
+
+                vsp@fe928000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe928000 0 0x8000>;
+                        interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 131>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 131>;
+                };
+
+                vsp@fe930000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe930000 0 0x8000>;
+                        interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 128>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 128>;
+                };
+
+                vsp@fe938000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe938000 0 0x8000>;
+                        interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 127>;
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 127>;
+                };
+
+                du: display@feb00000 {
+                        compatible = "renesas,du-r8a7743";
+                        reg = <0 0xfeb00000 0 0x40000>,
+                              <0 0xfeb90000 0 0x1c>;
+                        reg-names = "du", "lvds.0";
+                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 724>,
+                                 <&cpg CPG_MOD 723>,
+                                 <&cpg CPG_MOD 726>;
+                        clock-names = "du.0", "du.1", "lvds.0";
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb: endpoint {
+                                        };
+                                };
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_lvds0: endpoint {
+                                        };
+                                };
+                        };
+                };
+
+                prr: chipid@ff000044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xff000044 0 4>;
+                };
+
+                cmt0: timer@ffca0000 {
+                        compatible = "renesas,r8a7743-cmt0",
+                                     "renesas,rcar-gen2-cmt0";
+                        reg = <0 0xffca0000 0 0x1004>;
+                        interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 124>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 124>;
+                        status = "disabled";
+                };
+
+                cmt1: timer@e6130000 {
+                        compatible = "renesas,r8a7743-cmt1",
+                                     "renesas,rcar-gen2-cmt1";
+                        reg = <0 0xe6130000 0 0x1004>;
+                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 329>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                        resets = <&cpg 329>;
+                        status = "disabled";
+                };
         };
 
         thermal-zones {
diff --git a/arch/arm/boot/dts/r8a7745-iwg22m.dtsi b/arch/arm/boot/dts/r8a7745-iwg22m.dtsi
index ed9a8cf3fe36..8d0a392b6811 100644
--- a/arch/arm/boot/dts/r8a7745-iwg22m.dtsi
+++ b/arch/arm/boot/dts/r8a7745-iwg22m.dtsi
@@ -29,6 +29,10 @@
         };
 };
 
+&cmt0 {
+        status = "okay";
+};
+
 &extal_clk {
         clock-frequency = <20000000>;
 };
diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi
index ae918e9cce21..dd49a8b48f3e 100644
--- a/arch/arm/boot/dts/r8a7745.dtsi
+++ b/arch/arm/boot/dts/r8a7745.dtsi
@@ -121,29 +121,6 @@
                 #size-cells = <2>;
                 ranges;
 
-                apmu@e6151000 {
-                        compatible = "renesas,r8a7745-apmu", "renesas,apmu";
-                        reg = <0 0xe6151000 0 0x188>;
-                        cpus = <&cpu0 &cpu1>;
-                };
-
-                gic: interrupt-controller@f1001000 {
-                        compatible = "arm,gic-400";
-                        #interrupt-cells = <3>;
-                        #address-cells = <0>;
-                        interrupt-controller;
-                        reg = <0 0xf1001000 0 0x1000>,
-                              <0 0xf1002000 0 0x2000>,
-                              <0 0xf1004000 0 0x2000>,
-                              <0 0xf1006000 0 0x2000>;
-                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
-                                                 IRQ_TYPE_LEVEL_HIGH)>;
-                        clocks = <&cpg CPG_MOD 408>;
-                        clock-names = "clk";
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 408>;
-                };
-
                 gpio0: gpio@e6050000 {
                         compatible = "renesas,gpio-r8a7745",
                                      "renesas,rcar-gen2-gpio";
@@ -249,6 +226,48 @@
                         resets = <&cpg 905>;
                 };
 
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a7745";
+                        reg = <0 0xe6060000 0 0x11c>;
+                };
+
+                tpu: pwm@e60f0000 {
+                        compatible = "renesas,tpu-r8a7745", "renesas,tpu";
+                        reg = <0 0xe60f0000 0 0x148>;
+                        clocks = <&cpg CPG_MOD 304>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 304>;
+                        #pwm-cells = <3>;
+                        status = "disabled";
+                };
+
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a7745-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>, <&usb_extal_clk>;
+                        clock-names = "extal", "usb_extal";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
+
+                apmu@e6151000 {
+                        compatible = "renesas,r8a7745-apmu", "renesas,apmu";
+                        reg = <0 0xe6151000 0 0x188>;
+                        cpus = <&cpu0 &cpu1>;
+                };
+
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a7745-rst";
+                        reg = <0 0xe6160000 0 0x100>;
+                };
+
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a7745-sysc";
+                        reg = <0 0xe6180000 0 0x200>;
+                        #power-domain-cells = <1>;
+                };
+
                 irqc: interrupt-controller@e61c0000 {
                         compatible = "renesas,irqc-r8a7745", "renesas,irqc";
                         #interrupt-cells = <2>;
@@ -269,67 +288,269 @@
                         resets = <&cpg 407>;
                 };
 
-                cmt0: timer@ffca0000 {
-                        compatible = "renesas,r8a7745-cmt0",
-                                     "renesas,rcar-gen2-cmt0";
-                        reg = <0 0xffca0000 0 0x1004>;
-                        interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 124>;
-                        clock-names = "fck";
+                ipmmu_sy0: mmu@e6280000 {
+                        compatible = "renesas,ipmmu-r8a7745",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6280000 0 0x1000>;
+                        interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
+
+                ipmmu_sy1: mmu@e6290000 {
+                        compatible = "renesas,ipmmu-r8a7745",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6290000 0 0x1000>;
+                        interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
+
+                ipmmu_ds: mmu@e6740000 {
+                        compatible = "renesas,ipmmu-r8a7745",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6740000 0 0x1000>;
+                        interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
+
+                ipmmu_mp: mmu@ec680000 {
+                        compatible = "renesas,ipmmu-r8a7745",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xec680000 0 0x1000>;
+                        interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
+
+                ipmmu_mx: mmu@fe951000 {
+                        compatible = "renesas,ipmmu-r8a7745",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xfe951000 0 0x1000>;
+                        interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
+
+                ipmmu_gp: mmu@e62a0000 {
+                        compatible = "renesas,ipmmu-r8a7745",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe62a0000 0 0x1000>;
+                        interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
+
+                icram0: sram@e63a0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63a0000 0 0x12000>;
+                };
+
+                icram1: sram@e63c0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63c0000 0 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0 0xe63c0000 0x1000>;
+
+                        smp-sram@0 {
+                                compatible = "renesas,smp-sram";
+                                reg = <0 0x10>;
+                        };
+                };
+
+                icram2: sram@e6300000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe6300000 0 0x40000>;
+                };
+                i2c0: i2c@e6508000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7745",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6508000 0 0x40>;
+                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 931>;
                         power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 124>;
+                        resets = <&cpg 931>;
+                        i2c-scl-internal-delay-ns = <6>;
                         status = "disabled";
                 };
 
-                cmt1: timer@e6130000 {
-                        compatible = "renesas,r8a7745-cmt1",
-                                     "renesas,rcar-gen2-cmt1";
-                        reg = <0 0xe6130000 0 0x1004>;
-                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 329>;
-                        clock-names = "fck";
+                i2c1: i2c@e6518000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7745",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6518000 0 0x40>;
+                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 930>;
                         power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 329>;
+                        resets = <&cpg 930>;
+                        i2c-scl-internal-delay-ns = <6>;
                         status = "disabled";
                 };
 
-                cpg: clock-controller@e6150000 {
-                        compatible = "renesas,r8a7745-cpg-mssr";
-                        reg = <0 0xe6150000 0 0x1000>;
-                        clocks = <&extal_clk>, <&usb_extal_clk>;
-                        clock-names = "extal", "usb_extal";
-                        #clock-cells = <2>;
-                        #power-domain-cells = <0>;
-                        #reset-cells = <1>;
+                i2c2: i2c@e6530000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7745",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6530000 0 0x40>;
+                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 929>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 929>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
                 };
 
-                prr: chipid@ff000044 {
-                        compatible = "renesas,prr";
-                        reg = <0 0xff000044 0 4>;
+                i2c3: i2c@e6540000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7745",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6540000 0 0x40>;
+                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 928>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 928>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
                 };
 
-                rst: reset-controller@e6160000 {
-                        compatible = "renesas,r8a7745-rst";
-                        reg = <0 0xe6160000 0 0x100>;
+                i2c4: i2c@e6520000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7745",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6520000 0 0x40>;
+                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 927>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 927>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
                 };
 
-                sysc: system-controller@e6180000 {
-                        compatible = "renesas,r8a7745-sysc";
-                        reg = <0 0xe6180000 0 0x200>;
-                        #power-domain-cells = <1>;
+                i2c5: i2c@e6528000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7745",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6528000 0 0x40>;
+                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 925>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 925>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
                 };
 
-                pfc: pin-controller@e6060000 {
-                        compatible = "renesas,pfc-r8a7745";
-                        reg = <0 0xe6060000 0 0x11c>;
+                iic0: i2c@e6500000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7745",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6500000 0 0x425>;
+                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 318>;
+                        dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                               <&dmac1 0x61>, <&dmac1 0x62>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 318>;
+                        status = "disabled";
+                };
+
+                iic1: i2c@e6510000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7745",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6510000 0 0x425>;
+                        interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 323>;
+                        dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                               <&dmac1 0x65>, <&dmac1 0x66>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 323>;
+                        status = "disabled";
+                };
+
+                hsusb: usb@e6590000 {
+                        compatible = "renesas,usbhs-r8a7745",
+                                     "renesas,rcar-gen2-usbhs";
+                        reg = <0 0xe6590000 0 0x100>;
+                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
+                               <&usb_dmac1 0>, <&usb_dmac1 1>;
+                        dma-names = "ch0", "ch1", "ch2", "ch3";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        renesas,buswait = <4>;
+                        phys = <&usb0 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
+
+                usbphy: usb-phy@e6590100 {
+                        compatible = "renesas,usb-phy-r8a7745",
+                                     "renesas,rcar-gen2-usb-phy";
+                        reg = <0 0xe6590100 0 0x100>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        clock-names = "usbhs";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        status = "disabled";
+
+                        usb0: usb-channel@0 {
+                                reg = <0>;
+                                #phy-cells = <1>;
+                        };
+                        usb2: usb-channel@2 {
+                                reg = <2>;
+                                #phy-cells = <1>;
+                        };
+                };
+
+                usb_dmac0: dma-controller@e65a0000 {
+                        compatible = "renesas,r8a7745-usb-dmac",
+                                     "renesas,usb-dmac";
+                        reg = <0 0xe65a0000 0 0x100>;
+                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1";
+                        clocks = <&cpg CPG_MOD 330>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 330>;
+                        #dma-cells = <1>;
+                        dma-channels = <2>;
+                };
+
+                usb_dmac1: dma-controller@e65b0000 {
+                        compatible = "renesas,r8a7745-usb-dmac",
+                                     "renesas,usb-dmac";
+                        reg = <0 0xe65b0000 0 0x100>;
+                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1";
+                        clocks = <&cpg CPG_MOD 331>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 331>;
+                        #dma-cells = <1>;
+                        dma-channels = <2>;
                 };
 
                 dmac0: dma-controller@e6700000 {
@@ -353,10 +574,10 @@
                                       GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
                                       GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
                         interrupt-names = "error",
-                                        "ch0", "ch1", "ch2", "ch3",
-                                        "ch4", "ch5", "ch6", "ch7",
-                                        "ch8", "ch9", "ch10", "ch11",
-                                        "ch12", "ch13", "ch14";
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
                         clocks = <&cpg CPG_MOD 219>;
                         clock-names = "fck";
                         power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
@@ -386,75 +607,45 @@
                                       GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
                                       GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
                         interrupt-names = "error",
-                                        "ch0", "ch1", "ch2", "ch3",
-                                        "ch4", "ch5", "ch6", "ch7",
-                                        "ch8", "ch9", "ch10", "ch11",
-                                        "ch12", "ch13", "ch14";
-                        clocks = <&cpg CPG_MOD 218>;
-                        clock-names = "fck";
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 218>;
-                        #dma-cells = <1>;
-                        dma-channels = <15>;
-                };
-
-                audma0: dma-controller@ec700000 {
-                        compatible = "renesas,dmac-r8a7745",
-                                     "renesas,rcar-dmac";
-                        reg = <0 0xec700000 0 0x10000>;
-                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "error",
                                           "ch0", "ch1", "ch2", "ch3",
                                           "ch4", "ch5", "ch6", "ch7",
                                           "ch8", "ch9", "ch10", "ch11",
-                                          "ch12";
-                        clocks = <&cpg CPG_MOD 502>;
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 218>;
                         clock-names = "fck";
                         power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 502>;
+                        resets = <&cpg 218>;
                         #dma-cells = <1>;
-                        dma-channels = <13>;
+                        dma-channels = <15>;
                 };
 
-                usb_dmac0: dma-controller@e65a0000 {
-                        compatible = "renesas,r8a7745-usb-dmac",
-                                     "renesas,usb-dmac";
-                        reg = <0 0xe65a0000 0 0x100>;
-                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "ch0", "ch1";
-                        clocks = <&cpg CPG_MOD 330>;
+                avb: ethernet@e6800000 {
+                        compatible = "renesas,etheravb-r8a7745",
+                                     "renesas,etheravb-rcar-gen2";
+                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 812>;
                         power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 330>;
-                        #dma-cells = <1>;
-                        dma-channels = <2>;
+                        resets = <&cpg 812>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
                 };
 
-                usb_dmac1: dma-controller@e65b0000 {
-                        compatible = "renesas,r8a7745-usb-dmac",
-                                     "renesas,usb-dmac";
-                        reg = <0 0xe65b0000 0 0x100>;
-                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
-                                      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "ch0", "ch1";
-                        clocks = <&cpg CPG_MOD 331>;
+                qspi: spi@e6b10000 {
+                        compatible = "renesas,qspi-r8a7745", "renesas,qspi";
+                        reg = <0 0xe6b10000 0 0x2c>;
+                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 917>;
+                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                               <&dmac1 0x17>, <&dmac1 0x18>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 331>;
-                        #dma-cells = <1>;
-                        dma-channels = <2>;
+                        num-cs = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        resets = <&cpg 917>;
+                        status = "disabled";
                 };
 
                 scifa0: serial@e6c40000 {
@@ -736,255 +927,6 @@
                         status = "disabled";
                 };
 
-                icram2: sram@e6300000 {
-                        compatible = "mmio-sram";
-                        reg = <0 0xe6300000 0 0x40000>;
-                };
-
-                icram0: sram@e63a0000 {
-                        compatible = "mmio-sram";
-                        reg = <0 0xe63a0000 0 0x12000>;
-                };
-
-                icram1: sram@e63c0000 {
-                        compatible = "mmio-sram";
-                        reg = <0 0xe63c0000 0 0x1000>;
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges = <0 0 0xe63c0000 0x1000>;
-
-                        smp-sram@0 {
-                                compatible = "renesas,smp-sram";
-                                reg = <0 0x10>;
-                        };
-                };
-
-                ether: ethernet@ee700000 {
-                        compatible = "renesas,ether-r8a7745",
-                                     "renesas,rcar-gen2-ether";
-                        reg = <0 0xee700000 0 0x400>;
-                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 813>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 813>;
-                        phy-mode = "rmii";
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                avb: ethernet@e6800000 {
-                        compatible = "renesas,etheravb-r8a7745",
-                                     "renesas,etheravb-rcar-gen2";
-                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 812>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 812>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                i2c0: i2c@e6508000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "renesas,i2c-r8a7745",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6508000 0 0x40>;
-                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 931>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 931>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        status = "disabled";
-                };
-
-                i2c1: i2c@e6518000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "renesas,i2c-r8a7745",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6518000 0 0x40>;
-                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 930>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 930>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        status = "disabled";
-                };
-
-                i2c2: i2c@e6530000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "renesas,i2c-r8a7745",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6530000 0 0x40>;
-                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 929>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 929>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        status = "disabled";
-                };
-
-                i2c3: i2c@e6540000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "renesas,i2c-r8a7745",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6540000 0 0x40>;
-                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 928>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 928>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        status = "disabled";
-                };
-
-                i2c4: i2c@e6520000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "renesas,i2c-r8a7745",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6520000 0 0x40>;
-                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 927>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 927>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        status = "disabled";
-                };
-
-                i2c5: i2c@e6528000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "renesas,i2c-r8a7745",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6528000 0 0x40>;
-                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 925>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 925>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        status = "disabled";
-                };
-
-                iic0: i2c@e6500000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "renesas,iic-r8a7745",
-                                     "renesas,rcar-gen2-iic",
-                                     "renesas,rmobile-iic";
-                        reg = <0 0xe6500000 0 0x425>;
-                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 318>;
-                        dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                               <&dmac1 0x61>, <&dmac1 0x62>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 318>;
-                        status = "disabled";
-                };
-
-                iic1: i2c@e6510000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "renesas,iic-r8a7745",
-                                     "renesas,rcar-gen2-iic",
-                                     "renesas,rmobile-iic";
-                        reg = <0 0xe6510000 0 0x425>;
-                        interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 323>;
-                        dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                               <&dmac1 0x65>, <&dmac1 0x66>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 323>;
-                        status = "disabled";
-                };
-
-                mmcif0: mmc@ee200000 {
-                        compatible = "renesas,mmcif-r8a7745",
-                                     "renesas,sh-mmcif";
-                        reg = <0 0xee200000 0 0x80>;
-                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 315>;
-                        dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                               <&dmac1 0xd1>, <&dmac1 0xd2>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 315>;
-                        reg-io-width = <4>;
-                        max-frequency = <97500000>;
-                        status = "disabled";
-                };
-
-                qspi: spi@e6b10000 {
-                        compatible = "renesas,qspi-r8a7745", "renesas,qspi";
-                        reg = <0 0xe6b10000 0 0x2c>;
-                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 917>;
-                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                               <&dmac1 0x17>, <&dmac1 0x18>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        num-cs = <1>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        resets = <&cpg 917>;
-                        status = "disabled";
-                };
-
-                vin0: video@e6ef0000 {
-                        compatible = "renesas,vin-r8a7745",
-                                     "renesas,rcar-gen2-vin";
-                        reg = <0 0xe6ef0000 0 0x1000>;
-                        interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 811>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 811>;
-                        status = "disabled";
-                };
-
-                vin1: video@e6ef1000 {
-                        compatible = "renesas,vin-r8a7745",
-                                     "renesas,rcar-gen2-vin";
-                        reg = <0 0xe6ef1000 0 0x1000>;
-                        interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 810>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 810>;
-                        status = "disabled";
-                };
-
-                du: display@feb00000 {
-                        compatible = "renesas,du-r8a7745";
-                        reg = <0 0xfeb00000 0 0x40000>;
-                        reg-names = "du";
-                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
-                        clock-names = "du.0", "du.1";
-                        status = "disabled";
-
-                        ports {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-
-                                port@0 {
-                                        reg = <0>;
-                                        du_out_rgb0: endpoint {
-                                        };
-                                };
-                                port@1 {
-                                        reg = <1>;
-                                        du_out_rgb1: endpoint {
-                                        };
-                                };
-                        };
-                };
-
                 msiof0: spi@e6e20000 {
                         compatible = "renesas,msiof-r8a7745",
                                      "renesas,rcar-gen2-msiof";
@@ -1103,170 +1045,6 @@
                         status = "disabled";
                 };
 
-                tpu: pwm@e60f0000 {
-                        compatible = "renesas,tpu-r8a7745", "renesas,tpu";
-                        reg = <0 0xe60f0000 0 0x148>;
-                        clocks = <&cpg CPG_MOD 304>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 304>;
-                        #pwm-cells = <3>;
-                        status = "disabled";
-                };
-
-                sdhi0: sd@ee100000 {
-                        compatible = "renesas,sdhi-r8a7745",
-                                     "renesas,rcar-gen2-sdhi";
-                        reg = <0 0xee100000 0 0x328>;
-                        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 314>;
-                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                               <&dmac1 0xcd>, <&dmac1 0xce>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        max-frequency = <195000000>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 314>;
-                        status = "disabled";
-                };
-
-                sdhi1: sd@ee140000 {
-                        compatible = "renesas,sdhi-r8a7745",
-                                     "renesas,rcar-gen2-sdhi";
-                        reg = <0 0xee140000 0 0x100>;
-                        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 312>;
-                        dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                               <&dmac1 0xc1>, <&dmac1 0xc2>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        max-frequency = <97500000>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 312>;
-                        status = "disabled";
-                };
-
-                sdhi2: sd@ee160000 {
-                        compatible = "renesas,sdhi-r8a7745",
-                                     "renesas,rcar-gen2-sdhi";
-                        reg = <0 0xee160000 0 0x100>;
-                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 311>;
-                        dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                               <&dmac1 0xd3>, <&dmac1 0xd4>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        max-frequency = <97500000>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 311>;
-                        status = "disabled";
-                };
-
-                pci0: pci@ee090000 {
-                        compatible = "renesas,pci-r8a7745",
-                                     "renesas,pci-rcar-gen2";
-                        device_type = "pci";
-                        reg = <0 0xee090000 0 0xc00>,
-                              <0 0xee080000 0 0x1100>;
-                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 703>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 703>;
-                        status = "disabled";
-
-                        bus-range = <0 0>;
-                        #address-cells = <3>;
-                        #size-cells = <2>;
-                        #interrupt-cells = <1>;
-                        ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
-                        interrupt-map-mask = <0xff00 0 0 0x7>;
-                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                         0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                         0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-
-                        usb@1,0 {
-                                reg = <0x800 0 0 0 0>;
-                                phys = <&usb0 0>;
-                                phy-names = "usb";
-                        };
-
-                        usb@2,0 {
-                                reg = <0x1000 0 0 0 0>;
-                                phys = <&usb0 0>;
-                                phy-names = "usb";
-                        };
-                };
-
-                pci1: pci@ee0d0000 {
-                        compatible = "renesas,pci-r8a7745",
-                                     "renesas,pci-rcar-gen2";
-                        device_type = "pci";
-                        reg = <0 0xee0d0000 0 0xc00>,
-                              <0 0xee0c0000 0 0x1100>;
-                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 703>;
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 703>;
-                        status = "disabled";
-
-                        bus-range = <1 1>;
-                        #address-cells = <3>;
-                        #size-cells = <2>;
-                        #interrupt-cells = <1>;
-                        ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
-                        interrupt-map-mask = <0xff00 0 0 0x7>;
-                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                         0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                         0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-
-                        usb@1,0 {
-                                reg = <0x10800 0 0 0 0>;
-                                phys = <&usb2 0>;
-                                phy-names = "usb";
-                        };
-
-                        usb@2,0 {
-                                reg = <0x11000 0 0 0 0>;
-                                phys = <&usb2 0>;
-                                phy-names = "usb";
-                        };
-                };
-
-                hsusb: usb@e6590000 {
-                        compatible = "renesas,usbhs-r8a7745",
-                                     "renesas,rcar-gen2-usbhs";
-                        reg = <0 0xe6590000 0 0x100>;
-                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 704>;
-                        dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
-                               <&usb_dmac1 0>, <&usb_dmac1 1>;
-                        dma-names = "ch0", "ch1", "ch2", "ch3";
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 704>;
-                        renesas,buswait = <4>;
-                        phys = <&usb0 1>;
-                        phy-names = "usb";
-                        status = "disabled";
-                };
-
-                usbphy: usb-phy@e6590100 {
-                        compatible = "renesas,usb-phy-r8a7745",
-                                     "renesas,rcar-gen2-usb-phy";
-                        reg = <0 0xe6590100 0 0x100>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        clocks = <&cpg CPG_MOD 704>;
-                        clock-names = "usbhs";
-                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
-                        resets = <&cpg 704>;
-                        status = "disabled";
-
-                        usb0: usb-channel@0 {
-                                reg = <0>;
-                                #phy-cells = <1>;
-                        };
-                        usb2: usb-channel@2 {
-                                reg = <2>;
-                                #phy-cells = <1>;
-                        };
-                };
-
                 can0: can@e6e80000 {
                         compatible = "renesas,can-r8a7745",
                                      "renesas,rcar-gen2-can";
@@ -1295,6 +1073,28 @@
                         status = "disabled";
                 };
 
+                vin0: video@e6ef0000 {
+                        compatible = "renesas,vin-r8a7745",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef0000 0 0x1000>;
+                        interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 811>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 811>;
+                        status = "disabled";
+                };
+
+                vin1: video@e6ef1000 {
+                        compatible = "renesas,vin-r8a7745",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef1000 0 0x1000>;
+                        interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 810>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 810>;
+                        status = "disabled";
+                };
+
                 rcar_sound: sound@ec500000 {
                         /*
                          * #sound-dai-cells is required
@@ -1474,6 +1274,278 @@
                                 };
                         };
                 };
+
+                audma0: dma-controller@ec700000 {
+                        compatible = "renesas,dmac-r8a7745",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec700000 0 0x10000>;
+                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 502>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 502>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
+
+                pci0: pci@ee090000 {
+                        compatible = "renesas,pci-r8a7745",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee090000 0 0xc00>,
+                              <0 0xee080000 0 0x1100>;
+                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x800 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
+
+                        usb@2,0 {
+                                reg = <0x1000 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
+                };
+
+                pci1: pci@ee0d0000 {
+                        compatible = "renesas,pci-r8a7745",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee0d0000 0 0xc00>,
+                              <0 0xee0c0000 0 0x1100>;
+                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <1 1>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x10800 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
+
+                        usb@2,0 {
+                                reg = <0x11000 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
+                };
+
+                sdhi0: sd@ee100000 {
+                        compatible = "renesas,sdhi-r8a7745",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee100000 0 0x328>;
+                        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 314>;
+                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                               <&dmac1 0xcd>, <&dmac1 0xce>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <195000000>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 314>;
+                        status = "disabled";
+                };
+
+                sdhi1: sd@ee140000 {
+                        compatible = "renesas,sdhi-r8a7745",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee140000 0 0x100>;
+                        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 312>;
+                        dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                               <&dmac1 0xc1>, <&dmac1 0xc2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 312>;
+                        status = "disabled";
+                };
+
+                sdhi2: sd@ee160000 {
+                        compatible = "renesas,sdhi-r8a7745",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee160000 0 0x100>;
+                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 311>;
+                        dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                               <&dmac1 0xd3>, <&dmac1 0xd4>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 311>;
+                        status = "disabled";
+                };
+
+                mmcif0: mmc@ee200000 {
+                        compatible = "renesas,mmcif-r8a7745",
+                                     "renesas,sh-mmcif";
+                        reg = <0 0xee200000 0 0x80>;
+                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 315>;
+                        dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                               <&dmac1 0xd1>, <&dmac1 0xd2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 315>;
+                        reg-io-width = <4>;
+                        max-frequency = <97500000>;
+                        status = "disabled";
+                };
+
+                ether: ethernet@ee700000 {
+                        compatible = "renesas,ether-r8a7745",
+                                     "renesas,rcar-gen2-ether";
+                        reg = <0 0xee700000 0 0x400>;
+                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 813>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 813>;
+                        phy-mode = "rmii";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                gic: interrupt-controller@f1001000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        #address-cells = <0>;
+                        interrupt-controller;
+                        reg = <0 0xf1001000 0 0x1000>, <0 0xf1002000 0 0x2000>,
+                              <0 0xf1004000 0 0x2000>, <0 0xf1006000 0 0x2000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 408>;
+                };
+
+                vsp@fe928000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe928000 0 0x8000>;
+                        interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 131>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 131>;
+                };
+
+                vsp@fe930000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe930000 0 0x8000>;
+                        interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 128>;
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 128>;
+                };
+
+                du: display@feb00000 {
+                        compatible = "renesas,du-r8a7745";
+                        reg = <0 0xfeb00000 0 0x40000>;
+                        reg-names = "du";
+                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
+                        clock-names = "du.0", "du.1";
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb0: endpoint {
+                                        };
+                                };
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_rgb1: endpoint {
+                                        };
+                                };
+                        };
+                };
+
+                prr: chipid@ff000044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xff000044 0 4>;
+                };
+
+                cmt0: timer@ffca0000 {
+                        compatible = "renesas,r8a7745-cmt0",
+                                     "renesas,rcar-gen2-cmt0";
+                        reg = <0 0xffca0000 0 0x1004>;
+                        interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 124>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 124>;
+                        status = "disabled";
+                };
+
+                cmt1: timer@e6130000 {
+                        compatible = "renesas,r8a7745-cmt1",
+                                     "renesas,rcar-gen2-cmt1";
+                        reg = <0 0xe6130000 0 0x1004>;
+                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 329>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
+                        resets = <&cpg 329>;
+                        status = "disabled";
+                };
         };
 
         timer {
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index 9412a86f9b30..4b9006bac3cb 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -42,6 +42,19 @@
                 regulator-always-on;
         };
 
+        vccq_sdhi0: regulator-vccq-sdhi0 {
+                compatible = "regulator-gpio";
+
+                regulator-name = "SDHI0 VccQ";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <3300000>;
+
+                gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>;
+                gpios-states = <1>;
+                states = <3300000 1
+                          1800000 0>;
+        };
+
         ethernet@18000000 {
                 compatible = "smsc,lan9220", "smsc,lan9115";
                 reg = <0x18000000 0x100>;
@@ -243,6 +256,7 @@
         pinctrl-names = "default";
 
         vmmc-supply = <&fixedregulator3v3>;
+        vqmmc-supply = <&vccq_sdhi0>;
         bus-width = <4>;
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index f2ea632381e7..063fdb65dc60 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -51,8 +51,11 @@
                 serial0 = &scif0;
                 serial1 = &scifa1;
                 i2c8 = &gpioi2c1;
+                i2c9 = &gpioi2c2;
                 i2c10 = &i2cexio0;
                 i2c11 = &i2cexio1;
+                i2c12 = &i2chdmi;
+                i2c13 = &i2cpwr;
         };
 
         chosen {
@@ -244,6 +247,12 @@
                 };
         };
 
+        cec_clock: cec-clock {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <12000000>;
+        };
+
         hdmi-out {
                 compatible = "hdmi-connector";
                 type = "a";
@@ -272,8 +281,18 @@
                 #size-cells = <0>;
                 compatible = "i2c-gpio";
                 status = "disabled";
-                sda-gpios = <&gpio1 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                 scl-gpios = <&gpio1 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio1 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                i2c-gpio,delay-us = <5>;
+        };
+
+        gpioi2c2: i2c-9 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "i2c-gpio";
+                status = "disabled";
+                scl-gpios = <&gpio5 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio5 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                 i2c-gpio,delay-us = <5>;
         };
 
@@ -308,6 +327,138 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
         };
+
+        /*
+         * IIC2 and I2C2 may be switched using pinmux.
+         * A fallback to GPIO is also provided.
+         */
+        i2chdmi: i2c-12 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>;
+                i2c-bus-name = "i2c-hdmi";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ak4643: codec@12 {
+                        compatible = "asahi-kasei,ak4643";
+                        #sound-dai-cells = <0>;
+                        reg = <0x12>;
+                };
+
+                composite-in@20 {
+                        compatible = "adi,adv7180";
+                        reg = <0x20>;
+                        remote = <&vin1>;
+
+                        port {
+                                adv7180: endpoint {
+                                        bus-width = <8>;
+                                        remote-endpoint = <&vin1ep0>;
+                                };
+                        };
+                };
+
+                hdmi@39 {
+                        compatible = "adi,adv7511w";
+                        reg = <0x39>;
+                        interrupt-parent = <&gpio1>;
+                        interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
+                        clocks = <&cec_clock>;
+                        clock-names = "cec";
+
+                        adi,input-depth = <8>;
+                        adi,input-colorspace = "rgb";
+                        adi,input-clock = "1x";
+                        adi,input-style = <1>;
+                        adi,input-justification = "evenly";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7511_in: endpoint {
+                                                remote-endpoint = <&du_out_lvds0>;
+                                        };
+                                };
+
+                                port@1 {
+                                        reg = <1>;
+                                        adv7511_out: endpoint {
+                                                remote-endpoint = <&hdmi_con_out>;
+                                        };
+                                };
+                        };
+                };
+
+                hdmi-in@4c {
+                        compatible = "adi,adv7612";
+                        reg = <0x4c>;
+                        interrupt-parent = <&gpio1>;
+                        interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
+                        default-input = <0>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7612_in: endpoint {
+                                                remote-endpoint = <&hdmi_con_in>;
+                                        };
+                                };
+
+                                port@2 {
+                                        reg = <2>;
+                                        adv7612_out: endpoint {
+                                                remote-endpoint = <&vin0ep2>;
+                                        };
+                                };
+                        };
+                };
+        };
+
+        /*
+         * IIC3 and I2C3 may be switched using pinmux.
+         * IIC3/I2C3 does not appear to support fallback to GPIO.
+         */
+        i2cpwr: i2c-13 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&iic3>, <&i2c3>;
+                i2c-bus-name = "i2c-pwr";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                pmic@58 {
+                        compatible = "dlg,da9063";
+                        reg = <0x58>;
+                        interrupt-parent = <&irqc0>;
+                        interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                        interrupt-controller;
+
+                        rtc {
+                                compatible = "dlg,da9063-rtc";
+                        };
+
+                        wdt {
+                                compatible = "dlg,da9063-watchdog";
+                        };
+                };
+
+                vdd_dvfs: regulator@68 {
+                        compatible = "dlg,da9210";
+                        reg = <0x68>;
+                        interrupt-parent = <&irqc0>;
+                        interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+
+                        regulator-min-microvolt = <1000000>;
+                        regulator-max-microvolt = <1000000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+        };
 };
 
 &du {
@@ -437,11 +588,21 @@
                 function = "iic1";
         };
 
+        i2c2_pins: i2c2 {
+                groups = "i2c2";
+                function = "i2c2";
+        };
+
         iic2_pins: iic2 {
                 groups = "iic2";
                 function = "iic2";
         };
 
+        i2c3_pins: i2c3 {
+                groups = "i2c3";
+                function = "i2c3";
+        };
+
         iic3_pins: iic3 {
                 groups = "iic3";
                 function = "iic3";
@@ -643,124 +804,28 @@
         pinctrl-names = "i2c-exio1";
 };
 
-&iic2   {
-        status = "okay";
-        pinctrl-0 = <&iic2_pins>;
-        pinctrl-names = "default";
+&i2c2   {
+        pinctrl-0 = <&i2c2_pins>;
+        pinctrl-names = "i2c-hdmi";
 
         clock-frequency = <100000>;
+};
 
-        ak4643: codec@12 {
-                compatible = "asahi-kasei,ak4643";
-                #sound-dai-cells = <0>;
-                reg = <0x12>;
-        };
-
-        composite-in@20 {
-                compatible = "adi,adv7180";
-                reg = <0x20>;
-                remote = <&vin1>;
-
-                port {
-                        adv7180: endpoint {
-                                bus-width = <8>;
-                                remote-endpoint = <&vin1ep0>;
-                        };
-                };
-        };
-
-        hdmi@39 {
-                compatible = "adi,adv7511w";
-                reg = <0x39>;
-                interrupt-parent = <&gpio1>;
-                interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
-
-                adi,input-depth = <8>;
-                adi,input-colorspace = "rgb";
-                adi,input-clock = "1x";
-                adi,input-style = <1>;
-                adi,input-justification = "evenly";
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        port@0 {
-                                reg = <0>;
-                                adv7511_in: endpoint {
-                                        remote-endpoint = <&du_out_lvds0>;
-                                };
-                        };
-
-                        port@1 {
-                                reg = <1>;
-                                adv7511_out: endpoint {
-                                        remote-endpoint = <&hdmi_con_out>;
-                                };
-                        };
-                };
-        };
-
-        hdmi-in@4c {
-                compatible = "adi,adv7612";
-                reg = <0x4c>;
-                interrupt-parent = <&gpio1>;
-                interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
-                default-input = <0>;
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+&iic2   {
+        pinctrl-0 = <&iic2_pins>;
+        pinctrl-names = "i2c-hdmi";
 
-                        port@0 {
-                                reg = <0>;
-                                adv7612_in: endpoint {
-                                        remote-endpoint = <&hdmi_con_in>;
-                                };
-                        };
+        clock-frequency = <100000>;
+};
 
-                        port@2 {
-                                reg = <2>;
-                                adv7612_out: endpoint {
-                                        remote-endpoint = <&vin0ep2>;
-                                };
-                        };
-                };
-        };
+&i2c3   {
+        pinctrl-0 = <&i2c3_pins>;
+        pinctrl-names = "i2c-pwr";
 };
 
-&iic3 {
-        pinctrl-names = "default";
+&iic3   {
         pinctrl-0 = <&iic3_pins>;
-        status = "okay";
-
-        pmic@58 {
-                compatible = "dlg,da9063";
-                reg = <0x58>;
-                interrupt-parent = <&irqc0>;
-                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-                interrupt-controller;
-
-                rtc {
-                        compatible = "dlg,da9063-rtc";
-                };
-
-                wdt {
-                        compatible = "dlg,da9063-watchdog";
-                };
-        };
-
-        vdd_dvfs: regulator@68 {
-                compatible = "dlg,da9210";
-                reg = <0x68>;
-                interrupt-parent = <&irqc0>;
-                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-
-                regulator-min-microvolt = <1000000>;
-                regulator-max-microvolt = <1000000>;
-                regulator-boot-on;
-                regulator-always-on;
-        };
+        pinctrl-names = "i2c-pwr";
 };
 
 &pci0 {
diff --git a/arch/arm/boot/dts/r8a7790-stout.dts b/arch/arm/boot/dts/r8a7790-stout.dts
new file mode 100644
index 000000000000..a13a92c26645
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7790-stout.dts
@@ -0,0 +1,363 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the Stout board
+ *
+ * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
+ */
+
+/dts-v1/;
+#include "r8a7790.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+        model = "Stout";
+        compatible = "renesas,stout", "renesas,r8a7790";
+
+        aliases {
+                serial0 = &scifa0;
+        };
+
+        chosen {
+                bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@40000000 {
+                device_type = "memory";
+                reg = <0 0x40000000 0 0x40000000>;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                led1 {
+                        gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
+                };
+                led2 {
+                        gpios = <&gpio4 23 GPIO_ACTIVE_LOW>;
+                };
+                led3 {
+                        gpios = <&gpio5 17 GPIO_ACTIVE_LOW>;
+                };
+                led5 {
+                        gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        fixedregulator3v3: regulator-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-3.3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
+        vcc_sdhi0: regulator-vcc-sdhi0 {
+                compatible = "regulator-fixed";
+
+                regulator-name = "SDHI0 Vcc";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+
+                gpio = <&gpio5 24 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        hdmi-out {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_out: endpoint {
+                                remote-endpoint = <&adv7511_out>;
+                        };
+                };
+        };
+
+        osc1_clk: osc1-clock {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <148500000>;
+        };
+
+        osc4_clk: osc4-clock {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <12000000>;
+        };
+};
+
+&du {
+        pinctrl-0 = <&du_pins>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 722>,
+                 <&cpg CPG_MOD 726>, <&cpg CPG_MOD 725>,
+                 <&osc1_clk>;
+        clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1", "dclkin.0";
+
+        ports {
+                port@0 {
+                        endpoint {
+                                remote-endpoint = <&adv7511_in>;
+                        };
+                };
+                port@1 {
+                        lvds_connector0: endpoint {
+                        };
+                };
+                port@2 {
+                        lvds_connector1: endpoint {
+                        };
+                };
+        };
+};
+
+&extal_clk {
+        clock-frequency = <20000000>;
+};
+
+&pfc {
+
+        pinctrl-0 = <&scif_clk_pins>;
+        pinctrl-names = "default";
+
+        du_pins: du {
+                groups = "du_rgb888", "du_sync_1", "du_clk_out_0";
+                function = "du";
+        };
+
+        scifa0_pins: scifa0 {
+                groups = "scifa0_data_b";
+                function = "scifa0";
+        };
+
+        scif_clk_pins: scif_clk {
+                groups = "scif_clk";
+                function = "scif_clk";
+        };
+
+        ether_pins: ether {
+                groups = "eth_link", "eth_mdio", "eth_rmii";
+                function = "eth";
+        };
+
+        phy1_pins: phy1 {
+                groups = "intc_irq1";
+                function = "intc";
+        };
+
+        sdhi0_pins: sd0 {
+                groups = "sdhi0_data4", "sdhi0_ctrl";
+                function = "sdhi0";
+                power-source = <3300>;
+        };
+
+        qspi_pins: qspi {
+                groups = "qspi_ctrl", "qspi_data4";
+                function = "qspi";
+        };
+
+        iic2_pins: iic2 {
+                groups = "iic2_b";
+                function = "iic2";
+        };
+
+        iic3_pins: iic3 {
+                groups = "iic3";
+                function = "iic3";
+        };
+
+        usb0_pins: usb0 {
+                groups = "usb0";
+                function = "usb0";
+        };
+};
+
+&ether {
+        pinctrl-0 = <&ether_pins &phy1_pins>;
+        pinctrl-names = "default";
+
+        phy-handle = <&phy1>;
+        renesas,ether-link-active-low;
+        status = "okay";
+
+        phy1: ethernet-phy@1 {
+                reg = <1>;
+                interrupt-parent = <&irqc0>;
+                interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
+                micrel,led-mode = <1>;
+        };
+};
+
+&cmt0 {
+        status = "okay";
+};
+
+&qspi {
+        pinctrl-0 = <&qspi_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+
+        flash: flash@0 {
+                compatible = "spansion,s25fl512s", "jedec,spi-nor";
+                reg = <0>;
+                spi-max-frequency = <30000000>;
+                spi-tx-bus-width = <4>;
+                spi-rx-bus-width = <4>;
+                spi-cpha;
+                spi-cpol;
+                m25p,fast-read;
+
+                partitions {
+                        compatible = "fixed-partitions";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+
+                        partition@0 {
+                                label = "loader";
+                                reg = <0x00000000 0x00080000>;
+                                read-only;
+                        };
+                        partition@80000 {
+                                label = "uboot";
+                                reg = <0x00080000 0x00040000>;
+                                read-only;
+                        };
+                        partition@c0000 {
+                                label = "uboot-env";
+                                reg = <0x000c0000 0x00040000>;
+                                read-only;
+                        };
+                        partition@100000 {
+                                label = "flash";
+                                reg = <0x00100000 0x03f00000>;
+                        };
+                };
+        };
+};
+
+&scifa0 {
+        pinctrl-0 = <&scifa0_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
+&scif_clk {
+        clock-frequency = <14745600>;
+};
+
+&sdhi0 {
+        pinctrl-0 = <&sdhi0_pins>;
+        pinctrl-names = "default";
+
+        vmmc-supply = <&vcc_sdhi0>;
+        cd-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
+        status = "okay";
+};
+
+&cpu0 {
+        cpu0-supply = <&vdd_dvfs>;
+};
+
+&iic2   {
+        status = "okay";
+        pinctrl-0 = <&iic2_pins>;
+        pinctrl-names = "default";
+
+        clock-frequency = <100000>;
+
+        hdmi@39 {
+                compatible = "adi,adv7511w";
+                reg = <0x39>;
+                interrupt-parent = <&gpio1>;
+                interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&osc4_clk>;
+                clock-names = "cec";
+
+                adi,input-depth = <8>;
+                adi,input-colorspace = "rgb";
+                adi,input-clock = "1x";
+                adi,input-style = <1>;
+                adi,input-justification = "evenly";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                adv7511_in: endpoint {
+                                        remote-endpoint = <&du_out_rgb>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+                                adv7511_out: endpoint {
+                                        remote-endpoint = <&hdmi_con_out>;
+                                };
+                        };
+                };
+        };
+};
+
+&iic3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&iic3_pins>;
+        status = "okay";
+
+        pmic@58 {
+                compatible = "dlg,da9063";
+                reg = <0x58>;
+                interrupt-parent = <&irqc0>;
+                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                interrupt-controller;
+
+                rtc {
+                        compatible = "dlg,da9063-rtc";
+                };
+
+                wdt {
+                        compatible = "dlg,da9063-watchdog";
+                };
+        };
+
+        vdd_dvfs: regulator@68 {
+                compatible = "dlg,da9210";
+                reg = <0x68>;
+                interrupt-parent = <&irqc0>;
+                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+
+                regulator-min-microvolt = <1000000>;
+                regulator-max-microvolt = <1000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
+        vdd: regulator@70 {
+                compatible = "dlg,da9210";
+                reg = <0x70>;
+                interrupt-parent = <&irqc0>;
+                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+
+                regulator-min-microvolt = <1000000>;
+                regulator-max-microvolt = <1000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+};
+
+&pci0 {
+        status = "okay";
+        pinctrl-0 = <&usb0_pins>;
+        pinctrl-names = "default";
+};
+
+&usbphy {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index ed9a68538a55..e4367cecad18 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -17,7 +17,6 @@
 
 / {
         compatible = "renesas,r8a7790";
-        interrupt-parent = <&gic>;
         #address-cells = <2>;
         #size-cells = <2>;
 
@@ -41,6 +40,35 @@
                 vin3 = &vin3;
         };
 
+        /*
+         * The external audio clocks are configured as 0 Hz fixed frequency
+         * clocks by default.
+         * Boards that provide audio clocks should override them.
+         */
+        audio_clk_a: audio_clk_a {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+        audio_clk_b: audio_clk_b {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+        audio_clk_c: audio_clk_c {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        /* External CAN clock */
+        can_clk: can {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -159,1510 +187,1553 @@
                 };
         };
 
-        thermal-zones {
-                cpu_thermal: cpu-thermal {
-                        polling-delay-passive   = <0>;
-                        polling-delay           = <0>;
-
-                        thermal-sensors = <&thermal>;
-
-                        trips {
-                                cpu-crit {
-                                        temperature     = <95000>;
-                                        hysteresis      = <0>;
-                                        type            = "critical";
-                                };
-                        };
-                        cooling-maps {
-                        };
-                };
+        /* External root clock */
+        extal_clk: extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
         };
 
-        apmu@e6151000 {
-                compatible = "renesas,r8a7790-apmu", "renesas,apmu";
-                reg = <0 0xe6151000 0 0x188>;
-                cpus = <&cpu4 &cpu5 &cpu6 &cpu7>;
+        /* External PCIe clock - can be overridden by the board */
+        pcie_bus_clk: pcie_bus {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
         };
 
-        apmu@e6152000 {
-                compatible = "renesas,r8a7790-apmu", "renesas,apmu";
-                reg = <0 0xe6152000 0 0x188>;
-                cpus = <&cpu0 &cpu1 &cpu2 &cpu3>;
+        /* External SCIF clock */
+        scif_clk: scif {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
         };
 
-        gic: interrupt-controller@f1001000 {
-                compatible = "arm,gic-400";
-                #interrupt-cells = <3>;
-                #address-cells = <0>;
-                interrupt-controller;
-                reg = <0 0xf1001000 0 0x1000>,
-                        <0 0xf1002000 0 0x2000>,
-                        <0 0xf1004000 0 0x2000>,
-                        <0 0xf1006000 0 0x2000>;
-                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
-                clocks = <&cpg CPG_MOD 408>;
-                clock-names = "clk";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 408>;
-        };
+        soc {
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
 
-        gpio0: gpio@e6050000 {
-                compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6050000 0 0x50>;
-                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 0 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 912>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 912>;
-        };
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                gpio0: gpio@e6050000 {
+                        compatible = "renesas,gpio-r8a7790",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6050000 0 0x50>;
+                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 0 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 912>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 912>;
+                };
 
-        gpio1: gpio@e6051000 {
-                compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6051000 0 0x50>;
-                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 32 30>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 911>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 911>;
-        };
+                gpio1: gpio@e6051000 {
+                        compatible = "renesas,gpio-r8a7790",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6051000 0 0x50>;
+                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 32 30>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 911>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 911>;
+                };
 
-        gpio2: gpio@e6052000 {
-                compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6052000 0 0x50>;
-                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 64 30>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 910>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 910>;
-        };
+                gpio2: gpio@e6052000 {
+                        compatible = "renesas,gpio-r8a7790",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6052000 0 0x50>;
+                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 64 30>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 910>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 910>;
+                };
 
-        gpio3: gpio@e6053000 {
-                compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6053000 0 0x50>;
-                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 96 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 909>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 909>;
-        };
+                gpio3: gpio@e6053000 {
+                        compatible = "renesas,gpio-r8a7790",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6053000 0 0x50>;
+                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 96 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 909>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 909>;
+                };
 
-        gpio4: gpio@e6054000 {
-                compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6054000 0 0x50>;
-                interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 128 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 908>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 908>;
-        };
+                gpio4: gpio@e6054000 {
+                        compatible = "renesas,gpio-r8a7790",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6054000 0 0x50>;
+                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 128 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 908>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 908>;
+                };
 
-        gpio5: gpio@e6055000 {
-                compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055000 0 0x50>;
-                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 160 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 907>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 907>;
-        };
+                gpio5: gpio@e6055000 {
+                        compatible = "renesas,gpio-r8a7790",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055000 0 0x50>;
+                        interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 160 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 907>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 907>;
+                };
 
-        thermal: thermal@e61f0000 {
-                compatible =    "renesas,thermal-r8a7790",
-                                "renesas,rcar-gen2-thermal",
-                                "renesas,rcar-thermal";
-                reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
-                interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 522>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 522>;
-                #thermal-sensor-cells = <0>;
-        };
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a7790";
+                        reg = <0 0xe6060000 0 0x250>;
+                };
 
-        timer {
-                compatible = "arm,armv7-timer";
-                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)>;
-        };
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a7790-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>, <&usb_extal_clk>;
+                        clock-names = "extal", "usb_extal";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
 
-        cmt0: timer@ffca0000 {
-                compatible = "renesas,r8a7790-cmt0", "renesas,rcar-gen2-cmt0";
-                reg = <0 0xffca0000 0 0x1004>;
-                interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 124>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 124>;
-
-                status = "disabled";
-        };
+                apmu@e6151000 {
+                        compatible = "renesas,r8a7790-apmu", "renesas,apmu";
+                        reg = <0 0xe6151000 0 0x188>;
+                        cpus = <&cpu4 &cpu5 &cpu6 &cpu7>;
+                };
 
-        cmt1: timer@e6130000 {
-                compatible = "renesas,r8a7790-cmt1", "renesas,rcar-gen2-cmt1";
-                reg = <0 0xe6130000 0 0x1004>;
-                interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 329>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 329>;
-
-                status = "disabled";
-        };
+                apmu@e6152000 {
+                        compatible = "renesas,r8a7790-apmu", "renesas,apmu";
+                        reg = <0 0xe6152000 0 0x188>;
+                        cpus = <&cpu0 &cpu1 &cpu2 &cpu3>;
+                };
 
-        irqc0: interrupt-controller@e61c0000 {
-                compatible = "renesas,irqc-r8a7790", "renesas,irqc";
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                reg = <0 0xe61c0000 0 0x200>;
-                interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 407>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 407>;
-        };
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a7790-rst";
+                        reg = <0 0xe6160000 0 0x0100>;
+                };
 
-        dmac0: dma-controller@e6700000 {
-                compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
-                reg = <0 0xe6700000 0 0x20000>;
-                interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12", "ch13", "ch14";
-                clocks = <&cpg CPG_MOD 219>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 219>;
-                #dma-cells = <1>;
-                dma-channels = <15>;
-        };
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a7790-sysc";
+                        reg = <0 0xe6180000 0 0x0200>;
+                        #power-domain-cells = <1>;
+                };
 
-        dmac1: dma-controller@e6720000 {
-                compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
-                reg = <0 0xe6720000 0 0x20000>;
-                interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12", "ch13", "ch14";
-                clocks = <&cpg CPG_MOD 218>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 218>;
-                #dma-cells = <1>;
-                dma-channels = <15>;
-        };
+                irqc0: interrupt-controller@e61c0000 {
+                        compatible = "renesas,irqc-r8a7790", "renesas,irqc";
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0 0xe61c0000 0 0x200>;
+                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 407>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 407>;
+                };
 
-        audma0: dma-controller@ec700000 {
-                compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
-                reg = <0 0xec700000 0 0x10000>;
-                interrupts =    <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12";
-                clocks = <&cpg CPG_MOD 502>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 502>;
-                #dma-cells = <1>;
-                dma-channels = <13>;
-        };
+                thermal: thermal@e61f0000 {
+                        compatible = "renesas,thermal-r8a7790",
+                                     "renesas,rcar-gen2-thermal",
+                                     "renesas,rcar-thermal";
+                        reg = <0 0xe61f0000 0 0x10>, <0 0xe61f0100 0 0x38>;
+                        interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 522>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 522>;
+                        #thermal-sensor-cells = <0>;
+                };
 
-        audma1: dma-controller@ec720000 {
-                compatible = "renesas,dmac-r8a7790", "renesas,rcar-dmac";
-                reg = <0 0xec720000 0 0x10000>;
-                interrupts =    <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12";
-                clocks = <&cpg CPG_MOD 501>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 501>;
-                #dma-cells = <1>;
-                dma-channels = <13>;
-        };
+                ipmmu_sy0: mmu@e6280000 {
+                        compatible = "renesas,ipmmu-r8a7790",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6280000 0 0x1000>;
+                        interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        usb_dmac0: dma-controller@e65a0000 {
-                compatible = "renesas,r8a7790-usb-dmac", "renesas,usb-dmac";
-                reg = <0 0xe65a0000 0 0x100>;
-                interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "ch0", "ch1";
-                clocks = <&cpg CPG_MOD 330>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 330>;
-                #dma-cells = <1>;
-                dma-channels = <2>;
-        };
+                ipmmu_sy1: mmu@e6290000 {
+                        compatible = "renesas,ipmmu-r8a7790",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6290000 0 0x1000>;
+                        interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        usb_dmac1: dma-controller@e65b0000 {
-                compatible = "renesas,r8a7790-usb-dmac", "renesas,usb-dmac";
-                reg = <0 0xe65b0000 0 0x100>;
-                interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "ch0", "ch1";
-                clocks = <&cpg CPG_MOD 331>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 331>;
-                #dma-cells = <1>;
-                dma-channels = <2>;
-        };
+                ipmmu_ds: mmu@e6740000 {
+                        compatible = "renesas,ipmmu-r8a7790",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6740000 0 0x1000>;
+                        interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c0: i2c@e6508000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6508000 0 0x40>;
-                interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 931>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 931>;
-                i2c-scl-internal-delay-ns = <110>;
-                status = "disabled";
-        };
+                ipmmu_mp: mmu@ec680000 {
+                        compatible = "renesas,ipmmu-r8a7790",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xec680000 0 0x1000>;
+                        interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c1: i2c@e6518000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6518000 0 0x40>;
-                interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 930>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 930>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                ipmmu_mx: mmu@fe951000 {
+                        compatible = "renesas,ipmmu-r8a7790",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xfe951000 0 0x1000>;
+                        interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c2: i2c@e6530000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6530000 0 0x40>;
-                interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 929>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 929>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                ipmmu_rt: mmu@ffc80000 {
+                        compatible = "renesas,ipmmu-r8a7790",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xffc80000 0 0x1000>;
+                        interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c3: i2c@e6540000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7790", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6540000 0 0x40>;
-                interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 928>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 928>;
-                i2c-scl-internal-delay-ns = <110>;
-                status = "disabled";
-        };
+                icram0: sram@e63a0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63a0000 0 0x12000>;
+                };
 
-        iic0: i2c@e6500000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6500000 0 0x425>;
-                interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 318>;
-                dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                       <&dmac1 0x61>, <&dmac1 0x62>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 318>;
-                status = "disabled";
-        };
+                icram1: sram@e63c0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63c0000 0 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0 0xe63c0000 0x1000>;
 
-        iic1: i2c@e6510000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6510000 0 0x425>;
-                interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 323>;
-                dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                       <&dmac1 0x65>, <&dmac1 0x66>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 323>;
-                status = "disabled";
-        };
+                        smp-sram@0 {
+                                compatible = "renesas,smp-sram";
+                                reg = <0 0x10>;
+                        };
+                };
 
-        iic2: i2c@e6520000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6520000 0 0x425>;
-                interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 300>;
-                dmas = <&dmac0 0x69>, <&dmac0 0x6a>,
-                       <&dmac1 0x69>, <&dmac1 0x6a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 300>;
-                status = "disabled";
-        };
+                i2c0: i2c@e6508000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7790",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6508000 0 0x40>;
+                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 931>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 931>;
+                        i2c-scl-internal-delay-ns = <110>;
+                        status = "disabled";
+                };
 
-        iic3: i2c@e60b0000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7790", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe60b0000 0 0x425>;
-                interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 926>;
-                dmas = <&dmac0 0x77>, <&dmac0 0x78>,
-                       <&dmac1 0x77>, <&dmac1 0x78>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 926>;
-                status = "disabled";
-        };
+                i2c1: i2c@e6518000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7790",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6518000 0 0x40>;
+                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 930>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 930>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        mmcif0: mmc@ee200000 {
-                compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";
-                reg = <0 0xee200000 0 0x80>;
-                interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 315>;
-                dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                       <&dmac1 0xd1>, <&dmac1 0xd2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 315>;
-                reg-io-width = <4>;
-                status = "disabled";
-                max-frequency = <97500000>;
-        };
+                i2c2: i2c@e6530000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7790",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6530000 0 0x40>;
+                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 929>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 929>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        mmcif1: mmc@ee220000 {
-                compatible = "renesas,mmcif-r8a7790", "renesas,sh-mmcif";
-                reg = <0 0xee220000 0 0x80>;
-                interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 305>;
-                dmas = <&dmac0 0xe1>, <&dmac0 0xe2>,
-                       <&dmac1 0xe1>, <&dmac1 0xe2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 305>;
-                reg-io-width = <4>;
-                status = "disabled";
-                max-frequency = <97500000>;
-        };
+                i2c3: i2c@e6540000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7790",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6540000 0 0x40>;
+                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 928>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 928>;
+                        i2c-scl-internal-delay-ns = <110>;
+                        status = "disabled";
+                };
 
-        pfc: pin-controller@e6060000 {
-                compatible = "renesas,pfc-r8a7790";
-                reg = <0 0xe6060000 0 0x250>;
-        };
+                iic0: i2c@e6500000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7790",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6500000 0 0x425>;
+                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 318>;
+                        dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                               <&dmac1 0x61>, <&dmac1 0x62>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 318>;
+                        status = "disabled";
+                };
 
-        sdhi0: sd@ee100000 {
-                compatible = "renesas,sdhi-r8a7790",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee100000 0 0x328>;
-                interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 314>;
-                dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                       <&dmac1 0xcd>, <&dmac1 0xce>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <195000000>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 314>;
-                status = "disabled";
-        };
+                iic1: i2c@e6510000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7790",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6510000 0 0x425>;
+                        interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 323>;
+                        dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                               <&dmac1 0x65>, <&dmac1 0x66>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 323>;
+                        status = "disabled";
+                };
 
-        sdhi1: sd@ee120000 {
-                compatible = "renesas,sdhi-r8a7790",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee120000 0 0x328>;
-                interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 313>;
-                dmas = <&dmac0 0xc9>, <&dmac0 0xca>,
-                       <&dmac1 0xc9>, <&dmac1 0xca>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <195000000>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 313>;
-                status = "disabled";
-        };
+                iic2: i2c@e6520000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7790",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6520000 0 0x425>;
+                        interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 300>;
+                        dmas = <&dmac0 0x69>, <&dmac0 0x6a>,
+                               <&dmac1 0x69>, <&dmac1 0x6a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 300>;
+                        status = "disabled";
+                };
 
-        sdhi2: sd@ee140000 {
-                compatible = "renesas,sdhi-r8a7790",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee140000 0 0x100>;
-                interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 312>;
-                dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                       <&dmac1 0xc1>, <&dmac1 0xc2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <97500000>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 312>;
-                status = "disabled";
-        };
+                iic3: i2c@e60b0000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7790",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe60b0000 0 0x425>;
+                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 926>;
+                        dmas = <&dmac0 0x77>, <&dmac0 0x78>,
+                               <&dmac1 0x77>, <&dmac1 0x78>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 926>;
+                        status = "disabled";
+                };
 
-        sdhi3: sd@ee160000 {
-                compatible = "renesas,sdhi-r8a7790",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee160000 0 0x100>;
-                interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 311>;
-                dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                       <&dmac1 0xd3>, <&dmac1 0xd4>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <97500000>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 311>;
-                status = "disabled";
-        };
+                hsusb: usb@e6590000 {
+                        compatible = "renesas,usbhs-r8a7790",
+                                     "renesas,rcar-gen2-usbhs";
+                        reg = <0 0xe6590000 0 0x100>;
+                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
+                               <&usb_dmac1 0>, <&usb_dmac1 1>;
+                        dma-names = "ch0", "ch1", "ch2", "ch3";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        renesas,buswait = <4>;
+                        phys = <&usb0 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
 
-        scifa0: serial@e6c40000 {
-                compatible = "renesas,scifa-r8a7790",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c40000 0 64>;
-                interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 204>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x21>, <&dmac0 0x22>,
-                       <&dmac1 0x21>, <&dmac1 0x22>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 204>;
-                status = "disabled";
-        };
+                usbphy: usb-phy@e6590100 {
+                        compatible = "renesas,usb-phy-r8a7790",
+                                     "renesas,rcar-gen2-usb-phy";
+                        reg = <0 0xe6590100 0 0x100>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        clock-names = "usbhs";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        status = "disabled";
 
-        scifa1: serial@e6c50000 {
-                compatible = "renesas,scifa-r8a7790",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c50000 0 64>;
-                interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 203>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x25>, <&dmac0 0x26>,
-                       <&dmac1 0x25>, <&dmac1 0x26>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 203>;
-                status = "disabled";
-        };
+                        usb0: usb-channel@0 {
+                                reg = <0>;
+                                #phy-cells = <1>;
+                        };
+                        usb2: usb-channel@2 {
+                                reg = <2>;
+                                #phy-cells = <1>;
+                        };
+                };
 
-        scifa2: serial@e6c60000 {
-                compatible = "renesas,scifa-r8a7790",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c60000 0 64>;
-                interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 202>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x27>, <&dmac0 0x28>,
-                       <&dmac1 0x27>, <&dmac1 0x28>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 202>;
-                status = "disabled";
-        };
+                usb_dmac0: dma-controller@e65a0000 {
+                        compatible = "renesas,r8a7790-usb-dmac",
+                                     "renesas,usb-dmac";
+                        reg = <0 0xe65a0000 0 0x100>;
+                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1";
+                        clocks = <&cpg CPG_MOD 330>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 330>;
+                        #dma-cells = <1>;
+                        dma-channels = <2>;
+                };
 
-        scifb0: serial@e6c20000 {
-                compatible = "renesas,scifb-r8a7790",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6c20000 0 0x100>;
-                interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 206>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
-                       <&dmac1 0x3d>, <&dmac1 0x3e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 206>;
-                status = "disabled";
-        };
+                usb_dmac1: dma-controller@e65b0000 {
+                        compatible = "renesas,r8a7790-usb-dmac",
+                                     "renesas,usb-dmac";
+                        reg = <0 0xe65b0000 0 0x100>;
+                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1";
+                        clocks = <&cpg CPG_MOD 331>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 331>;
+                        #dma-cells = <1>;
+                        dma-channels = <2>;
+                };
 
-        scifb1: serial@e6c30000 {
-                compatible = "renesas,scifb-r8a7790",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6c30000 0 0x100>;
-                interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 207>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
-                       <&dmac1 0x19>, <&dmac1 0x1a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 207>;
-                status = "disabled";
-        };
+                dmac0: dma-controller@e6700000 {
+                        compatible = "renesas,dmac-r8a7790",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6700000 0 0x20000>;
+                        interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 219>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 219>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
 
-        scifb2: serial@e6ce0000 {
-                compatible = "renesas,scifb-r8a7790",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6ce0000 0 0x100>;
-                interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 216>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
-                       <&dmac1 0x1d>, <&dmac1 0x1e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 216>;
-                status = "disabled";
-        };
+                dmac1: dma-controller@e6720000 {
+                        compatible = "renesas,dmac-r8a7790",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6720000 0 0x20000>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 218>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 218>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
 
-        scif0: serial@e6e60000 {
-                compatible = "renesas,scif-r8a7790", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e60000 0 64>;
-                interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                       <&dmac1 0x29>, <&dmac1 0x2a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 721>;
-                status = "disabled";
-        };
+                avb: ethernet@e6800000 {
+                        compatible = "renesas,etheravb-r8a7790",
+                                     "renesas,etheravb-rcar-gen2";
+                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 812>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 812>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        scif1: serial@e6e68000 {
-                compatible = "renesas,scif-r8a7790", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e68000 0 64>;
-                interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
-                       <&dmac1 0x2d>, <&dmac1 0x2e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 720>;
-                status = "disabled";
-        };
+                qspi: spi@e6b10000 {
+                        compatible = "renesas,qspi-r8a7790", "renesas,qspi";
+                        reg = <0 0xe6b10000 0 0x2c>;
+                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 917>;
+                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                               <&dmac1 0x17>, <&dmac1 0x18>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 917>;
+                        num-cs = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        scif2: serial@e6e56000 {
-                compatible = "renesas,scif-r8a7790", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e56000 0 64>;
-                interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 310>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
-                       <&dmac1 0x2b>, <&dmac1 0x2c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 310>;
-                status = "disabled";
-        };
+                scifa0: serial@e6c40000 {
+                        compatible = "renesas,scifa-r8a7790",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c40000 0 64>;
+                        interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 204>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x21>, <&dmac0 0x22>,
+                               <&dmac1 0x21>, <&dmac1 0x22>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 204>;
+                        status = "disabled";
+                };
 
-        hscif0: serial@e62c0000 {
-                compatible = "renesas,hscif-r8a7790",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62c0000 0 96>;
-                interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
-                       <&dmac1 0x39>, <&dmac1 0x3a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 717>;
-                status = "disabled";
-        };
+                scifa1: serial@e6c50000 {
+                        compatible = "renesas,scifa-r8a7790",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c50000 0 64>;
+                        interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 203>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x25>, <&dmac0 0x26>,
+                               <&dmac1 0x25>, <&dmac1 0x26>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 203>;
+                        status = "disabled";
+                };
 
-        hscif1: serial@e62c8000 {
-                compatible = "renesas,hscif-r8a7790",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62c8000 0 96>;
-                interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7790_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
-                       <&dmac1 0x4d>, <&dmac1 0x4e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 716>;
-                status = "disabled";
-        };
+                scifa2: serial@e6c60000 {
+                        compatible = "renesas,scifa-r8a7790",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c60000 0 64>;
+                        interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 202>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x27>, <&dmac0 0x28>,
+                               <&dmac1 0x27>, <&dmac1 0x28>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 202>;
+                        status = "disabled";
+                };
 
-        icram0: sram@e63a0000 {
-                compatible = "mmio-sram";
-                reg = <0 0xe63a0000 0 0x12000>;
-        };
+                scifb0: serial@e6c20000 {
+                        compatible = "renesas,scifb-r8a7790",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6c20000 0 0x100>;
+                        interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 206>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
+                               <&dmac1 0x3d>, <&dmac1 0x3e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 206>;
+                        status = "disabled";
+                };
 
-        icram1: sram@e63c0000 {
-                compatible = "mmio-sram";
-                reg = <0 0xe63c0000 0 0x1000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges = <0 0 0xe63c0000 0x1000>;
+                scifb1: serial@e6c30000 {
+                        compatible = "renesas,scifb-r8a7790",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6c30000 0 0x100>;
+                        interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 207>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
+                               <&dmac1 0x19>, <&dmac1 0x1a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 207>;
+                        status = "disabled";
+                };
 
-                smp-sram@0 {
-                        compatible = "renesas,smp-sram";
-                        reg = <0 0x10>;
+                scifb2: serial@e6ce0000 {
+                        compatible = "renesas,scifb-r8a7790",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6ce0000 0 0x100>;
+                        interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 216>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
+                               <&dmac1 0x1d>, <&dmac1 0x1e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 216>;
+                        status = "disabled";
                 };
-        };
 
-        ether: ethernet@ee700000 {
-                compatible = "renesas,ether-r8a7790",
-                             "renesas,rcar-gen2-ether";
-                reg = <0 0xee700000 0 0x400>;
-                interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 813>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 813>;
-                phy-mode = "rmii";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                scif0: serial@e6e60000 {
+                        compatible = "renesas,scif-r8a7790",
+                                     "renesas,rcar-gen2-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6e60000 0 64>;
+                        interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 721>,
+                                 <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                               <&dmac1 0x29>, <&dmac1 0x2a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 721>;
+                        status = "disabled";
+                };
 
-        avb: ethernet@e6800000 {
-                compatible = "renesas,etheravb-r8a7790",
-                             "renesas,etheravb-rcar-gen2";
-                reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-                interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 812>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 812>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                scif1: serial@e6e68000 {
+                        compatible = "renesas,scif-r8a7790",
+                                     "renesas,rcar-gen2-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6e68000 0 64>;
+                        interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 720>,
+                                 <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
+                               <&dmac1 0x2d>, <&dmac1 0x2e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 720>;
+                        status = "disabled";
+                };
 
-        sata0: sata@ee300000 {
-                compatible = "renesas,sata-r8a7790", "renesas,rcar-gen2-sata";
-                reg = <0 0xee300000 0 0x2000>;
-                interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 815>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 815>;
-                status = "disabled";
-        };
+                scif2: serial@e6e56000 {
+                        compatible = "renesas,scif-r8a7790",
+                                     "renesas,rcar-gen2-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6e56000 0 64>;
+                        interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 310>,
+                                 <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
+                               <&dmac1 0x2b>, <&dmac1 0x2c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 310>;
+                        status = "disabled";
+                };
 
-        sata1: sata@ee500000 {
-                compatible = "renesas,sata-r8a7790", "renesas,rcar-gen2-sata";
-                reg = <0 0xee500000 0 0x2000>;
-                interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 814>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 814>;
-                status = "disabled";
-        };
+                hscif0: serial@e62c0000 {
+                        compatible = "renesas,hscif-r8a7790",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62c0000 0 96>;
+                        interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 717>,
+                                 <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
+                               <&dmac1 0x39>, <&dmac1 0x3a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 717>;
+                        status = "disabled";
+                };
 
-        hsusb: usb@e6590000 {
-                compatible = "renesas,usbhs-r8a7790", "renesas,rcar-gen2-usbhs";
-                reg = <0 0xe6590000 0 0x100>;
-                interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 704>;
-                dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
-                       <&usb_dmac1 0>, <&usb_dmac1 1>;
-                dma-names = "ch0", "ch1", "ch2", "ch3";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 704>;
-                renesas,buswait = <4>;
-                phys = <&usb0 1>;
-                phy-names = "usb";
-                status = "disabled";
-        };
+                hscif1: serial@e62c8000 {
+                        compatible = "renesas,hscif-r8a7790",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62c8000 0 96>;
+                        interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 716>,
+                                 <&cpg CPG_CORE R8A7790_CLK_ZS>, <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
+                               <&dmac1 0x4d>, <&dmac1 0x4e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 716>;
+                        status = "disabled";
+                };
 
-        usbphy: usb-phy@e6590100 {
-                compatible = "renesas,usb-phy-r8a7790",
-                             "renesas,rcar-gen2-usb-phy";
-                reg = <0 0xe6590100 0 0x100>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                clocks = <&cpg CPG_MOD 704>;
-                clock-names = "usbhs";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 704>;
-                status = "disabled";
+                msiof0: spi@e6e20000 {
+                        compatible = "renesas,msiof-r8a7790",
+                                     "renesas,rcar-gen2-msiof";
+                        reg = <0 0xe6e20000 0 0x0064>;
+                        interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 0>;
+                        dmas = <&dmac0 0x51>, <&dmac0 0x52>,
+                               <&dmac1 0x51>, <&dmac1 0x52>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 0>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-                usb0: usb-channel@0 {
-                        reg = <0>;
-                        #phy-cells = <1>;
+                msiof1: spi@e6e10000 {
+                        compatible = "renesas,msiof-r8a7790",
+                                     "renesas,rcar-gen2-msiof";
+                        reg = <0 0xe6e10000 0 0x0064>;
+                        interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 208>;
+                        dmas = <&dmac0 0x55>, <&dmac0 0x56>,
+                               <&dmac1 0x55>, <&dmac1 0x56>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 208>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
                 };
-                usb2: usb-channel@2 {
-                        reg = <2>;
-                        #phy-cells = <1>;
+
+                msiof2: spi@e6e00000 {
+                        compatible = "renesas,msiof-r8a7790",
+                                     "renesas,rcar-gen2-msiof";
+                        reg = <0 0xe6e00000 0 0x0064>;
+                        interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 205>;
+                        dmas = <&dmac0 0x41>, <&dmac0 0x42>,
+                               <&dmac1 0x41>, <&dmac1 0x42>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 205>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
                 };
-        };
 
-        vin0: video@e6ef0000 {
-                compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef0000 0 0x1000>;
-                interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 811>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 811>;
-                status = "disabled";
-        };
+                msiof3: spi@e6c90000 {
+                        compatible = "renesas,msiof-r8a7790",
+                                     "renesas,rcar-gen2-msiof";
+                        reg = <0 0xe6c90000 0 0x0064>;
+                        interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 215>;
+                        dmas = <&dmac0 0x45>, <&dmac0 0x46>,
+                               <&dmac1 0x45>, <&dmac1 0x46>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 215>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        vin1: video@e6ef1000 {
-                compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef1000 0 0x1000>;
-                interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 810>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 810>;
-                status = "disabled";
-        };
+                can0: can@e6e80000 {
+                        compatible = "renesas,can-r8a7790",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e80000 0 0x1000>;
+                        interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 916>,
+                                 <&cpg CPG_CORE R8A7790_CLK_RCAN>, <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 916>;
+                        status = "disabled";
+                };
 
-        vin2: video@e6ef2000 {
-                compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef2000 0 0x1000>;
-                interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 809>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 809>;
-                status = "disabled";
-        };
+                can1: can@e6e88000 {
+                        compatible = "renesas,can-r8a7790",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e88000 0 0x1000>;
+                        interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 915>,
+                                 <&cpg CPG_CORE R8A7790_CLK_RCAN>, <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 915>;
+                        status = "disabled";
+                };
 
-        vin3: video@e6ef3000 {
-                compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef3000 0 0x1000>;
-                interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 808>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 808>;
-                status = "disabled";
-        };
+                vin0: video@e6ef0000 {
+                        compatible = "renesas,vin-r8a7790",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef0000 0 0x1000>;
+                        interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 811>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 811>;
+                        status = "disabled";
+                };
 
-        vsp@fe920000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe920000 0 0x8000>;
-                interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 130>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 130>;
-        };
+                vin1: video@e6ef1000 {
+                        compatible = "renesas,vin-r8a7790",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef1000 0 0x1000>;
+                        interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 810>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 810>;
+                        status = "disabled";
+                };
 
-        vsp@fe928000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe928000 0 0x8000>;
-                interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 131>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 131>;
-        };
+                vin2: video@e6ef2000 {
+                        compatible = "renesas,vin-r8a7790",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef2000 0 0x1000>;
+                        interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 809>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 809>;
+                        status = "disabled";
+                };
 
-        vsp@fe930000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe930000 0 0x8000>;
-                interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 128>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 128>;
-        };
+                vin3: video@e6ef3000 {
+                        compatible = "renesas,vin-r8a7790",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef3000 0 0x1000>;
+                        interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 808>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 808>;
+                        status = "disabled";
+                };
 
-        vsp@fe938000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe938000 0 0x8000>;
-                interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 127>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 127>;
-        };
+                rcar_sound: sound@ec500000 {
+                        /*
+                         * #sound-dai-cells is required
+                         *
+                         * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
+                         * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
+                         */
+                        compatible = "renesas,rcar_sound-r8a7790",
+                                     "renesas,rcar_sound-gen2";
+                        reg = <0 0xec500000 0 0x1000>, /* SCU */
+                              <0 0xec5a0000 0 0x100>,  /* ADG */
+                              <0 0xec540000 0 0x1000>, /* SSIU */
+                              <0 0xec541000 0 0x280>,  /* SSI */
+                              <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
+                        reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+                        clocks = <&cpg CPG_MOD 1005>,
+                                 <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
+                                 <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
+                                 <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
+                                 <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
+                                 <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
+                                 <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
+                                 <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
+                                 <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
+                                 <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
+                                 <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
+                                 <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                 <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                 <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
+                                 <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
+                                 <&cpg CPG_CORE R8A7790_CLK_M2>;
+                        clock-names = "ssi-all",
+                                      "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                      "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                      "ssi.1", "ssi.0",
+                                      "src.9", "src.8", "src.7", "src.6",
+                                      "src.5", "src.4", "src.3", "src.2",
+                                      "src.1", "src.0",
+                                      "ctu.0", "ctu.1",
+                                      "mix.0", "mix.1",
+                                      "dvc.0", "dvc.1",
+                                      "clk_a", "clk_b", "clk_c", "clk_i";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 1005>,
+                                 <&cpg 1006>, <&cpg 1007>,
+                                 <&cpg 1008>, <&cpg 1009>,
+                                 <&cpg 1010>, <&cpg 1011>,
+                                 <&cpg 1012>, <&cpg 1013>,
+                                 <&cpg 1014>, <&cpg 1015>;
+                        reset-names = "ssi-all",
+                                      "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                      "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                      "ssi.1", "ssi.0";
+
+                        status = "disabled";
+
+                        rcar_sound,dvc {
+                                dvc0: dvc-0 {
+                                        dmas = <&audma1 0xbc>;
+                                        dma-names = "tx";
+                                };
+                                dvc1: dvc-1 {
+                                        dmas = <&audma1 0xbe>;
+                                        dma-names = "tx";
+                                };
+                        };
 
-        du: display@feb00000 {
-                compatible = "renesas,du-r8a7790";
-                reg = <0 0xfeb00000 0 0x70000>,
-                      <0 0xfeb90000 0 0x1c>,
-                      <0 0xfeb94000 0 0x1c>;
-                reg-names = "du", "lvds.0", "lvds.1";
-                interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
-                         <&cpg CPG_MOD 722>, <&cpg CPG_MOD 726>,
-                         <&cpg CPG_MOD 725>;
-                clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";
-                status = "disabled";
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                        rcar_sound,mix {
+                                mix0: mix-0 { };
+                                mix1: mix-1 { };
+                        };
 
-                        port@0 {
-                                reg = <0>;
-                                du_out_rgb: endpoint {
-                                };
+                        rcar_sound,ctu {
+                                ctu00: ctu-0 { };
+                                ctu01: ctu-1 { };
+                                ctu02: ctu-2 { };
+                                ctu03: ctu-3 { };
+                                ctu10: ctu-4 { };
+                                ctu11: ctu-5 { };
+                                ctu12: ctu-6 { };
+                                ctu13: ctu-7 { };
                         };
-                        port@1 {
-                                reg = <1>;
-                                du_out_lvds0: endpoint {
+
+                        rcar_sound,src {
+                                src0: src-0 {
+                                        interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x85>, <&audma1 0x9a>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src1: src-1 {
+                                        interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x87>, <&audma1 0x9c>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src2: src-2 {
+                                        interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x89>, <&audma1 0x9e>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src3: src-3 {
+                                        interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src4: src-4 {
+                                        interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src5: src-5 {
+                                        interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src6: src-6 {
+                                        interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x91>, <&audma1 0xb4>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src7: src-7 {
+                                        interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x93>, <&audma1 0xb6>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src8: src-8 {
+                                        interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x95>, <&audma1 0xb8>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src9: src-9 {
+                                        interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x97>, <&audma1 0xba>;
+                                        dma-names = "rx", "tx";
                                 };
                         };
-                        port@2 {
-                                reg = <2>;
-                                du_out_lvds1: endpoint {
+
+                        rcar_sound,ssi {
+                                ssi0: ssi-0 {
+                                        interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x01>, <&audma1 0x02>,
+                                               <&audma0 0x15>, <&audma1 0x16>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi1: ssi-1 {
+                                         interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x03>, <&audma1 0x04>,
+                                               <&audma0 0x49>, <&audma1 0x4a>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi2: ssi-2 {
+                                        interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x05>, <&audma1 0x06>,
+                                               <&audma0 0x63>, <&audma1 0x64>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi3: ssi-3 {
+                                        interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x07>, <&audma1 0x08>,
+                                               <&audma0 0x6f>, <&audma1 0x70>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi4: ssi-4 {
+                                        interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x09>, <&audma1 0x0a>,
+                                               <&audma0 0x71>, <&audma1 0x72>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi5: ssi-5 {
+                                        interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0b>, <&audma1 0x0c>,
+                                               <&audma0 0x73>, <&audma1 0x74>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi6: ssi-6 {
+                                        interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0d>, <&audma1 0x0e>,
+                                               <&audma0 0x75>, <&audma1 0x76>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi7: ssi-7 {
+                                        interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0f>, <&audma1 0x10>,
+                                               <&audma0 0x79>, <&audma1 0x7a>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi8: ssi-8 {
+                                        interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x11>, <&audma1 0x12>,
+                                               <&audma0 0x7b>, <&audma1 0x7c>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi9: ssi-9 {
+                                        interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x13>, <&audma1 0x14>,
+                                               <&audma0 0x7d>, <&audma1 0x7e>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
                                 };
                         };
                 };
-        };
 
-        can0: can@e6e80000 {
-                compatible = "renesas,can-r8a7790", "renesas,rcar-gen2-can";
-                reg = <0 0xe6e80000 0 0x1000>;
-                interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7790_CLK_RCAN>,
-                         <&can_clk>;
-                clock-names = "clkp1", "clkp2", "can_clk";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 916>;
-                status = "disabled";
-        };
-
-        can1: can@e6e88000 {
-                compatible = "renesas,can-r8a7790", "renesas,rcar-gen2-can";
-                reg = <0 0xe6e88000 0 0x1000>;
-                interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7790_CLK_RCAN>,
-                         <&can_clk>;
-                clock-names = "clkp1", "clkp2", "can_clk";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 915>;
-                status = "disabled";
-        };
-
-        jpu: jpeg-codec@fe980000 {
-                compatible = "renesas,jpu-r8a7790", "renesas,rcar-gen2-jpu";
-                reg = <0 0xfe980000 0 0x10300>;
-                interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 106>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 106>;
-        };
-
-        /* External root clock */
-        extal_clk: extal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
-
-        /* External PCIe clock - can be overridden by the board */
-        pcie_bus_clk: pcie_bus {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+                audma0: dma-controller@ec700000 {
+                        compatible = "renesas,dmac-r8a7790",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec700000 0 0x10000>;
+                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 502>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 502>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
 
-        /*
-         * The external audio clocks are configured as 0 Hz fixed frequency
-         * clocks by default.
-         * Boards that provide audio clocks should override them.
-         */
-        audio_clk_a: audio_clk_a {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-        audio_clk_b: audio_clk_b {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-        audio_clk_c: audio_clk_c {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+                audma1: dma-controller@ec720000 {
+                        compatible = "renesas,dmac-r8a7790",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec720000 0 0x10000>;
+                        interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 501>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 501>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
 
-        /* External SCIF clock */
-        scif_clk: scif {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                xhci: usb@ee000000 {
+                        compatible = "renesas,xhci-r8a7790",
+                                     "renesas,rcar-gen2-xhci";
+                        reg = <0 0xee000000 0 0xc00>;
+                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 328>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 328>;
+                        phys = <&usb2 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
 
-        /* External USB clock - can be overridden by the board */
-        usb_extal_clk: usb_extal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <48000000>;
-        };
+                pci0: pci@ee090000 {
+                        compatible = "renesas,pci-r8a7790",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee090000 0 0xc00>,
+                              <0 0xee080000 0 0x1100>;
+                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x800 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
 
-        /* External CAN clock */
-        can_clk: can {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                        usb@2,0 {
+                                reg = <0x1000 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
+                };
 
-        cpg: clock-controller@e6150000 {
-                compatible = "renesas,r8a7790-cpg-mssr";
-                reg = <0 0xe6150000 0 0x1000>;
-                clocks = <&extal_clk>, <&usb_extal_clk>;
-                clock-names = "extal", "usb_extal";
-                #clock-cells = <2>;
-                #power-domain-cells = <0>;
-                #reset-cells = <1>;
-        };
+                pci1: pci@ee0b0000 {
+                        compatible = "renesas,pci-r8a7790",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee0b0000 0 0xc00>,
+                              <0 0xee0a0000 0 0x1100>;
+                        interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <1 1>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee0a0000 0 0xee0a0000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+                };
 
-        prr: chipid@ff000044 {
-                compatible = "renesas,prr";
-                reg = <0 0xff000044 0 4>;
-        };
+                pci2: pci@ee0d0000 {
+                        compatible = "renesas,pci-r8a7790",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        reg = <0 0xee0d0000 0 0xc00>,
+                              <0 0xee0c0000 0 0x1100>;
+                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                        status = "disabled";
+
+                        bus-range = <2 2>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x20800 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
 
-        rst: reset-controller@e6160000 {
-                compatible = "renesas,r8a7790-rst";
-                reg = <0 0xe6160000 0 0x0100>;
-        };
+                        usb@2,0 {
+                                reg = <0x21000 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
+                };
 
-        sysc: system-controller@e6180000 {
-                compatible = "renesas,r8a7790-sysc";
-                reg = <0 0xe6180000 0 0x0200>;
-                #power-domain-cells = <1>;
-        };
+                sdhi0: sd@ee100000 {
+                        compatible = "renesas,sdhi-r8a7790",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee100000 0 0x328>;
+                        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 314>;
+                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                               <&dmac1 0xcd>, <&dmac1 0xce>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <195000000>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 314>;
+                        status = "disabled";
+                };
 
-        qspi: spi@e6b10000 {
-                compatible = "renesas,qspi-r8a7790", "renesas,qspi";
-                reg = <0 0xe6b10000 0 0x2c>;
-                interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 917>;
-                dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                       <&dmac1 0x17>, <&dmac1 0x18>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 917>;
-                num-cs = <1>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                sdhi1: sd@ee120000 {
+                        compatible = "renesas,sdhi-r8a7790",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee120000 0 0x328>;
+                        interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 313>;
+                        dmas = <&dmac0 0xc9>, <&dmac0 0xca>,
+                               <&dmac1 0xc9>, <&dmac1 0xca>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <195000000>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 313>;
+                        status = "disabled";
+                };
 
-        msiof0: spi@e6e20000 {
-                compatible = "renesas,msiof-r8a7790",
-                             "renesas,rcar-gen2-msiof";
-                reg = <0 0xe6e20000 0 0x0064>;
-                interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 0>;
-                dmas = <&dmac0 0x51>, <&dmac0 0x52>,
-                       <&dmac1 0x51>, <&dmac1 0x52>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 0>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                sdhi2: sd@ee140000 {
+                        compatible = "renesas,sdhi-r8a7790",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee140000 0 0x100>;
+                        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 312>;
+                        dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                               <&dmac1 0xc1>, <&dmac1 0xc2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 312>;
+                        status = "disabled";
+                };
 
-        msiof1: spi@e6e10000 {
-                compatible = "renesas,msiof-r8a7790",
-                             "renesas,rcar-gen2-msiof";
-                reg = <0 0xe6e10000 0 0x0064>;
-                interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 208>;
-                dmas = <&dmac0 0x55>, <&dmac0 0x56>,
-                       <&dmac1 0x55>, <&dmac1 0x56>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 208>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                sdhi3: sd@ee160000 {
+                        compatible = "renesas,sdhi-r8a7790",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee160000 0 0x100>;
+                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 311>;
+                        dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                               <&dmac1 0xd3>, <&dmac1 0xd4>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 311>;
+                        status = "disabled";
+                };
 
-        msiof2: spi@e6e00000 {
-                compatible = "renesas,msiof-r8a7790",
-                             "renesas,rcar-gen2-msiof";
-                reg = <0 0xe6e00000 0 0x0064>;
-                interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 205>;
-                dmas = <&dmac0 0x41>, <&dmac0 0x42>,
-                       <&dmac1 0x41>, <&dmac1 0x42>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 205>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                mmcif0: mmc@ee200000 {
+                        compatible = "renesas,mmcif-r8a7790",
+                                     "renesas,sh-mmcif";
+                        reg = <0 0xee200000 0 0x80>;
+                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 315>;
+                        dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                               <&dmac1 0xd1>, <&dmac1 0xd2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 315>;
+                        reg-io-width = <4>;
+                        status = "disabled";
+                        max-frequency = <97500000>;
+                };
 
-        msiof3: spi@e6c90000 {
-                compatible = "renesas,msiof-r8a7790",
-                             "renesas,rcar-gen2-msiof";
-                reg = <0 0xe6c90000 0 0x0064>;
-                interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 215>;
-                dmas = <&dmac0 0x45>, <&dmac0 0x46>,
-                       <&dmac1 0x45>, <&dmac1 0x46>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 215>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                mmcif1: mmc@ee220000 {
+                        compatible = "renesas,mmcif-r8a7790",
+                                     "renesas,sh-mmcif";
+                        reg = <0 0xee220000 0 0x80>;
+                        interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 305>;
+                        dmas = <&dmac0 0xe1>, <&dmac0 0xe2>,
+                               <&dmac1 0xe1>, <&dmac1 0xe2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 305>;
+                        reg-io-width = <4>;
+                        status = "disabled";
+                        max-frequency = <97500000>;
+                };
 
-        xhci: usb@ee000000 {
-                compatible = "renesas,xhci-r8a7790", "renesas,rcar-gen2-xhci";
-                reg = <0 0xee000000 0 0xc00>;
-                interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 328>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 328>;
-                phys = <&usb2 1>;
-                phy-names = "usb";
-                status = "disabled";
-        };
+                sata0: sata@ee300000 {
+                        compatible = "renesas,sata-r8a7790",
+                                     "renesas,rcar-gen2-sata";
+                        reg = <0 0xee300000 0 0x2000>;
+                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 815>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 815>;
+                        status = "disabled";
+                };
 
-        pci0: pci@ee090000 {
-                compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
-                device_type = "pci";
-                reg = <0 0xee090000 0 0xc00>,
-                      <0 0xee080000 0 0x1100>;
-                interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 703>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 703>;
-                status = "disabled";
-
-                bus-range = <0 0>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                #interrupt-cells = <1>;
-                ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
-                interrupt-map-mask = <0xff00 0 0 0x7>;
-                interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-
-                usb@1,0 {
-                        reg = <0x800 0 0 0 0>;
-                        phys = <&usb0 0>;
-                        phy-names = "usb";
+                sata1: sata@ee500000 {
+                        compatible = "renesas,sata-r8a7790",
+                                     "renesas,rcar-gen2-sata";
+                        reg = <0 0xee500000 0 0x2000>;
+                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 814>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 814>;
+                        status = "disabled";
                 };
 
-                usb@2,0 {
-                        reg = <0x1000 0 0 0 0>;
-                        phys = <&usb0 0>;
-                        phy-names = "usb";
+                ether: ethernet@ee700000 {
+                        compatible = "renesas,ether-r8a7790",
+                                     "renesas,rcar-gen2-ether";
+                        reg = <0 0xee700000 0 0x400>;
+                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 813>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 813>;
+                        phy-mode = "rmii";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
                 };
-        };
 
-        pci1: pci@ee0b0000 {
-                compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
-                device_type = "pci";
-                reg = <0 0xee0b0000 0 0xc00>,
-                      <0 0xee0a0000 0 0x1100>;
-                interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 703>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 703>;
-                status = "disabled";
-
-                bus-range = <1 1>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                #interrupt-cells = <1>;
-                ranges = <0x02000000 0 0xee0a0000 0 0xee0a0000 0 0x00010000>;
-                interrupt-map-mask = <0xff00 0 0 0x7>;
-                interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
-                                 0x0800 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH
-                                 0x1000 0 0 2 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-        };
+                gic: interrupt-controller@f1001000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        #address-cells = <0>;
+                        interrupt-controller;
+                        reg = <0 0xf1001000 0 0x1000>, <0 0xf1002000 0 0x2000>,
+                              <0 0xf1004000 0 0x2000>, <0 0xf1006000 0 0x2000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 408>;
+                };
 
-        pci2: pci@ee0d0000 {
-                compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
-                device_type = "pci";
-                clocks = <&cpg CPG_MOD 703>;
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 703>;
-                reg = <0 0xee0d0000 0 0xc00>,
-                      <0 0xee0c0000 0 0x1100>;
-                interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                status = "disabled";
-
-                bus-range = <2 2>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                #interrupt-cells = <1>;
-                ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
-                interrupt-map-mask = <0xff00 0 0 0x7>;
-                interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-
-                usb@1,0 {
-                        reg = <0x20800 0 0 0 0>;
-                        phys = <&usb2 0>;
-                        phy-names = "usb";
+                pciec: pcie@fe000000 {
+                        compatible = "renesas,pcie-r8a7790",
+                                     "renesas,pcie-rcar-gen2";
+                        reg = <0 0xfe000000 0 0x80000>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        bus-range = <0x00 0xff>;
+                        device_type = "pci";
+                        ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+                                  0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+                                  0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+                                  0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+                        /* Map all possible DDR as inbound ranges */
+                        dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+                                      0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
+                        interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
+                        clock-names = "pcie", "pcie_bus";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 319>;
+                        status = "disabled";
                 };
 
-                usb@2,0 {
-                        reg = <0x21000 0 0 0 0>;
-                        phys = <&usb2 0>;
-                        phy-names = "usb";
+                vsp@fe920000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe920000 0 0x8000>;
+                        interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 130>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 130>;
                 };
-        };
 
-        pciec: pcie@fe000000 {
-                compatible = "renesas,pcie-r8a7790", "renesas,pcie-rcar-gen2";
-                reg = <0 0xfe000000 0 0x80000>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                bus-range = <0x00 0xff>;
-                device_type = "pci";
-                ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
-                          0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
-                          0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
-                          0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
-                /* Map all possible DDR as inbound ranges */
-                dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
-                              0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
-                interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-                #interrupt-cells = <1>;
-                interrupt-map-mask = <0 0 0 0>;
-                interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
-                clock-names = "pcie", "pcie_bus";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 319>;
-                status = "disabled";
-        };
+                vsp@fe928000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe928000 0 0x8000>;
+                        interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 131>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 131>;
+                };
 
-        rcar_sound: sound@ec500000 {
-                /*
-                 * #sound-dai-cells is required
-                 *
-                 * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
-                 * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
-                 */
-                compatible =  "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2";
-                reg =   <0 0xec500000 0 0x1000>, /* SCU */
-                        <0 0xec5a0000 0 0x100>,  /* ADG */
-                        <0 0xec540000 0 0x1000>, /* SSIU */
-                        <0 0xec541000 0 0x280>,  /* SSI */
-                        <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-                reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
-
-                clocks = <&cpg CPG_MOD 1005>,
-                         <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-                         <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
-                         <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
-                         <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
-                         <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
-                         <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
-                         <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
-                         <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
-                         <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
-                         <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
-                         <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                         <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                         <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
-                         <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
-                         <&cpg CPG_CORE R8A7790_CLK_M2>;
-                clock-names = "ssi-all",
-                                "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                                "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
-                                "src.9", "src.8", "src.7", "src.6", "src.5",
-                                "src.4", "src.3", "src.2", "src.1", "src.0",
-                                "ctu.0", "ctu.1",
-                                "mix.0", "mix.1",
-                                "dvc.0", "dvc.1",
-                                "clk_a", "clk_b", "clk_c", "clk_i";
-                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
-                resets = <&cpg 1005>,
-                         <&cpg 1006>, <&cpg 1007>, <&cpg 1008>, <&cpg 1009>,
-                         <&cpg 1010>, <&cpg 1011>, <&cpg 1012>, <&cpg 1013>,
-                         <&cpg 1014>, <&cpg 1015>;
-                reset-names = "ssi-all",
-                              "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                              "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0";
-
-                status = "disabled";
-
-                rcar_sound,dvc {
-                        dvc0: dvc-0 {
-                                dmas = <&audma1 0xbc>;
-                                dma-names = "tx";
-                        };
-                        dvc1: dvc-1 {
-                                dmas = <&audma1 0xbe>;
-                                dma-names = "tx";
-                        };
+                vsp@fe930000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe930000 0 0x8000>;
+                        interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 128>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 128>;
                 };
 
-                rcar_sound,mix {
-                        mix0: mix-0 { };
-                        mix1: mix-1 { };
+                vsp@fe938000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe938000 0 0x8000>;
+                        interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 127>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 127>;
                 };
 
-                rcar_sound,ctu {
-                        ctu00: ctu-0 { };
-                        ctu01: ctu-1 { };
-                        ctu02: ctu-2 { };
-                        ctu03: ctu-3 { };
-                        ctu10: ctu-4 { };
-                        ctu11: ctu-5 { };
-                        ctu12: ctu-6 { };
-                        ctu13: ctu-7 { };
+                jpu: jpeg-codec@fe980000 {
+                        compatible = "renesas,jpu-r8a7790",
+                                     "renesas,rcar-gen2-jpu";
+                        reg = <0 0xfe980000 0 0x10300>;
+                        interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 106>;
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 106>;
                 };
 
-                rcar_sound,src {
-                        src0: src-0 {
-                                interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x85>, <&audma1 0x9a>;
-                                dma-names = "rx", "tx";
-                        };
-                        src1: src-1 {
-                                interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x87>, <&audma1 0x9c>;
-                                dma-names = "rx", "tx";
-                        };
-                        src2: src-2 {
-                                interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x89>, <&audma1 0x9e>;
-                                dma-names = "rx", "tx";
-                        };
-                        src3: src-3 {
-                                interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8b>, <&audma1 0xa0>;
-                                dma-names = "rx", "tx";
-                        };
-                        src4: src-4 {
-                                interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8d>, <&audma1 0xb0>;
-                                dma-names = "rx", "tx";
-                        };
-                        src5: src-5 {
-                                interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8f>, <&audma1 0xb2>;
-                                dma-names = "rx", "tx";
-                        };
-                        src6: src-6 {
-                                interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x91>, <&audma1 0xb4>;
-                                dma-names = "rx", "tx";
-                        };
-                        src7: src-7 {
-                                interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x93>, <&audma1 0xb6>;
-                                dma-names = "rx", "tx";
-                        };
-                        src8: src-8 {
-                                interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x95>, <&audma1 0xb8>;
-                                dma-names = "rx", "tx";
-                        };
-                        src9: src-9 {
-                                interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x97>, <&audma1 0xba>;
-                                dma-names = "rx", "tx";
+                du: display@feb00000 {
+                        compatible = "renesas,du-r8a7790";
+                        reg = <0 0xfeb00000 0 0x70000>,
+                              <0 0xfeb90000 0 0x1c>,
+                              <0 0xfeb94000 0 0x1c>;
+                        reg-names = "du", "lvds.0", "lvds.1";
+                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>,
+                                 <&cpg CPG_MOD 722>, <&cpg CPG_MOD 726>,
+                                 <&cpg CPG_MOD 725>;
+                        clock-names = "du.0", "du.1", "du.2", "lvds.0",
+                                      "lvds.1";
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb: endpoint {
+                                        };
+                                };
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_lvds0: endpoint {
+                                        };
+                                };
+                                port@2 {
+                                        reg = <2>;
+                                        du_out_lvds1: endpoint {
+                                        };
+                                };
                         };
                 };
 
-                rcar_sound,ssi {
-                        ssi0: ssi-0 {
-                                interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi1: ssi-1 {
-                                 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi2: ssi-2 {
-                                interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi3: ssi-3 {
-                                interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi4: ssi-4 {
-                                interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi5: ssi-5 {
-                                interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi6: ssi-6 {
-                                interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi7: ssi-7 {
-                                interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi8: ssi-8 {
-                                interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi9: ssi-9 {
-                                interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
+                prr: chipid@ff000044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xff000044 0 4>;
                 };
-        };
 
-        ipmmu_sy0: mmu@e6280000 {
-                compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6280000 0 0x1000>;
-                interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                cmt0: timer@ffca0000 {
+                        compatible = "renesas,r8a7790-cmt0",
+                                     "renesas,rcar-gen2-cmt0";
+                        reg = <0 0xffca0000 0 0x1004>;
+                        interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 124>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 124>;
+
+                        status = "disabled";
+                };
 
-        ipmmu_sy1: mmu@e6290000 {
-                compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6290000 0 0x1000>;
-                interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
+                cmt1: timer@e6130000 {
+                        compatible = "renesas,r8a7790-cmt1",
+                                     "renesas,rcar-gen2-cmt1";
+                        reg = <0 0xe6130000 0 0x1004>;
+                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 329>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
+                        resets = <&cpg 329>;
+
+                        status = "disabled";
+                };
         };
 
-        ipmmu_ds: mmu@e6740000 {
-                compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6740000 0 0x1000>;
-                interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <0>;
+                        polling-delay = <0>;
 
-        ipmmu_mp: mmu@ec680000 {
-                compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-                reg = <0 0xec680000 0 0x1000>;
-                interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
+                        thermal-sensors = <&thermal>;
+
+                        trips {
+                                cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <0>;
+                                        type = "critical";
+                                };
+                        };
+                        cooling-maps {
+                        };
+                };
         };
 
-        ipmmu_mx: mmu@fe951000 {
-                compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-                reg = <0 0xfe951000 0 0x1000>;
-                interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
         };
 
-        ipmmu_rt: mmu@ffc80000 {
-                compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa";
-                reg = <0 0xffc80000 0 0x1000>;
-                interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
+        /* External USB clock - can be overridden by the board */
+        usb_extal_clk: usb_extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <48000000>;
         };
 };
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index a50924d12b6f..f40321a1c917 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -51,7 +51,11 @@
                 serial0 = &scif0;
                 serial1 = &scif1;
                 i2c9 = &gpioi2c1;
+                i2c10 = &gpioi2c2;
+                i2c11 = &gpioi2c4;
                 i2c12 = &i2cexio1;
+                i2c13 = &i2chdmi;
+                i2c14 = &i2cexio4;
         };
 
         chosen {
@@ -312,8 +316,28 @@
                 #size-cells = <0>;
                 compatible = "i2c-gpio";
                 status = "disabled";
-                sda-gpios = <&gpio7 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                 scl-gpios = <&gpio7 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio7 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                i2c-gpio,delay-us = <5>;
+        };
+
+        gpioi2c2: i2c-10 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "i2c-gpio";
+                status = "disabled";
+                scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                i2c-gpio,delay-us = <5>;
+        };
+
+        gpioi2c4: i2c-11 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "i2c-gpio";
+                status = "disabled";
+                scl-gpios = <&gpio7 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio7 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                 i2c-gpio,delay-us = <5>;
         };
 
@@ -328,6 +352,115 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
         };
+
+        /*
+         * A fallback to GPIO is provided for I2C2.
+         */
+        i2chdmi: i2c-13 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&i2c2>, <&gpioi2c2>;
+                i2c-bus-name = "i2c-hdmi";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ak4643: codec@12 {
+                        compatible = "asahi-kasei,ak4643";
+                        #sound-dai-cells = <0>;
+                        reg = <0x12>;
+                };
+
+                composite-in@20 {
+                        compatible = "adi,adv7180";
+                        reg = <0x20>;
+                        remote = <&vin1>;
+
+                        port {
+                                adv7180: endpoint {
+                                        bus-width = <8>;
+                                        remote-endpoint = <&vin1ep>;
+                                };
+                        };
+                };
+
+                hdmi@39 {
+                        compatible = "adi,adv7511w";
+                        reg = <0x39>;
+                        interrupt-parent = <&gpio3>;
+                        interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+                        clocks = <&cec_clock>;
+                        clock-names = "cec";
+
+                        adi,input-depth = <8>;
+                        adi,input-colorspace = "rgb";
+                        adi,input-clock = "1x";
+                        adi,input-style = <1>;
+                        adi,input-justification = "evenly";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7511_in: endpoint {
+                                                remote-endpoint = <&du_out_rgb>;
+                                        };
+                                };
+
+                                port@1 {
+                                        reg = <1>;
+                                        adv7511_out: endpoint {
+                                                remote-endpoint = <&hdmi_con_out>;
+                                        };
+                                };
+                        };
+                };
+
+                hdmi-in@4c {
+                        compatible = "adi,adv7612";
+                        reg = <0x4c>;
+                        interrupt-parent = <&gpio4>;
+                        interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                        default-input = <0>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7612_in: endpoint {
+                                                remote-endpoint = <&hdmi_con_in>;
+                                        };
+                                };
+
+                                port@2 {
+                                        reg = <2>;
+                                        adv7612_out: endpoint {
+                                                remote-endpoint = <&vin0ep2>;
+                                        };
+                                };
+                        };
+                };
+
+                eeprom@50 {
+                        compatible = "renesas,r1ex24002", "atmel,24c02";
+                        reg = <0x50>;
+                        pagesize = <16>;
+                };
+        };
+
+        /*
+         * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
+         * A fallback to GPIO is provided.
+         */
+        i2cexio4: i2c-14 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&i2c4>, <&gpioi2c4>;
+                i2c-bus-name = "i2c-exio4";
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
 };
 
 &du {
@@ -371,6 +504,11 @@
                 function = "i2c2";
         };
 
+        i2c4_pins: i2c4 {
+                groups = "i2c4_c";
+                function = "i2c4";
+        };
+
         du_pins: du {
                 groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
                 function = "du";
@@ -621,96 +759,14 @@
 
 &i2c2 {
         pinctrl-0 = <&i2c2_pins>;
-        pinctrl-names = "default";
+        pinctrl-names = "i2c-hdmi";
 
-        status = "okay";
         clock-frequency = <100000>;
+};
 
-        ak4643: codec@12 {
-                compatible = "asahi-kasei,ak4643";
-                #sound-dai-cells = <0>;
-                reg = <0x12>;
-        };
-
-        composite-in@20 {
-                compatible = "adi,adv7180";
-                reg = <0x20>;
-                remote = <&vin1>;
-
-                port {
-                        adv7180: endpoint {
-                                bus-width = <8>;
-                                remote-endpoint = <&vin1ep>;
-                        };
-                };
-        };
-
-        hdmi@39 {
-                compatible = "adi,adv7511w";
-                reg = <0x39>;
-                interrupt-parent = <&gpio3>;
-                interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-                clocks = <&cec_clock>;
-                clock-names = "cec";
-
-                adi,input-depth = <8>;
-                adi,input-colorspace = "rgb";
-                adi,input-clock = "1x";
-                adi,input-style = <1>;
-                adi,input-justification = "evenly";
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        port@0 {
-                                reg = <0>;
-                                adv7511_in: endpoint {
-                                        remote-endpoint = <&du_out_rgb>;
-                                };
-                        };
-
-                        port@1 {
-                                reg = <1>;
-                                adv7511_out: endpoint {
-                                        remote-endpoint = <&hdmi_con_out>;
-                                };
-                        };
-                };
-        };
-
-        hdmi-in@4c {
-                compatible = "adi,adv7612";
-                reg = <0x4c>;
-                interrupt-parent = <&gpio4>;
-                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-                default-input = <0>;
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        port@0 {
-                                reg = <0>;
-                                adv7612_in: endpoint {
-                                        remote-endpoint = <&hdmi_con_in>;
-                                };
-                        };
-
-                        port@2 {
-                                reg = <2>;
-                                adv7612_out: endpoint {
-                                        remote-endpoint = <&vin0ep2>;
-                                };
-                        };
-                };
-        };
-
-        eeprom@50 {
-                compatible = "renesas,r1ex24002", "atmel,24c02";
-                reg = <0x50>;
-                pagesize = <16>;
-        };
+&i2c4 {
+        pinctrl-0 = <&i2c4_pins>;
+        pinctrl-names = "i2c-exio4";
 };
 
 &i2c6 {
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index eb374956294f..c14e6fe9e4f6 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -29,6 +29,8 @@
 
         aliases {
                 serial0 = &scif0;
+                i2c9 = &gpioi2c2;
+                i2c10 = &i2chdmi;
         };
 
         chosen {
@@ -135,6 +137,78 @@
                         clocks = <&x14_clk>;
                 };
         };
+
+        gpioi2c2: i2c-9 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "i2c-gpio";
+                status = "disabled";
+                scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                i2c-gpio,delay-us = <5>;
+        };
+
+        /*
+         * A fallback to GPIO is provided for I2C2.
+         */
+        i2chdmi: i2c-10 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&i2c2>, <&gpioi2c2>;
+                i2c-bus-name = "i2c-hdmi";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ak4642: codec@12 {
+                        compatible = "asahi-kasei,ak4642";
+                        #sound-dai-cells = <0>;
+                        reg = <0x12>;
+                };
+
+                composite-in@20 {
+                        compatible = "adi,adv7180";
+                        reg = <0x20>;
+                        remote = <&vin0>;
+
+                        port {
+                                adv7180: endpoint {
+                                        bus-width = <8>;
+                                        remote-endpoint = <&vin0ep>;
+                                };
+                        };
+                };
+
+                hdmi@39 {
+                        compatible = "adi,adv7511w";
+                        reg = <0x39>;
+                        interrupt-parent = <&gpio3>;
+                        interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+
+                        adi,input-depth = <8>;
+                        adi,input-colorspace = "rgb";
+                        adi,input-clock = "1x";
+                        adi,input-style = <1>;
+                        adi,input-justification = "evenly";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7511_in: endpoint {
+                                                remote-endpoint = <&du_out_rgb>;
+                                        };
+                                };
+
+                                port@1 {
+                                        reg = <1>;
+                                        adv7511_out: endpoint {
+                                                remote-endpoint = <&hdmi_con>;
+                                        };
+                                };
+                        };
+                };
+        };
 };
 
 &extal_clk {
@@ -296,61 +370,9 @@
 
 &i2c2 {
         pinctrl-0 = <&i2c2_pins>;
-        pinctrl-names = "default";
+        pinctrl-names = "i2c-hdmi";
 
-        status = "okay";
         clock-frequency = <400000>;
-
-        ak4642: codec@12 {
-                compatible = "asahi-kasei,ak4642";
-                #sound-dai-cells = <0>;
-                reg = <0x12>;
-        };
-
-        composite-in@20 {
-                compatible = "adi,adv7180";
-                reg = <0x20>;
-                remote = <&vin0>;
-
-                port {
-                        adv7180: endpoint {
-                                bus-width = <8>;
-                                remote-endpoint = <&vin0ep>;
-                        };
-                };
-        };
-
-        hdmi@39 {
-                compatible = "adi,adv7511w";
-                reg = <0x39>;
-                interrupt-parent = <&gpio3>;
-                interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-
-                adi,input-depth = <8>;
-                adi,input-colorspace = "rgb";
-                adi,input-clock = "1x";
-                adi,input-style = <1>;
-                adi,input-justification = "evenly";
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        port@0 {
-                                reg = <0>;
-                                adv7511_in: endpoint {
-                                        remote-endpoint = <&du_out_rgb>;
-                                };
-                        };
-
-                        port@1 {
-                                reg = <1>;
-                                adv7511_out: endpoint {
-                                        remote-endpoint = <&hdmi_con>;
-                                };
-                        };
-                };
-        };
 };
 
 &sata0 {
@@ -425,7 +447,7 @@
                       "dclkin.0", "dclkin.1";
 
         ports {
-                port@1 {
+                port@0 {
                         endpoint {
                                 remote-endpoint = <&adv7511_in>;
                         };
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 008a260f86a5..f11dab71b03a 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -17,7 +17,6 @@
 
 / {
         compatible = "renesas,r8a7791";
-        interrupt-parent = <&gic>;
         #address-cells = <2>;
         #size-cells = <2>;
 
@@ -40,6 +39,35 @@
                 vin2 = &vin2;
         };
 
+        /*
+         * The external audio clocks are configured as 0 Hz fixed frequency
+         * clocks by default.
+         * Boards that provide audio clocks should override them.
+         */
+        audio_clk_a: audio_clk_a {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+        audio_clk_b: audio_clk_b {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+        audio_clk_c: audio_clk_c {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        /* External CAN clock */
+        can_clk: can {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -83,1585 +111,1627 @@
                 };
         };
 
-        thermal-zones {
-                cpu_thermal: cpu-thermal {
-                        polling-delay-passive   = <0>;
-                        polling-delay           = <0>;
-
-                        thermal-sensors = <&thermal>;
-
-                        trips {
-                                cpu-crit {
-                                        temperature     = <95000>;
-                                        hysteresis      = <0>;
-                                        type            = "critical";
-                                };
-                        };
-                        cooling-maps {
-                        };
-                };
-        };
-
-        apmu@e6152000 {
-                compatible = "renesas,r8a7791-apmu", "renesas,apmu";
-                reg = <0 0xe6152000 0 0x188>;
-                cpus = <&cpu0 &cpu1>;
-        };
-
-        gic: interrupt-controller@f1001000 {
-                compatible = "arm,gic-400";
-                #interrupt-cells = <3>;
-                #address-cells = <0>;
-                interrupt-controller;
-                reg = <0 0xf1001000 0 0x1000>,
-                        <0 0xf1002000 0 0x2000>,
-                        <0 0xf1004000 0 0x2000>,
-                        <0 0xf1006000 0 0x2000>;
-                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
-                clocks = <&cpg CPG_MOD 408>;
-                clock-names = "clk";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 408>;
-        };
-
-        gpio0: gpio@e6050000 {
-                compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6050000 0 0x50>;
-                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 0 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 912>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 912>;
-        };
-
-        gpio1: gpio@e6051000 {
-                compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6051000 0 0x50>;
-                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 32 26>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 911>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 911>;
-        };
-
-        gpio2: gpio@e6052000 {
-                compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6052000 0 0x50>;
-                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 64 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 910>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 910>;
+        /* External root clock */
+        extal_clk: extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
         };
 
-        gpio3: gpio@e6053000 {
-                compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6053000 0 0x50>;
-                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 96 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 909>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 909>;
+        /* External PCIe clock - can be overridden by the board */
+        pcie_bus_clk: pcie_bus {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
         };
 
-        gpio4: gpio@e6054000 {
-                compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6054000 0 0x50>;
-                interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 128 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 908>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 908>;
+        /* External SCIF clock */
+        scif_clk: scif {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
         };
 
-        gpio5: gpio@e6055000 {
-                compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055000 0 0x50>;
-                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 160 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 907>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 907>;
-        };
+        soc {
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
 
-        gpio6: gpio@e6055400 {
-                compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055400 0 0x50>;
-                interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 192 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 905>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 905>;
-        };
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                gpio0: gpio@e6050000 {
+                        compatible = "renesas,gpio-r8a7791",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6050000 0 0x50>;
+                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 0 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 912>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 912>;
+                };
 
-        gpio7: gpio@e6055800 {
-                compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055800 0 0x50>;
-                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 224 26>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 904>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 904>;
-        };
+                gpio1: gpio@e6051000 {
+                        compatible = "renesas,gpio-r8a7791",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6051000 0 0x50>;
+                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 32 26>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 911>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 911>;
+                };
 
-        thermal: thermal@e61f0000 {
-                compatible =    "renesas,thermal-r8a7791",
-                                "renesas,rcar-gen2-thermal",
-                                "renesas,rcar-thermal";
-                reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
-                interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 522>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 522>;
-                #thermal-sensor-cells = <0>;
-        };
+                gpio2: gpio@e6052000 {
+                        compatible = "renesas,gpio-r8a7791",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6052000 0 0x50>;
+                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 64 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 910>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 910>;
+                };
 
-        timer {
-                compatible = "arm,armv7-timer";
-                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
-        };
+                gpio3: gpio@e6053000 {
+                        compatible = "renesas,gpio-r8a7791",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6053000 0 0x50>;
+                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 96 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 909>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 909>;
+                };
 
-        cmt0: timer@ffca0000 {
-                compatible = "renesas,r8a7791-cmt0", "renesas,rcar-gen2-cmt0";
-                reg = <0 0xffca0000 0 0x1004>;
-                interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 124>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 124>;
-
-                status = "disabled";
-        };
+                gpio4: gpio@e6054000 {
+                        compatible = "renesas,gpio-r8a7791",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6054000 0 0x50>;
+                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 128 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 908>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 908>;
+                };
 
-        cmt1: timer@e6130000 {
-                compatible = "renesas,r8a7791-cmt1", "renesas,rcar-gen2-cmt1";
-                reg = <0 0xe6130000 0 0x1004>;
-                interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 329>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 329>;
-
-                status = "disabled";
-        };
+                gpio5: gpio@e6055000 {
+                        compatible = "renesas,gpio-r8a7791",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055000 0 0x50>;
+                        interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 160 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 907>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 907>;
+                };
 
-        irqc0: interrupt-controller@e61c0000 {
-                compatible = "renesas,irqc-r8a7791", "renesas,irqc";
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                reg = <0 0xe61c0000 0 0x200>;
-                interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 407>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 407>;
-        };
+                gpio6: gpio@e6055400 {
+                        compatible = "renesas,gpio-r8a7791",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055400 0 0x50>;
+                        interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 192 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 905>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 905>;
+                };
 
-        dmac0: dma-controller@e6700000 {
-                compatible = "renesas,dmac-r8a7791", "renesas,rcar-dmac";
-                reg = <0 0xe6700000 0 0x20000>;
-                interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12", "ch13", "ch14";
-                clocks = <&cpg CPG_MOD 219>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 219>;
-                #dma-cells = <1>;
-                dma-channels = <15>;
-        };
+                gpio7: gpio@e6055800 {
+                        compatible = "renesas,gpio-r8a7791",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055800 0 0x50>;
+                        interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 224 26>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 904>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 904>;
+                };
 
-        dmac1: dma-controller@e6720000 {
-                compatible = "renesas,dmac-r8a7791", "renesas,rcar-dmac";
-                reg = <0 0xe6720000 0 0x20000>;
-                interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12", "ch13", "ch14";
-                clocks = <&cpg CPG_MOD 218>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 218>;
-                #dma-cells = <1>;
-                dma-channels = <15>;
-        };
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a7791";
+                        reg = <0 0xe6060000 0 0x250>;
+                };
 
-        audma0: dma-controller@ec700000 {
-                compatible = "renesas,dmac-r8a7791", "renesas,rcar-dmac";
-                reg = <0 0xec700000 0 0x10000>;
-                interrupts =    <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12";
-                clocks = <&cpg CPG_MOD 502>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 502>;
-                #dma-cells = <1>;
-                dma-channels = <13>;
-        };
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a7791-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>, <&usb_extal_clk>;
+                        clock-names = "extal", "usb_extal";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
 
-        audma1: dma-controller@ec720000 {
-                compatible = "renesas,dmac-r8a7791", "renesas,rcar-dmac";
-                reg = <0 0xec720000 0 0x10000>;
-                interrupts =    <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12";
-                clocks = <&cpg CPG_MOD 501>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 501>;
-                #dma-cells = <1>;
-                dma-channels = <13>;
-        };
+                apmu@e6152000 {
+                        compatible = "renesas,r8a7791-apmu", "renesas,apmu";
+                        reg = <0 0xe6152000 0 0x188>;
+                        cpus = <&cpu0 &cpu1>;
+                };
 
-        usb_dmac0: dma-controller@e65a0000 {
-                compatible = "renesas,r8a7791-usb-dmac", "renesas,usb-dmac";
-                reg = <0 0xe65a0000 0 0x100>;
-                interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "ch0", "ch1";
-                clocks = <&cpg CPG_MOD 330>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 330>;
-                #dma-cells = <1>;
-                dma-channels = <2>;
-        };
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a7791-rst";
+                        reg = <0 0xe6160000 0 0x0100>;
+                };
 
-        usb_dmac1: dma-controller@e65b0000 {
-                compatible = "renesas,r8a7791-usb-dmac", "renesas,usb-dmac";
-                reg = <0 0xe65b0000 0 0x100>;
-                interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "ch0", "ch1";
-                clocks = <&cpg CPG_MOD 331>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 331>;
-                #dma-cells = <1>;
-                dma-channels = <2>;
-        };
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a7791-sysc";
+                        reg = <0 0xe6180000 0 0x0200>;
+                        #power-domain-cells = <1>;
+                };
 
-        /* The memory map in the User's Manual maps the cores to bus numbers */
-        i2c0: i2c@e6508000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6508000 0 0x40>;
-                interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 931>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 931>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                irqc0: interrupt-controller@e61c0000 {
+                        compatible = "renesas,irqc-r8a7791", "renesas,irqc";
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0 0xe61c0000 0 0x200>;
+                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 407>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 407>;
+                };
 
-        i2c1: i2c@e6518000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6518000 0 0x40>;
-                interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 930>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 930>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                thermal: thermal@e61f0000 {
+                        compatible = "renesas,thermal-r8a7791",
+                                     "renesas,rcar-gen2-thermal",
+                                     "renesas,rcar-thermal";
+                        reg = <0 0xe61f0000 0 0x10>, <0 0xe61f0100 0 0x38>;
+                        interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 522>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 522>;
+                        #thermal-sensor-cells = <0>;
+                };
 
-        i2c2: i2c@e6530000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6530000 0 0x40>;
-                interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 929>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 929>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                ipmmu_sy0: mmu@e6280000 {
+                        compatible = "renesas,ipmmu-r8a7791",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6280000 0 0x1000>;
+                        interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c3: i2c@e6540000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6540000 0 0x40>;
-                interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 928>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 928>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                ipmmu_sy1: mmu@e6290000 {
+                        compatible = "renesas,ipmmu-r8a7791",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6290000 0 0x1000>;
+                        interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c4: i2c@e6520000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6520000 0 0x40>;
-                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 927>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 927>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                ipmmu_ds: mmu@e6740000 {
+                        compatible = "renesas,ipmmu-r8a7791",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6740000 0 0x1000>;
+                        interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c5: i2c@e6528000 {
-                /* doesn't need pinmux */
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7791", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6528000 0 0x40>;
-                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 925>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 925>;
-                i2c-scl-internal-delay-ns = <110>;
-                status = "disabled";
-        };
+                ipmmu_mp: mmu@ec680000 {
+                        compatible = "renesas,ipmmu-r8a7791",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xec680000 0 0x1000>;
+                        interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c6: i2c@e60b0000 {
-                /* doesn't need pinmux */
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe60b0000 0 0x425>;
-                interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 926>;
-                dmas = <&dmac0 0x77>, <&dmac0 0x78>,
-                       <&dmac1 0x77>, <&dmac1 0x78>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 926>;
-                status = "disabled";
-        };
+                ipmmu_mx: mmu@fe951000 {
+                        compatible = "renesas,ipmmu-r8a7791",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xfe951000 0 0x1000>;
+                        interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c7: i2c@e6500000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6500000 0 0x425>;
-                interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 318>;
-                dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                       <&dmac1 0x61>, <&dmac1 0x62>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 318>;
-                status = "disabled";
-        };
+                ipmmu_rt: mmu@ffc80000 {
+                        compatible = "renesas,ipmmu-r8a7791",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xffc80000 0 0x1000>;
+                        interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c8: i2c@e6510000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7791", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6510000 0 0x425>;
-                interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 323>;
-                dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                       <&dmac1 0x65>, <&dmac1 0x66>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 323>;
-                status = "disabled";
-        };
+                ipmmu_gp: mmu@e62a0000 {
+                        compatible = "renesas,ipmmu-r8a7791",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe62a0000 0 0x1000>;
+                        interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        pfc: pin-controller@e6060000 {
-                compatible = "renesas,pfc-r8a7791";
-                reg = <0 0xe6060000 0 0x250>;
-        };
+                icram0: sram@e63a0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63a0000 0 0x12000>;
+                };
 
-        mmcif0: mmc@ee200000 {
-                compatible = "renesas,mmcif-r8a7791", "renesas,sh-mmcif";
-                reg = <0 0xee200000 0 0x80>;
-                interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 315>;
-                dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                       <&dmac1 0xd1>, <&dmac1 0xd2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 315>;
-                reg-io-width = <4>;
-                status = "disabled";
-                max-frequency = <97500000>;
-        };
+                icram1: sram@e63c0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63c0000 0 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0 0xe63c0000 0x1000>;
 
-        sdhi0: sd@ee100000 {
-                compatible = "renesas,sdhi-r8a7791",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee100000 0 0x328>;
-                interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 314>;
-                dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                       <&dmac1 0xcd>, <&dmac1 0xce>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <195000000>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 314>;
-                status = "disabled";
-        };
+                        smp-sram@0 {
+                                compatible = "renesas,smp-sram";
+                                reg = <0 0x10>;
+                        };
+                };
 
-        sdhi1: sd@ee140000 {
-                compatible = "renesas,sdhi-r8a7791",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee140000 0 0x100>;
-                interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 312>;
-                dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                       <&dmac1 0xc1>, <&dmac1 0xc2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <97500000>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 312>;
-                status = "disabled";
-        };
+                /* The memory map in the User's Manual maps the cores to
+                 * bus numbers
+                 */
+                i2c0: i2c@e6508000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7791",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6508000 0 0x40>;
+                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 931>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 931>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        sdhi2: sd@ee160000 {
-                compatible = "renesas,sdhi-r8a7791",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee160000 0 0x100>;
-                interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 311>;
-                dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                       <&dmac1 0xd3>, <&dmac1 0xd4>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <97500000>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 311>;
-                status = "disabled";
-        };
+                i2c1: i2c@e6518000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7791",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6518000 0 0x40>;
+                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 930>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 930>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scifa0: serial@e6c40000 {
-                compatible = "renesas,scifa-r8a7791",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c40000 0 64>;
-                interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 204>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x21>, <&dmac0 0x22>,
-                       <&dmac1 0x21>, <&dmac1 0x22>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 204>;
-                status = "disabled";
-        };
+                i2c2: i2c@e6530000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7791",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6530000 0 0x40>;
+                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 929>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 929>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scifa1: serial@e6c50000 {
-                compatible = "renesas,scifa-r8a7791",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c50000 0 64>;
-                interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 203>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x25>, <&dmac0 0x26>,
-                       <&dmac1 0x25>, <&dmac1 0x26>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 203>;
-                status = "disabled";
-        };
+                i2c3: i2c@e6540000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7791",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6540000 0 0x40>;
+                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 928>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 928>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scifa2: serial@e6c60000 {
-                compatible = "renesas,scifa-r8a7791",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c60000 0 64>;
-                interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 202>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x27>, <&dmac0 0x28>,
-                       <&dmac1 0x27>, <&dmac1 0x28>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 202>;
-                status = "disabled";
-        };
+                i2c4: i2c@e6520000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7791",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6520000 0 0x40>;
+                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 927>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 927>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scifa3: serial@e6c70000 {
-                compatible = "renesas,scifa-r8a7791",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c70000 0 64>;
-                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1106>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
-                       <&dmac1 0x1b>, <&dmac1 0x1c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 1106>;
-                status = "disabled";
-        };
+                i2c5: i2c@e6528000 {
+                        /* doesn't need pinmux */
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7791",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6528000 0 0x40>;
+                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 925>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 925>;
+                        i2c-scl-internal-delay-ns = <110>;
+                        status = "disabled";
+                };
 
-        scifa4: serial@e6c78000 {
-                compatible = "renesas,scifa-r8a7791",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c78000 0 64>;
-                interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1107>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
-                       <&dmac1 0x1f>, <&dmac1 0x20>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 1107>;
-                status = "disabled";
-        };
+                i2c6: i2c@e60b0000 {
+                        /* doesn't need pinmux */
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7791",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe60b0000 0 0x425>;
+                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 926>;
+                        dmas = <&dmac0 0x77>, <&dmac0 0x78>,
+                               <&dmac1 0x77>, <&dmac1 0x78>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 926>;
+                        status = "disabled";
+                };
 
-        scifa5: serial@e6c80000 {
-                compatible = "renesas,scifa-r8a7791",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c80000 0 64>;
-                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1108>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x23>, <&dmac0 0x24>,
-                       <&dmac1 0x23>, <&dmac1 0x24>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 1108>;
-                status = "disabled";
-        };
+                i2c7: i2c@e6500000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7791",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6500000 0 0x425>;
+                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 318>;
+                        dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                               <&dmac1 0x61>, <&dmac1 0x62>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 318>;
+                        status = "disabled";
+                };
 
-        scifb0: serial@e6c20000 {
-                compatible = "renesas,scifb-r8a7791",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6c20000 0 0x100>;
-                interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 206>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
-                       <&dmac1 0x3d>, <&dmac1 0x3e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 206>;
-                status = "disabled";
-        };
+                i2c8: i2c@e6510000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7791",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6510000 0 0x425>;
+                        interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 323>;
+                        dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                               <&dmac1 0x65>, <&dmac1 0x66>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 323>;
+                        status = "disabled";
+                };
 
-        scifb1: serial@e6c30000 {
-                compatible = "renesas,scifb-r8a7791",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6c30000 0 0x100>;
-                interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 207>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
-                       <&dmac1 0x19>, <&dmac1 0x1a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 207>;
-                status = "disabled";
-        };
+                hsusb: usb@e6590000 {
+                        compatible = "renesas,usbhs-r8a7791",
+                                     "renesas,rcar-gen2-usbhs";
+                        reg = <0 0xe6590000 0 0x100>;
+                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
+                               <&usb_dmac1 0>, <&usb_dmac1 1>;
+                        dma-names = "ch0", "ch1", "ch2", "ch3";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        renesas,buswait = <4>;
+                        phys = <&usb0 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
 
-        scifb2: serial@e6ce0000 {
-                compatible = "renesas,scifb-r8a7791",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6ce0000 0 0x100>;
-                interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 216>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
-                       <&dmac1 0x1d>, <&dmac1 0x1e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 216>;
-                status = "disabled";
-        };
+                usbphy: usb-phy@e6590100 {
+                        compatible = "renesas,usb-phy-r8a7791",
+                                     "renesas,rcar-gen2-usb-phy";
+                        reg = <0 0xe6590100 0 0x100>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        clock-names = "usbhs";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        status = "disabled";
 
-        scif0: serial@e6e60000 {
-                compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e60000 0 64>;
-                interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                       <&dmac1 0x29>, <&dmac1 0x2a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 721>;
-                status = "disabled";
-        };
+                        usb0: usb-channel@0 {
+                                reg = <0>;
+                                #phy-cells = <1>;
+                        };
+                        usb2: usb-channel@2 {
+                                reg = <2>;
+                                #phy-cells = <1>;
+                        };
+                };
 
-        scif1: serial@e6e68000 {
-                compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e68000 0 64>;
-                interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
-                       <&dmac1 0x2d>, <&dmac1 0x2e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 720>;
-                status = "disabled";
-        };
+                usb_dmac0: dma-controller@e65a0000 {
+                        compatible = "renesas,r8a7791-usb-dmac",
+                                     "renesas,usb-dmac";
+                        reg = <0 0xe65a0000 0 0x100>;
+                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1";
+                        clocks = <&cpg CPG_MOD 330>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 330>;
+                        #dma-cells = <1>;
+                        dma-channels = <2>;
+                };
 
-        adc: adc@e6e54000 {
-                compatible = "renesas,r8a7791-gyroadc", "renesas,rcar-gyroadc";
-                reg = <0 0xe6e54000 0 64>;
-                clocks = <&cpg CPG_MOD 901>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 901>;
-                status = "disabled";
-        };
+                usb_dmac1: dma-controller@e65b0000 {
+                        compatible = "renesas,r8a7791-usb-dmac",
+                                     "renesas,usb-dmac";
+                        reg = <0 0xe65b0000 0 0x100>;
+                        interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1";
+                        clocks = <&cpg CPG_MOD 331>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 331>;
+                        #dma-cells = <1>;
+                        dma-channels = <2>;
+                };
 
-        scif2: serial@e6e58000 {
-                compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e58000 0 64>;
-                interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
-                       <&dmac1 0x2b>, <&dmac1 0x2c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 719>;
-                status = "disabled";
-        };
+                dmac0: dma-controller@e6700000 {
+                        compatible = "renesas,dmac-r8a7791",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6700000 0 0x20000>;
+                        interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 219>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 219>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
 
-        scif3: serial@e6ea8000 {
-                compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ea8000 0 64>;
-                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
-                       <&dmac1 0x2f>, <&dmac1 0x30>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 718>;
-                status = "disabled";
-        };
+                dmac1: dma-controller@e6720000 {
+                        compatible = "renesas,dmac-r8a7791",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6720000 0 0x20000>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 218>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 218>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
 
-        scif4: serial@e6ee0000 {
-                compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ee0000 0 64>;
-                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
-                       <&dmac1 0xfb>, <&dmac1 0xfc>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 715>;
-                status = "disabled";
-        };
+                avb: ethernet@e6800000 {
+                        compatible = "renesas,etheravb-r8a7791",
+                                     "renesas,etheravb-rcar-gen2";
+                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 812>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 812>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        scif5: serial@e6ee8000 {
-                compatible = "renesas,scif-r8a7791", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ee8000 0 64>;
-                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
-                       <&dmac1 0xfd>, <&dmac1 0xfe>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 714>;
-                status = "disabled";
-        };
+                qspi: spi@e6b10000 {
+                        compatible = "renesas,qspi-r8a7791", "renesas,qspi";
+                        reg = <0 0xe6b10000 0 0x2c>;
+                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 917>;
+                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                               <&dmac1 0x17>, <&dmac1 0x18>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 917>;
+                        num-cs = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        hscif0: serial@e62c0000 {
-                compatible = "renesas,hscif-r8a7791",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62c0000 0 96>;
-                interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
-                       <&dmac1 0x39>, <&dmac1 0x3a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 717>;
-                status = "disabled";
-        };
+                scifa0: serial@e6c40000 {
+                        compatible = "renesas,scifa-r8a7791",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c40000 0 64>;
+                        interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 204>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x21>, <&dmac0 0x22>,
+                               <&dmac1 0x21>, <&dmac1 0x22>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 204>;
+                        status = "disabled";
+                };
 
-        hscif1: serial@e62c8000 {
-                compatible = "renesas,hscif-r8a7791",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62c8000 0 96>;
-                interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
-                       <&dmac1 0x4d>, <&dmac1 0x4e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 716>;
-                status = "disabled";
-        };
+                scifa1: serial@e6c50000 {
+                        compatible = "renesas,scifa-r8a7791",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c50000 0 64>;
+                        interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 203>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x25>, <&dmac0 0x26>,
+                               <&dmac1 0x25>, <&dmac1 0x26>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 203>;
+                        status = "disabled";
+                };
 
-        hscif2: serial@e62d0000 {
-                compatible = "renesas,hscif-r8a7791",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62d0000 0 96>;
-                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
-                       <&dmac1 0x3b>, <&dmac1 0x3c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 713>;
-                status = "disabled";
-        };
+                scifa2: serial@e6c60000 {
+                        compatible = "renesas,scifa-r8a7791",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c60000 0 64>;
+                        interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 202>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x27>, <&dmac0 0x28>,
+                               <&dmac1 0x27>, <&dmac1 0x28>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 202>;
+                        status = "disabled";
+                };
 
-        icram0: sram@e63a0000 {
-                compatible = "mmio-sram";
-                reg = <0 0xe63a0000 0 0x12000>;
-        };
+                scifa3: serial@e6c70000 {
+                        compatible = "renesas,scifa-r8a7791",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c70000 0 64>;
+                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1106>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
+                               <&dmac1 0x1b>, <&dmac1 0x1c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 1106>;
+                        status = "disabled";
+                };
 
-        icram1: sram@e63c0000 {
-                compatible = "mmio-sram";
-                reg = <0 0xe63c0000 0 0x1000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges = <0 0 0xe63c0000 0x1000>;
+                scifa4: serial@e6c78000 {
+                        compatible = "renesas,scifa-r8a7791",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c78000 0 64>;
+                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1107>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
+                               <&dmac1 0x1f>, <&dmac1 0x20>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 1107>;
+                        status = "disabled";
+                };
 
-                smp-sram@0 {
-                        compatible = "renesas,smp-sram";
-                        reg = <0 0x10>;
+                scifa5: serial@e6c80000 {
+                        compatible = "renesas,scifa-r8a7791",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c80000 0 64>;
+                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1108>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x23>, <&dmac0 0x24>,
+                               <&dmac1 0x23>, <&dmac1 0x24>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 1108>;
+                        status = "disabled";
                 };
-        };
 
-        ether: ethernet@ee700000 {
-                compatible = "renesas,ether-r8a7791",
-                             "renesas,rcar-gen2-ether";
-                reg = <0 0xee700000 0 0x400>;
-                interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 813>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 813>;
-                phy-mode = "rmii";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                scifb0: serial@e6c20000 {
+                        compatible = "renesas,scifb-r8a7791",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6c20000 0 0x100>;
+                        interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 206>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
+                               <&dmac1 0x3d>, <&dmac1 0x3e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 206>;
+                        status = "disabled";
+                };
 
-        avb: ethernet@e6800000 {
-                compatible = "renesas,etheravb-r8a7791",
-                             "renesas,etheravb-rcar-gen2";
-                reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-                interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 812>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 812>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                scifb1: serial@e6c30000 {
+                        compatible = "renesas,scifb-r8a7791",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6c30000 0 0x100>;
+                        interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 207>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
+                               <&dmac1 0x19>, <&dmac1 0x1a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 207>;
+                        status = "disabled";
+                };
 
-        sata0: sata@ee300000 {
-                compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";
-                reg = <0 0xee300000 0 0x2000>;
-                interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 815>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 815>;
-                status = "disabled";
-        };
+                scifb2: serial@e6ce0000 {
+                        compatible = "renesas,scifb-r8a7791",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6ce0000 0 0x100>;
+                        interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 216>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
+                               <&dmac1 0x1d>, <&dmac1 0x1e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 216>;
+                        status = "disabled";
+                };
 
-        sata1: sata@ee500000 {
-                compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata";
-                reg = <0 0xee500000 0 0x2000>;
-                interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 814>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 814>;
-                status = "disabled";
-        };
+                scif0: serial@e6e60000 {
+                        compatible = "renesas,scif-r8a7791",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6e60000 0 64>;
+                        interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                               <&dmac1 0x29>, <&dmac1 0x2a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 721>;
+                        status = "disabled";
+                };
 
-        hsusb: usb@e6590000 {
-                compatible = "renesas,usbhs-r8a7791", "renesas,rcar-gen2-usbhs";
-                reg = <0 0xe6590000 0 0x100>;
-                interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 704>;
-                dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
-                       <&usb_dmac1 0>, <&usb_dmac1 1>;
-                dma-names = "ch0", "ch1", "ch2", "ch3";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 704>;
-                renesas,buswait = <4>;
-                phys = <&usb0 1>;
-                phy-names = "usb";
-                status = "disabled";
-        };
+                scif1: serial@e6e68000 {
+                        compatible = "renesas,scif-r8a7791",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6e68000 0 64>;
+                        interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
+                               <&dmac1 0x2d>, <&dmac1 0x2e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 720>;
+                        status = "disabled";
+                };
 
-        usbphy: usb-phy@e6590100 {
-                compatible = "renesas,usb-phy-r8a7791",
-                             "renesas,rcar-gen2-usb-phy";
-                reg = <0 0xe6590100 0 0x100>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                clocks = <&cpg CPG_MOD 704>;
-                clock-names = "usbhs";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 704>;
-                status = "disabled";
+                scif2: serial@e6e58000 {
+                        compatible = "renesas,scif-r8a7791",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6e58000 0 64>;
+                        interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
+                               <&dmac1 0x2b>, <&dmac1 0x2c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 719>;
+                        status = "disabled";
+                };
 
-                usb0: usb-channel@0 {
-                        reg = <0>;
-                        #phy-cells = <1>;
+                scif3: serial@e6ea8000 {
+                        compatible = "renesas,scif-r8a7791",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ea8000 0 64>;
+                        interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
+                               <&dmac1 0x2f>, <&dmac1 0x30>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 718>;
+                        status = "disabled";
                 };
-                usb2: usb-channel@2 {
-                        reg = <2>;
-                        #phy-cells = <1>;
+
+                scif4: serial@e6ee0000 {
+                        compatible = "renesas,scif-r8a7791",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ee0000 0 64>;
+                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
+                               <&dmac1 0xfb>, <&dmac1 0xfc>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 715>;
+                        status = "disabled";
                 };
-        };
 
-        vin0: video@e6ef0000 {
-                compatible = "renesas,vin-r8a7791", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef0000 0 0x1000>;
-                interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 811>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 811>;
-                status = "disabled";
-        };
+                scif5: serial@e6ee8000 {
+                        compatible = "renesas,scif-r8a7791",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ee8000 0 64>;
+                        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
+                               <&dmac1 0xfd>, <&dmac1 0xfe>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 714>;
+                        status = "disabled";
+                };
 
-        vin1: video@e6ef1000 {
-                compatible = "renesas,vin-r8a7791", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef1000 0 0x1000>;
-                interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 810>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 810>;
-                status = "disabled";
-        };
+                hscif0: serial@e62c0000 {
+                        compatible = "renesas,hscif-r8a7791",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62c0000 0 96>;
+                        interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
+                               <&dmac1 0x39>, <&dmac1 0x3a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 717>;
+                        status = "disabled";
+                };
 
-        vin2: video@e6ef2000 {
-                compatible = "renesas,vin-r8a7791", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef2000 0 0x1000>;
-                interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 809>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 809>;
-                status = "disabled";
-        };
+                hscif1: serial@e62c8000 {
+                        compatible = "renesas,hscif-r8a7791",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62c8000 0 96>;
+                        interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
+                               <&dmac1 0x4d>, <&dmac1 0x4e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 716>;
+                        status = "disabled";
+                };
 
-        vsp@fe928000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe928000 0 0x8000>;
-                interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 131>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 131>;
-        };
+                hscif2: serial@e62d0000 {
+                        compatible = "renesas,hscif-r8a7791",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62d0000 0 96>;
+                        interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7791_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
+                               <&dmac1 0x3b>, <&dmac1 0x3c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 713>;
+                        status = "disabled";
+                };
 
-        vsp@fe930000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe930000 0 0x8000>;
-                interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 128>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 128>;
-        };
+                msiof0: spi@e6e20000 {
+                        compatible = "renesas,msiof-r8a7791",
+                                     "renesas,rcar-gen2-msiof";
+                        reg = <0 0xe6e20000 0 0x0064>;
+                        interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 000>;
+                        dmas = <&dmac0 0x51>, <&dmac0 0x52>,
+                               <&dmac1 0x51>, <&dmac1 0x52>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 0>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        vsp@fe938000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe938000 0 0x8000>;
-                interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 127>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 127>;
-        };
+                msiof1: spi@e6e10000 {
+                        compatible = "renesas,msiof-r8a7791",
+                                     "renesas,rcar-gen2-msiof";
+                        reg = <0 0xe6e10000 0 0x0064>;
+                        interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 208>;
+                        dmas = <&dmac0 0x55>, <&dmac0 0x56>,
+                               <&dmac1 0x55>, <&dmac1 0x56>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 208>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        du: display@feb00000 {
-                compatible = "renesas,du-r8a7791";
-                reg = <0 0xfeb00000 0 0x40000>,
-                      <0 0xfeb90000 0 0x1c>;
-                reg-names = "du", "lvds.0";
-                interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 724>,
-                         <&cpg CPG_MOD 723>,
-                         <&cpg CPG_MOD 726>;
-                clock-names = "du.0", "du.1", "lvds.0";
-                status = "disabled";
-
-                ports {
+                msiof2: spi@e6e00000 {
+                        compatible = "renesas,msiof-r8a7791",
+                                     "renesas,rcar-gen2-msiof";
+                        reg = <0 0xe6e00000 0 0x0064>;
+                        interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 205>;
+                        dmas = <&dmac0 0x41>, <&dmac0 0x42>,
+                               <&dmac1 0x41>, <&dmac1 0x42>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 205>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        status = "disabled";
+                };
 
-                        port@0 {
-                                reg = <0>;
-                                du_out_rgb: endpoint {
-                                };
-                        };
-                        port@1 {
-                                reg = <1>;
-                                du_out_lvds0: endpoint {
-                                };
-                        };
+                adc: adc@e6e54000 {
+                        compatible = "renesas,r8a7791-gyroadc",
+                                     "renesas,rcar-gyroadc";
+                        reg = <0 0xe6e54000 0 64>;
+                        clocks = <&cpg CPG_MOD 901>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 901>;
+                        status = "disabled";
                 };
-        };
 
-        can0: can@e6e80000 {
-                compatible = "renesas,can-r8a7791", "renesas,rcar-gen2-can";
-                reg = <0 0xe6e80000 0 0x1000>;
-                interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7791_CLK_RCAN>,
-                         <&can_clk>;
-                clock-names = "clkp1", "clkp2", "can_clk";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 916>;
-                status = "disabled";
-        };
+                can0: can@e6e80000 {
+                        compatible = "renesas,can-r8a7791",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e80000 0 0x1000>;
+                        interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 916>,
+                                 <&cpg CPG_CORE R8A7791_CLK_RCAN>, <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 916>;
+                        status = "disabled";
+                };
 
-        can1: can@e6e88000 {
-                compatible = "renesas,can-r8a7791", "renesas,rcar-gen2-can";
-                reg = <0 0xe6e88000 0 0x1000>;
-                interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7791_CLK_RCAN>,
-                         <&can_clk>;
-                clock-names = "clkp1", "clkp2", "can_clk";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 915>;
-                status = "disabled";
-        };
+                can1: can@e6e88000 {
+                        compatible = "renesas,can-r8a7791",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e88000 0 0x1000>;
+                        interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 915>,
+                                 <&cpg CPG_CORE R8A7791_CLK_RCAN>, <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 915>;
+                        status = "disabled";
+                };
 
-        jpu: jpeg-codec@fe980000 {
-                compatible = "renesas,jpu-r8a7791", "renesas,rcar-gen2-jpu";
-                reg = <0 0xfe980000 0 0x10300>;
-                interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 106>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 106>;
-        };
+                vin0: video@e6ef0000 {
+                        compatible = "renesas,vin-r8a7791",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef0000 0 0x1000>;
+                        interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 811>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 811>;
+                        status = "disabled";
+                };
 
-        /* External root clock */
-        extal_clk: extal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                vin1: video@e6ef1000 {
+                        compatible = "renesas,vin-r8a7791",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef1000 0 0x1000>;
+                        interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 810>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 810>;
+                        status = "disabled";
+                };
 
-        /*
-         * The external audio clocks are configured as 0 Hz fixed frequency
-         * clocks by default.
-         * Boards that provide audio clocks should override them.
-         */
-        audio_clk_a: audio_clk_a {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-        audio_clk_b: audio_clk_b {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-        audio_clk_c: audio_clk_c {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+                vin2: video@e6ef2000 {
+                        compatible = "renesas,vin-r8a7791",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef2000 0 0x1000>;
+                        interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 809>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 809>;
+                        status = "disabled";
+                };
 
-        /* External PCIe clock - can be overridden by the board */
-        pcie_bus_clk: pcie_bus {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+                rcar_sound: sound@ec500000 {
+                        /*
+                         * #sound-dai-cells is required
+                         *
+                         * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
+                         * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
+                         */
+                        compatible = "renesas,rcar_sound-r8a7791",
+                                     "renesas,rcar_sound-gen2";
+                        reg = <0 0xec500000 0 0x1000>, /* SCU */
+                              <0 0xec5a0000 0 0x100>,  /* ADG */
+                              <0 0xec540000 0 0x1000>, /* SSIU */
+                              <0 0xec541000 0 0x280>,  /* SSI */
+                              <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
+                        reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+                        clocks = <&cpg CPG_MOD 1005>,
+                                 <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
+                                 <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
+                                 <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
+                                 <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
+                                 <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
+                                 <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
+                                 <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
+                                 <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
+                                 <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
+                                 <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
+                                 <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                 <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                 <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
+                                 <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
+                                 <&cpg CPG_CORE R8A7791_CLK_M2>;
+                        clock-names = "ssi-all",
+                                      "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                      "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                      "ssi.1", "ssi.0", "src.9", "src.8",
+                                      "src.7", "src.6", "src.5", "src.4",
+                                      "src.3", "src.2", "src.1", "src.0",
+                                      "ctu.0", "ctu.1",
+                                      "mix.0", "mix.1",
+                                      "dvc.0", "dvc.1",
+                                      "clk_a", "clk_b", "clk_c", "clk_i";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 1005>,
+                                 <&cpg 1006>, <&cpg 1007>,
+                                 <&cpg 1008>, <&cpg 1009>,
+                                 <&cpg 1010>, <&cpg 1011>,
+                                 <&cpg 1012>, <&cpg 1013>,
+                                 <&cpg 1014>, <&cpg 1015>;
+                        reset-names = "ssi-all",
+                                      "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                      "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                      "ssi.1", "ssi.0";
+
+                        status = "disabled";
+
+                        rcar_sound,dvc {
+                                dvc0: dvc-0 {
+                                        dmas = <&audma1 0xbc>;
+                                        dma-names = "tx";
+                                };
+                                dvc1: dvc-1 {
+                                        dmas = <&audma1 0xbe>;
+                                        dma-names = "tx";
+                                };
+                        };
 
-        /* External SCIF clock */
-        scif_clk: scif {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                        rcar_sound,mix {
+                                mix0: mix-0 { };
+                                mix1: mix-1 { };
+                        };
 
-        /* External USB clock - can be overridden by the board */
-        usb_extal_clk: usb_extal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <48000000>;
-        };
+                        rcar_sound,ctu {
+                                ctu00: ctu-0 { };
+                                ctu01: ctu-1 { };
+                                ctu02: ctu-2 { };
+                                ctu03: ctu-3 { };
+                                ctu10: ctu-4 { };
+                                ctu11: ctu-5 { };
+                                ctu12: ctu-6 { };
+                                ctu13: ctu-7 { };
+                        };
 
-        /* External CAN clock */
-        can_clk: can {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                        rcar_sound,src {
+                                src0: src-0 {
+                                        interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x85>, <&audma1 0x9a>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src1: src-1 {
+                                        interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x87>, <&audma1 0x9c>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src2: src-2 {
+                                        interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x89>, <&audma1 0x9e>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src3: src-3 {
+                                        interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src4: src-4 {
+                                        interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src5: src-5 {
+                                        interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src6: src-6 {
+                                        interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x91>, <&audma1 0xb4>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src7: src-7 {
+                                        interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x93>, <&audma1 0xb6>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src8: src-8 {
+                                        interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x95>, <&audma1 0xb8>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src9: src-9 {
+                                        interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x97>, <&audma1 0xba>;
+                                        dma-names = "rx", "tx";
+                                };
+                        };
 
-        cpg: clock-controller@e6150000 {
-                compatible = "renesas,r8a7791-cpg-mssr";
-                reg = <0 0xe6150000 0 0x1000>;
-                clocks = <&extal_clk>, <&usb_extal_clk>;
-                clock-names = "extal", "usb_extal";
-                #clock-cells = <2>;
-                #power-domain-cells = <0>;
-                #reset-cells = <1>;
-        };
+                        rcar_sound,ssi {
+                                ssi0: ssi-0 {
+                                        interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x01>, <&audma1 0x02>,
+                                               <&audma0 0x15>, <&audma1 0x16>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi1: ssi-1 {
+                                         interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x03>, <&audma1 0x04>,
+                                               <&audma0 0x49>, <&audma1 0x4a>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi2: ssi-2 {
+                                        interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x05>, <&audma1 0x06>,
+                                               <&audma0 0x63>, <&audma1 0x64>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi3: ssi-3 {
+                                        interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x07>, <&audma1 0x08>,
+                                               <&audma0 0x6f>, <&audma1 0x70>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi4: ssi-4 {
+                                        interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x09>, <&audma1 0x0a>,
+                                               <&audma0 0x71>, <&audma1 0x72>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi5: ssi-5 {
+                                        interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0b>, <&audma1 0x0c>,
+                                               <&audma0 0x73>, <&audma1 0x74>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi6: ssi-6 {
+                                        interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0d>, <&audma1 0x0e>,
+                                               <&audma0 0x75>, <&audma1 0x76>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi7: ssi-7 {
+                                        interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0f>, <&audma1 0x10>,
+                                               <&audma0 0x79>, <&audma1 0x7a>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi8: ssi-8 {
+                                        interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x11>, <&audma1 0x12>,
+                                               <&audma0 0x7b>, <&audma1 0x7c>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi9: ssi-9 {
+                                        interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x13>, <&audma1 0x14>,
+                                               <&audma0 0x7d>, <&audma1 0x7e>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                        };
+                };
 
-        rst: reset-controller@e6160000 {
-                compatible = "renesas,r8a7791-rst";
-                reg = <0 0xe6160000 0 0x0100>;
-        };
+                audma0: dma-controller@ec700000 {
+                        compatible = "renesas,dmac-r8a7791",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec700000 0 0x10000>;
+                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 502>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 502>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
 
-        prr: chipid@ff000044 {
-                compatible = "renesas,prr";
-                reg = <0 0xff000044 0 4>;
-        };
+                audma1: dma-controller@ec720000 {
+                        compatible = "renesas,dmac-r8a7791",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec720000 0 0x10000>;
+                        interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 501>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 501>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
 
-        sysc: system-controller@e6180000 {
-                compatible = "renesas,r8a7791-sysc";
-                reg = <0 0xe6180000 0 0x0200>;
-                #power-domain-cells = <1>;
-        };
+                xhci: usb@ee000000 {
+                        compatible = "renesas,xhci-r8a7791",
+                                     "renesas,rcar-gen2-xhci";
+                        reg = <0 0xee000000 0 0xc00>;
+                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 328>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 328>;
+                        phys = <&usb2 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
 
-        qspi: spi@e6b10000 {
-                compatible = "renesas,qspi-r8a7791", "renesas,qspi";
-                reg = <0 0xe6b10000 0 0x2c>;
-                interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 917>;
-                dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                       <&dmac1 0x17>, <&dmac1 0x18>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 917>;
-                num-cs = <1>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                pci0: pci@ee090000 {
+                        compatible = "renesas,pci-r8a7791",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee090000 0 0xc00>,
+                              <0 0xee080000 0 0x1100>;
+                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x800 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
 
-        msiof0: spi@e6e20000 {
-                compatible = "renesas,msiof-r8a7791",
-                             "renesas,rcar-gen2-msiof";
-                reg = <0 0xe6e20000 0 0x0064>;
-                interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 000>;
-                dmas = <&dmac0 0x51>, <&dmac0 0x52>,
-                       <&dmac1 0x51>, <&dmac1 0x52>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 0>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                        usb@2,0 {
+                                reg = <0x1000 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
+                };
 
-        msiof1: spi@e6e10000 {
-                compatible = "renesas,msiof-r8a7791",
-                             "renesas,rcar-gen2-msiof";
-                reg = <0 0xe6e10000 0 0x0064>;
-                interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 208>;
-                dmas = <&dmac0 0x55>, <&dmac0 0x56>,
-                       <&dmac1 0x55>, <&dmac1 0x56>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 208>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                pci1: pci@ee0d0000 {
+                        compatible = "renesas,pci-r8a7791",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee0d0000 0 0xc00>,
+                              <0 0xee0c0000 0 0x1100>;
+                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <1 1>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x10800 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
 
-        msiof2: spi@e6e00000 {
-                compatible = "renesas,msiof-r8a7791",
-                             "renesas,rcar-gen2-msiof";
-                reg = <0 0xe6e00000 0 0x0064>;
-                interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 205>;
-                dmas = <&dmac0 0x41>, <&dmac0 0x42>,
-                       <&dmac1 0x41>, <&dmac1 0x42>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 205>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                        usb@2,0 {
+                                reg = <0x11000 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
+                };
 
-        xhci: usb@ee000000 {
-                compatible = "renesas,xhci-r8a7791", "renesas,rcar-gen2-xhci";
-                reg = <0 0xee000000 0 0xc00>;
-                interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 328>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 328>;
-                phys = <&usb2 1>;
-                phy-names = "usb";
-                status = "disabled";
-        };
+                sdhi0: sd@ee100000 {
+                        compatible = "renesas,sdhi-r8a7791",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee100000 0 0x328>;
+                        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 314>;
+                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                               <&dmac1 0xcd>, <&dmac1 0xce>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <195000000>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 314>;
+                        status = "disabled";
+                };
 
-        pci0: pci@ee090000 {
-                compatible = "renesas,pci-r8a7791", "renesas,pci-rcar-gen2";
-                device_type = "pci";
-                reg = <0 0xee090000 0 0xc00>,
-                      <0 0xee080000 0 0x1100>;
-                interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 703>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 703>;
-                status = "disabled";
-
-                bus-range = <0 0>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                #interrupt-cells = <1>;
-                ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
-                interrupt-map-mask = <0xff00 0 0 0x7>;
-                interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-
-                usb@1,0 {
-                        reg = <0x800 0 0 0 0>;
-                        phys = <&usb0 0>;
-                        phy-names = "usb";
+                sdhi1: sd@ee140000 {
+                        compatible = "renesas,sdhi-r8a7791",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee140000 0 0x100>;
+                        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 312>;
+                        dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                               <&dmac1 0xc1>, <&dmac1 0xc2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 312>;
+                        status = "disabled";
                 };
 
-                usb@2,0 {
-                        reg = <0x1000 0 0 0 0>;
-                        phys = <&usb0 0>;
-                        phy-names = "usb";
+                sdhi2: sd@ee160000 {
+                        compatible = "renesas,sdhi-r8a7791",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee160000 0 0x100>;
+                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 311>;
+                        dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                               <&dmac1 0xd3>, <&dmac1 0xd4>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 311>;
+                        status = "disabled";
                 };
-        };
 
-        pci1: pci@ee0d0000 {
-                compatible = "renesas,pci-r8a7791", "renesas,pci-rcar-gen2";
-                device_type = "pci";
-                reg = <0 0xee0d0000 0 0xc00>,
-                      <0 0xee0c0000 0 0x1100>;
-                interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 703>;
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 703>;
-                status = "disabled";
-
-                bus-range = <1 1>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                #interrupt-cells = <1>;
-                ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
-                interrupt-map-mask = <0xff00 0 0 0x7>;
-                interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-
-                usb@1,0 {
-                        reg = <0x10800 0 0 0 0>;
-                        phys = <&usb2 0>;
-                        phy-names = "usb";
+                mmcif0: mmc@ee200000 {
+                        compatible = "renesas,mmcif-r8a7791",
+                                     "renesas,sh-mmcif";
+                        reg = <0 0xee200000 0 0x80>;
+                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 315>;
+                        dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                               <&dmac1 0xd1>, <&dmac1 0xd2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 315>;
+                        reg-io-width = <4>;
+                        status = "disabled";
+                        max-frequency = <97500000>;
                 };
 
-                usb@2,0 {
-                        reg = <0x11000 0 0 0 0>;
-                        phys = <&usb2 0>;
-                        phy-names = "usb";
+                sata0: sata@ee300000 {
+                        compatible = "renesas,sata-r8a7791",
+                                     "renesas,rcar-gen2-sata";
+                        reg = <0 0xee300000 0 0x2000>;
+                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 815>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 815>;
+                        status = "disabled";
                 };
-        };
 
-        pciec: pcie@fe000000 {
-                compatible = "renesas,pcie-r8a7791", "renesas,pcie-rcar-gen2";
-                reg = <0 0xfe000000 0 0x80000>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                bus-range = <0x00 0xff>;
-                device_type = "pci";
-                ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
-                          0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
-                          0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
-                          0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
-                /* Map all possible DDR as inbound ranges */
-                dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
-                              0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
-                interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-                #interrupt-cells = <1>;
-                interrupt-map-mask = <0 0 0 0>;
-                interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
-                clock-names = "pcie", "pcie_bus";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 319>;
-                status = "disabled";
-        };
+                sata1: sata@ee500000 {
+                        compatible = "renesas,sata-r8a7791",
+                                     "renesas,rcar-gen2-sata";
+                        reg = <0 0xee500000 0 0x2000>;
+                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 814>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 814>;
+                        status = "disabled";
+                };
 
-        ipmmu_sy0: mmu@e6280000 {
-                compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6280000 0 0x1000>;
-                interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                ether: ethernet@ee700000 {
+                        compatible = "renesas,ether-r8a7791",
+                                     "renesas,rcar-gen2-ether";
+                        reg = <0 0xee700000 0 0x400>;
+                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 813>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 813>;
+                        phy-mode = "rmii";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        ipmmu_sy1: mmu@e6290000 {
-                compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6290000 0 0x1000>;
-                interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                gic: interrupt-controller@f1001000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        #address-cells = <0>;
+                        interrupt-controller;
+                        reg = <0 0xf1001000 0 0x1000>, <0 0xf1002000 0 0x2000>,
+                              <0 0xf1004000 0 0x2000>, <0 0xf1006000 0 0x2000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 408>;
+                };
 
-        ipmmu_ds: mmu@e6740000 {
-                compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6740000 0 0x1000>;
-                interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                pciec: pcie@fe000000 {
+                        compatible = "renesas,pcie-r8a7791",
+                                     "renesas,pcie-rcar-gen2";
+                        reg = <0 0xfe000000 0 0x80000>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        bus-range = <0x00 0xff>;
+                        device_type = "pci";
+                        ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+                                  0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+                                  0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+                                  0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+                        /* Map all possible DDR as inbound ranges */
+                        dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+                                      0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
+                        interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0 0 0 0 &gic GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 319>, <&pcie_bus_clk>;
+                        clock-names = "pcie", "pcie_bus";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 319>;
+                        status = "disabled";
+                };
 
-        ipmmu_mp: mmu@ec680000 {
-                compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-                reg = <0 0xec680000 0 0x1000>;
-                interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                vsp@fe928000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe928000 0 0x8000>;
+                        interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 131>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 131>;
+                };
 
-        ipmmu_mx: mmu@fe951000 {
-                compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-                reg = <0 0xfe951000 0 0x1000>;
-                interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                vsp@fe930000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe930000 0 0x8000>;
+                        interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 128>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 128>;
+                };
 
-        ipmmu_rt: mmu@ffc80000 {
-                compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-                reg = <0 0xffc80000 0 0x1000>;
-                interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                vsp@fe938000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe938000 0 0x8000>;
+                        interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 127>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 127>;
+                };
 
-        ipmmu_gp: mmu@e62a0000 {
-                compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa";
-                reg = <0 0xe62a0000 0 0x1000>;
-                interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                jpu: jpeg-codec@fe980000 {
+                        compatible = "renesas,jpu-r8a7791",
+                                     "renesas,rcar-gen2-jpu";
+                        reg = <0 0xfe980000 0 0x10300>;
+                        interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 106>;
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 106>;
+                };
 
-        rcar_sound: sound@ec500000 {
-                /*
-                 * #sound-dai-cells is required
-                 *
-                 * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
-                 * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
-                 */
-                compatible =  "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2";
-                reg =   <0 0xec500000 0 0x1000>, /* SCU */
-                        <0 0xec5a0000 0 0x100>,  /* ADG */
-                        <0 0xec540000 0 0x1000>, /* SSIU */
-                        <0 0xec541000 0 0x280>,  /* SSI */
-                        <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-                reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
-
-                clocks = <&cpg CPG_MOD 1005>,
-                         <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-                         <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
-                         <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
-                         <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
-                         <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
-                         <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
-                         <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
-                         <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
-                         <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
-                         <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
-                         <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                         <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                         <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
-                         <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
-                         <&cpg CPG_CORE R8A7791_CLK_M2>;
-                clock-names = "ssi-all",
-                                "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                                "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
-                                "src.9", "src.8", "src.7", "src.6", "src.5",
-                                "src.4", "src.3", "src.2", "src.1", "src.0",
-                                "ctu.0", "ctu.1",
-                                "mix.0", "mix.1",
-                                "dvc.0", "dvc.1",
-                                "clk_a", "clk_b", "clk_c", "clk_i";
-                power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
-                resets = <&cpg 1005>,
-                         <&cpg 1006>, <&cpg 1007>, <&cpg 1008>, <&cpg 1009>,
-                         <&cpg 1010>, <&cpg 1011>, <&cpg 1012>, <&cpg 1013>,
-                         <&cpg 1014>, <&cpg 1015>;
-                reset-names = "ssi-all",
-                              "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                              "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0";
-
-                status = "disabled";
-
-                rcar_sound,dvc {
-                        dvc0: dvc-0 {
-                                dmas = <&audma1 0xbc>;
-                                dma-names = "tx";
-                        };
-                        dvc1: dvc-1 {
-                                dmas = <&audma1 0xbe>;
-                                dma-names = "tx";
+                du: display@feb00000 {
+                        compatible = "renesas,du-r8a7791";
+                        reg = <0 0xfeb00000 0 0x40000>,
+                              <0 0xfeb90000 0 0x1c>;
+                        reg-names = "du", "lvds.0";
+                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 724>,
+                                 <&cpg CPG_MOD 723>,
+                                 <&cpg CPG_MOD 726>;
+                        clock-names = "du.0", "du.1", "lvds.0";
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb: endpoint {
+                                        };
+                                };
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_lvds0: endpoint {
+                                        };
+                                };
                         };
                 };
 
-                rcar_sound,mix {
-                        mix0: mix-0 { };
-                        mix1: mix-1 { };
+                prr: chipid@ff000044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xff000044 0 4>;
                 };
 
-                rcar_sound,ctu {
-                        ctu00: ctu-0 { };
-                        ctu01: ctu-1 { };
-                        ctu02: ctu-2 { };
-                        ctu03: ctu-3 { };
-                        ctu10: ctu-4 { };
-                        ctu11: ctu-5 { };
-                        ctu12: ctu-6 { };
-                        ctu13: ctu-7 { };
+                cmt0: timer@ffca0000 {
+                        compatible = "renesas,r8a7791-cmt0",
+                                     "renesas,rcar-gen2-cmt0";
+                        reg = <0 0xffca0000 0 0x1004>;
+                        interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 124>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 124>;
+
+                        status = "disabled";
                 };
 
-                rcar_sound,src {
-                        src0: src-0 {
-                                interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x85>, <&audma1 0x9a>;
-                                dma-names = "rx", "tx";
-                        };
-                        src1: src-1 {
-                                interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x87>, <&audma1 0x9c>;
-                                dma-names = "rx", "tx";
-                        };
-                        src2: src-2 {
-                                interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x89>, <&audma1 0x9e>;
-                                dma-names = "rx", "tx";
-                        };
-                        src3: src-3 {
-                                interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8b>, <&audma1 0xa0>;
-                                dma-names = "rx", "tx";
-                        };
-                        src4: src-4 {
-                                interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8d>, <&audma1 0xb0>;
-                                dma-names = "rx", "tx";
-                        };
-                        src5: src-5 {
-                                interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8f>, <&audma1 0xb2>;
-                                dma-names = "rx", "tx";
-                        };
-                        src6: src-6 {
-                                interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x91>, <&audma1 0xb4>;
-                                dma-names = "rx", "tx";
-                        };
-                        src7: src-7 {
-                                interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x93>, <&audma1 0xb6>;
-                                dma-names = "rx", "tx";
-                        };
-                        src8: src-8 {
-                                interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x95>, <&audma1 0xb8>;
-                                dma-names = "rx", "tx";
-                        };
-                        src9: src-9 {
-                                interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x97>, <&audma1 0xba>;
-                                dma-names = "rx", "tx";
-                        };
+                cmt1: timer@e6130000 {
+                        compatible = "renesas,r8a7791-cmt1",
+                                     "renesas,rcar-gen2-cmt1";
+                        reg = <0 0xe6130000 0 0x1004>;
+                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 329>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
+                        resets = <&cpg 329>;
+
+                        status = "disabled";
                 };
+        };
 
-                rcar_sound,ssi {
-                        ssi0: ssi-0 {
-                                interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi1: ssi-1 {
-                                 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi2: ssi-2 {
-                                interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi3: ssi-3 {
-                                interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi4: ssi-4 {
-                                interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi5: ssi-5 {
-                                interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi6: ssi-6 {
-                                interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi7: ssi-7 {
-                                interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi8: ssi-8 {
-                                interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-                                dma-names = "rx", "tx", "rxu", "txu";
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <0>;
+                        polling-delay = <0>;
+
+                        thermal-sensors = <&thermal>;
+
+                        trips {
+                                cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <0>;
+                                        type = "critical";
+                                };
                         };
-                        ssi9: ssi-9 {
-                                interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-                                dma-names = "rx", "tx", "rxu", "txu";
+                        cooling-maps {
                         };
                 };
         };
+
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+        };
+
+        /* External USB clock - can be overridden by the board */
+        usb_extal_clk: usb_extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <48000000>;
+        };
 };
diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
index 3be15a158bad..268987ff0201 100644
--- a/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@ -101,63 +101,6 @@
                 #size-cells = <2>;
                 ranges;
 
-                apmu@e6152000 {
-                        compatible = "renesas,r8a7792-apmu", "renesas,apmu";
-                        reg = <0 0xe6152000 0 0x188>;
-                        cpus = <&cpu0 &cpu1>;
-                };
-
-                gic: interrupt-controller@f1001000 {
-                        compatible = "arm,gic-400";
-                        #interrupt-cells = <3>;
-                        interrupt-controller;
-                        reg = <0 0xf1001000 0 0x1000>,
-                              <0 0xf1002000 0 0x2000>,
-                              <0 0xf1004000 0 0x2000>,
-                              <0 0xf1006000 0 0x2000>;
-                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
-                                      IRQ_TYPE_LEVEL_HIGH)>;
-                        clocks = <&cpg CPG_MOD 408>;
-                        clock-names = "clk";
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 408>;
-                };
-
-                irqc: interrupt-controller@e61c0000 {
-                        compatible = "renesas,irqc-r8a7792", "renesas,irqc";
-                        #interrupt-cells = <2>;
-                        interrupt-controller;
-                        reg = <0 0xe61c0000 0 0x200>;
-                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 407>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 407>;
-                };
-
-                rst: reset-controller@e6160000 {
-                        compatible = "renesas,r8a7792-rst";
-                        reg = <0 0xe6160000 0 0x0100>;
-                };
-
-                prr: chipid@ff000044 {
-                        compatible = "renesas,prr";
-                        reg = <0 0xff000044 0 4>;
-                };
-
-                sysc: system-controller@e6180000 {
-                        compatible = "renesas,r8a7792-sysc";
-                        reg = <0 0xe6180000 0 0x0200>;
-                        #power-domain-cells = <1>;
-                };
-
-                pfc: pin-controller@e6060000 {
-                        compatible = "renesas,pfc-r8a7792";
-                        reg = <0 0xe6060000 0 0x144>;
-                };
-
                 gpio0: gpio@e6050000 {
                         compatible = "renesas,gpio-r8a7792",
                                      "renesas,rcar-gen2-gpio";
@@ -338,6 +281,155 @@
                         resets = <&cpg 913>;
                 };
 
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a7792";
+                        reg = <0 0xe6060000 0 0x144>;
+                };
+
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a7792-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>;
+                        clock-names = "extal";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
+
+                apmu@e6152000 {
+                        compatible = "renesas,r8a7792-apmu", "renesas,apmu";
+                        reg = <0 0xe6152000 0 0x188>;
+                        cpus = <&cpu0 &cpu1>;
+                };
+
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a7792-rst";
+                        reg = <0 0xe6160000 0 0x0100>;
+                };
+
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a7792-sysc";
+                        reg = <0 0xe6180000 0 0x0200>;
+                        #power-domain-cells = <1>;
+                };
+
+                irqc: interrupt-controller@e61c0000 {
+                        compatible = "renesas,irqc-r8a7792", "renesas,irqc";
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0 0xe61c0000 0 0x200>;
+                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 407>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 407>;
+                };
+
+                icram0: sram@e63a0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63a0000 0 0x12000>;
+                };
+
+                icram1: sram@e63c0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63c0000 0 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0 0xe63c0000 0x1000>;
+
+                        smp-sram@0 {
+                                compatible = "renesas,smp-sram";
+                                reg = <0 0x10>;
+                        };
+                };
+
+                /* I2C doesn't need pinmux */
+                i2c0: i2c@e6508000 {
+                        compatible = "renesas,i2c-r8a7792",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6508000 0 0x40>;
+                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 931>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 931>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c1: i2c@e6518000 {
+                        compatible = "renesas,i2c-r8a7792",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6518000 0 0x40>;
+                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 930>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 930>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c2: i2c@e6530000 {
+                        compatible = "renesas,i2c-r8a7792",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6530000 0 0x40>;
+                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 929>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 929>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c3: i2c@e6540000 {
+                        compatible = "renesas,i2c-r8a7792",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6540000 0 0x40>;
+                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 928>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 928>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c4: i2c@e6520000 {
+                        compatible = "renesas,i2c-r8a7792",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6520000 0 0x40>;
+                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 927>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 927>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c5: i2c@e6528000 {
+                        compatible = "renesas,i2c-r8a7792",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6528000 0 0x40>;
+                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 925>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 925>;
+                        i2c-scl-internal-delay-ns = <110>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
                 dmac0: dma-controller@e6700000 {
                         compatible = "renesas,dmac-r8a7792",
                                      "renesas,rcar-dmac";
@@ -404,6 +496,35 @@
                         dma-channels = <15>;
                 };
 
+                avb: ethernet@e6800000 {
+                        compatible = "renesas,etheravb-r8a7792",
+                                     "renesas,etheravb-rcar-gen2";
+                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 812>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 812>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                qspi: spi@e6b10000 {
+                        compatible = "renesas,qspi-r8a7792", "renesas,qspi";
+                        reg = <0 0xe6b10000 0 0x2c>;
+                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 917>;
+                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                               <&dmac1 0x17>, <&dmac1 0x18>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 917>;
+                        num-cs = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
                 scif0: serial@e6e60000 {
                         compatible = "renesas,scif-r8a7792",
                                      "renesas,rcar-gen2-scif", "renesas,scif";
@@ -500,162 +621,6 @@
                         status = "disabled";
                 };
 
-                icram0: sram@e63a0000 {
-                        compatible = "mmio-sram";
-                        reg = <0 0xe63a0000 0 0x12000>;
-                };
-
-                icram1: sram@e63c0000 {
-                        compatible = "mmio-sram";
-                        reg = <0 0xe63c0000 0 0x1000>;
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges = <0 0 0xe63c0000 0x1000>;
-
-                        smp-sram@0 {
-                                compatible = "renesas,smp-sram";
-                                reg = <0 0x10>;
-                        };
-                };
-
-                sdhi0: sd@ee100000 {
-                        compatible = "renesas,sdhi-r8a7792",
-                                     "renesas,rcar-gen2-sdhi";
-                        reg = <0 0xee100000 0 0x328>;
-                        interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
-                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                               <&dmac1 0xcd>, <&dmac1 0xce>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        clocks = <&cpg CPG_MOD 314>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 314>;
-                        status = "disabled";
-                };
-
-                jpu: jpeg-codec@fe980000 {
-                        compatible = "renesas,jpu-r8a7792",
-                                     "renesas,rcar-gen2-jpu";
-                        reg = <0 0xfe980000 0 0x10300>;
-                        interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 106>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 106>;
-                };
-
-                avb: ethernet@e6800000 {
-                        compatible = "renesas,etheravb-r8a7792",
-                                     "renesas,etheravb-rcar-gen2";
-                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 812>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 812>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                /* I2C doesn't need pinmux */
-                i2c0: i2c@e6508000 {
-                        compatible = "renesas,i2c-r8a7792",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6508000 0 0x40>;
-                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 931>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 931>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                i2c1: i2c@e6518000 {
-                        compatible = "renesas,i2c-r8a7792",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6518000 0 0x40>;
-                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 930>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 930>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                i2c2: i2c@e6530000 {
-                        compatible = "renesas,i2c-r8a7792",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6530000 0 0x40>;
-                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 929>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 929>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                i2c3: i2c@e6540000 {
-                        compatible = "renesas,i2c-r8a7792",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6540000 0 0x40>;
-                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 928>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 928>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                i2c4: i2c@e6520000 {
-                        compatible = "renesas,i2c-r8a7792",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6520000 0 0x40>;
-                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 927>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 927>;
-                        i2c-scl-internal-delay-ns = <6>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                i2c5: i2c@e6528000 {
-                        compatible = "renesas,i2c-r8a7792",
-                                     "renesas,rcar-gen2-i2c";
-                        reg = <0 0xe6528000 0 0x40>;
-                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 925>;
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 925>;
-                        i2c-scl-internal-delay-ns = <110>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
-                qspi: spi@e6b10000 {
-                        compatible = "renesas,qspi-r8a7792", "renesas,qspi";
-                        reg = <0 0xe6b10000 0 0x2c>;
-                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 917>;
-                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                               <&dmac1 0x17>, <&dmac1 0x18>;
-                        dma-names = "tx", "rx", "tx", "rx";
-                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
-                        resets = <&cpg 917>;
-                        num-cs = <1>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        status = "disabled";
-                };
-
                 msiof0: spi@e6e20000 {
                         compatible = "renesas,msiof-r8a7792",
                                      "renesas,rcar-gen2-msiof";
@@ -688,34 +653,6 @@
                         status = "disabled";
                 };
 
-                du: display@feb00000 {
-                        compatible = "renesas,du-r8a7792";
-                        reg = <0 0xfeb00000 0 0x40000>;
-                        reg-names = "du";
-                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&cpg CPG_MOD 724>,
-                                 <&cpg CPG_MOD 723>;
-                        clock-names = "du.0", "du.1";
-                        status = "disabled";
-
-                        ports {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-
-                                port@0 {
-                                        reg = <0>;
-                                        du_out_rgb0: endpoint {
-                                        };
-                                };
-                                port@1 {
-                                        reg = <1>;
-                                        du_out_rgb1: endpoint {
-                                        };
-                                };
-                        };
-                };
-
                 can0: can@e6e80000 {
                         compatible = "renesas,can-r8a7792",
                                      "renesas,rcar-gen2-can";
@@ -808,6 +745,36 @@
                         status = "disabled";
                 };
 
+                sdhi0: sd@ee100000 {
+                        compatible = "renesas,sdhi-r8a7792",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee100000 0 0x328>;
+                        interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
+                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                               <&dmac1 0xcd>, <&dmac1 0xce>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        clocks = <&cpg CPG_MOD 314>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 314>;
+                        status = "disabled";
+                };
+
+                gic: interrupt-controller@f1001000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        interrupt-controller;
+                        reg = <0 0xf1001000 0 0x1000>,
+                              <0 0xf1002000 0 0x2000>,
+                              <0 0xf1004000 0 0x2000>,
+                              <0 0xf1006000 0 0x2000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) |
+                                      IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 408>;
+                };
+
                 vsp@fe928000 {
                         compatible = "renesas,vsp1";
                         reg = <0 0xfe928000 0 0x8000>;
@@ -835,14 +802,47 @@
                         resets = <&cpg 127>;
                 };
 
-                cpg: clock-controller@e6150000 {
-                        compatible = "renesas,r8a7792-cpg-mssr";
-                        reg = <0 0xe6150000 0 0x1000>;
-                        clocks = <&extal_clk>;
-                        clock-names = "extal";
-                        #clock-cells = <2>;
-                        #power-domain-cells = <0>;
-                        #reset-cells = <1>;
+                jpu: jpeg-codec@fe980000 {
+                        compatible = "renesas,jpu-r8a7792",
+                                     "renesas,rcar-gen2-jpu";
+                        reg = <0 0xfe980000 0 0x10300>;
+                        interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 106>;
+                        power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+                        resets = <&cpg 106>;
+                };
+
+                du: display@feb00000 {
+                        compatible = "renesas,du-r8a7792";
+                        reg = <0 0xfeb00000 0 0x40000>;
+                        reg-names = "du";
+                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 724>,
+                                 <&cpg CPG_MOD 723>;
+                        clock-names = "du.0", "du.1";
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb0: endpoint {
+                                        };
+                                };
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_rgb1: endpoint {
+                                        };
+                                };
+                        };
+                };
+
+                prr: chipid@ff000044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xff000044 0 4>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index 51b3ffac8efa..9ed6961f2d9a 100644
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -48,6 +48,10 @@
         aliases {
                 serial0 = &scif0;
                 serial1 = &scif1;
+                i2c9 = &gpioi2c2;
+                i2c10 = &gpioi2c4;
+                i2c11 = &i2chdmi;
+                i2c12 = &i2cexio4;
         };
 
         chosen {
@@ -296,6 +300,146 @@
                 #clock-cells = <0>;
                 clock-frequency = <148500000>;
         };
+
+        gpioi2c2: i2c-9 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "i2c-gpio";
+                status = "disabled";
+                scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                i2c-gpio,delay-us = <5>;
+        };
+
+        gpioi2c4: i2c-10 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "i2c-gpio";
+                status = "disabled";
+                scl-gpios = <&gpio7 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio7 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                i2c-gpio,delay-us = <5>;
+        };
+
+        /*
+         * A fallback to GPIO is provided for I2C2.
+         */
+        i2chdmi: i2c-11 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&i2c2>, <&gpioi2c2>;
+                i2c-bus-name = "i2c-hdmi";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ak4643: codec@12 {
+                        compatible = "asahi-kasei,ak4643";
+                        #sound-dai-cells = <0>;
+                        reg = <0x12>;
+                };
+
+                composite-in@20 {
+                        compatible = "adi,adv7180cp";
+                        reg = <0x20>;
+                        remote = <&vin1>;
+
+                        port {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7180_in: endpoint {
+                                                remote-endpoint = <&composite_con_in>;
+                                        };
+                                };
+
+                                port@3 {
+                                        reg = <3>;
+                                        adv7180_out: endpoint {
+                                                bus-width = <8>;
+                                                remote-endpoint = <&vin1ep>;
+                                        };
+                                };
+                        };
+                };
+
+                hdmi@39 {
+                        compatible = "adi,adv7511w";
+                        reg = <0x39>;
+                        interrupt-parent = <&gpio3>;
+                        interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+
+                        adi,input-depth = <8>;
+                        adi,input-colorspace = "rgb";
+                        adi,input-clock = "1x";
+                        adi,input-style = <1>;
+                        adi,input-justification = "evenly";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7511_in: endpoint {
+                                                remote-endpoint = <&du_out_rgb>;
+                                        };
+                                };
+
+                                port@1 {
+                                        reg = <1>;
+                                        adv7511_out: endpoint {
+                                                remote-endpoint = <&hdmi_con_out>;
+                                        };
+                                };
+                        };
+                };
+
+                hdmi-in@4c {
+                        compatible = "adi,adv7612";
+                        reg = <0x4c>;
+                        interrupt-parent = <&gpio4>;
+                        interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+                        default-input = <0>;
+
+                        port {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7612_in: endpoint {
+                                                remote-endpoint = <&hdmi_con_in>;
+                                        };
+                                };
+
+                                port@2 {
+                                        reg = <2>;
+                                        adv7612_out: endpoint {
+                                                remote-endpoint = <&vin0ep2>;
+                                        };
+                                };
+                        };
+                };
+
+                eeprom@50 {
+                        compatible = "renesas,r1ex24002", "atmel,24c02";
+                        reg = <0x50>;
+                        pagesize = <16>;
+                };
+        };
+
+        /*
+         * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
+         * A fallback to GPIO is provided.
+         */
+        i2cexio4: i2c-12 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&i2c4>, <&gpioi2c4>;
+                i2c-bus-name = "i2c-exio4";
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
 };
 
 &du {
@@ -334,6 +478,11 @@
                 function = "i2c2";
         };
 
+        i2c4_pins: i2c4 {
+                groups = "i2c4_c";
+                function = "i2c4";
+        };
+
         du_pins: du {
                 groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
                 function = "du";
@@ -544,107 +693,11 @@
 
 &i2c2 {
         pinctrl-0 = <&i2c2_pins>;
-        pinctrl-names = "default";
+        pinctrl-names = "i2c-hdmi";
 
         status = "okay";
         clock-frequency = <100000>;
 
-        ak4643: codec@12 {
-                compatible = "asahi-kasei,ak4643";
-                #sound-dai-cells = <0>;
-                reg = <0x12>;
-        };
-
-        composite-in@20 {
-                compatible = "adi,adv7180cp";
-                reg = <0x20>;
-                remote = <&vin1>;
-
-                port {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        port@0 {
-                                reg = <0>;
-                                adv7180_in: endpoint {
-                                        remote-endpoint = <&composite_con_in>;
-                                };
-                        };
-
-                        port@3 {
-                                reg = <3>;
-                                adv7180_out: endpoint {
-                                        bus-width = <8>;
-                                        remote-endpoint = <&vin1ep>;
-                                };
-                        };
-                };
-        };
-
-        hdmi@39 {
-                compatible = "adi,adv7511w";
-                reg = <0x39>;
-                interrupt-parent = <&gpio3>;
-                interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-
-                adi,input-depth = <8>;
-                adi,input-colorspace = "rgb";
-                adi,input-clock = "1x";
-                adi,input-style = <1>;
-                adi,input-justification = "evenly";
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        port@0 {
-                                reg = <0>;
-                                adv7511_in: endpoint {
-                                        remote-endpoint = <&du_out_rgb>;
-                                };
-                        };
-
-                        port@1 {
-                                reg = <1>;
-                                adv7511_out: endpoint {
-                                        remote-endpoint = <&hdmi_con_out>;
-                                };
-                        };
-                };
-        };
-
-        hdmi-in@4c {
-                compatible = "adi,adv7612";
-                reg = <0x4c>;
-                interrupt-parent = <&gpio4>;
-                interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
-                default-input = <0>;
-
-                port {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        port@0 {
-                                reg = <0>;
-                                adv7612_in: endpoint {
-                                        remote-endpoint = <&hdmi_con_in>;
-                                };
-                        };
-
-                        port@2 {
-                                reg = <2>;
-                                adv7612_out: endpoint {
-                                        remote-endpoint = <&vin0ep2>;
-                                };
-                        };
-                };
-        };
-
-        eeprom@50 {
-                compatible = "renesas,r1ex24002", "atmel,24c02";
-                reg = <0x50>;
-                pagesize = <16>;
-        };
 };
 
 &i2c6 {
@@ -668,6 +721,11 @@
         };
 };
 
+&i2c4 {
+        pinctrl-0 = <&i2c4_pins>;
+        pinctrl-names = "i2c-exio4";
+};
+
 &rcar_sound {
         pinctrl-0 = <&sound_pins &sound_clk_pins>;
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index 039b22517526..f9c5a557107d 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -15,7 +15,6 @@
 
 / {
         compatible = "renesas,r8a7793";
-        interrupt-parent = <&gic>;
         #address-cells = <2>;
         #size-cells = <2>;
 
@@ -32,6 +31,35 @@
                 spi0 = &qspi;
         };
 
+        /*
+         * The external audio clocks are configured as 0 Hz fixed frequency
+         * clocks by default.
+         * Boards that provide audio clocks should override them.
+         */
+        audio_clk_a: audio_clk_a {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+        audio_clk_b: audio_clk_b {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+        audio_clk_c: audio_clk_c {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        /* External CAN clock */
+        can_clk: can {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -74,1261 +102,1295 @@
                 };
         };
 
-        apmu@e6152000 {
-                compatible = "renesas,r8a7793-apmu", "renesas,apmu";
-                reg = <0 0xe6152000 0 0x188>;
-                cpus = <&cpu0 &cpu1>;
+        /* External root clock */
+        extal_clk: extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
         };
 
-        thermal-zones {
-                cpu_thermal: cpu-thermal {
-                        polling-delay-passive   = <0>;
-                        polling-delay           = <0>;
+        /* External SCIF clock */
+        scif_clk: scif {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
+        };
 
-                        thermal-sensors = <&thermal>;
+        soc {
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
+
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                gpio0: gpio@e6050000 {
+                        compatible = "renesas,gpio-r8a7793",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6050000 0 0x50>;
+                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 0 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 912>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 912>;
+                };
 
-                        trips {
-                                cpu-crit {
-                                        temperature     = <95000>;
-                                        hysteresis      = <0>;
-                                        type            = "critical";
-                                };
-                        };
-                        cooling-maps {
-                        };
+                gpio1: gpio@e6051000 {
+                        compatible = "renesas,gpio-r8a7793",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6051000 0 0x50>;
+                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 32 26>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 911>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 911>;
                 };
-        };
 
-        gic: interrupt-controller@f1001000 {
-                compatible = "arm,gic-400";
-                #interrupt-cells = <3>;
-                #address-cells = <0>;
-                interrupt-controller;
-                reg = <0 0xf1001000 0 0x1000>,
-                        <0 0xf1002000 0 0x2000>,
-                        <0 0xf1004000 0 0x2000>,
-                        <0 0xf1006000 0 0x2000>;
-                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
-                clocks = <&cpg CPG_MOD 408>;
-                clock-names = "clk";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 408>;
-        };
+                gpio2: gpio@e6052000 {
+                        compatible = "renesas,gpio-r8a7793",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6052000 0 0x50>;
+                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 64 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 910>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 910>;
+                };
 
-        gpio0: gpio@e6050000 {
-                compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6050000 0 0x50>;
-                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 0 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 912>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 912>;
-        };
+                gpio3: gpio@e6053000 {
+                        compatible = "renesas,gpio-r8a7793",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6053000 0 0x50>;
+                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 96 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 909>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 909>;
+                };
 
-        gpio1: gpio@e6051000 {
-                compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6051000 0 0x50>;
-                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 32 26>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 911>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 911>;
-        };
+                gpio4: gpio@e6054000 {
+                        compatible = "renesas,gpio-r8a7793",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6054000 0 0x50>;
+                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 128 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 908>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 908>;
+                };
 
-        gpio2: gpio@e6052000 {
-                compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6052000 0 0x50>;
-                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 64 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 910>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 910>;
-        };
+                gpio5: gpio@e6055000 {
+                        compatible = "renesas,gpio-r8a7793",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055000 0 0x50>;
+                        interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 160 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 907>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 907>;
+                };
 
-        gpio3: gpio@e6053000 {
-                compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6053000 0 0x50>;
-                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 96 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 909>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 909>;
-        };
+                gpio6: gpio@e6055400 {
+                        compatible = "renesas,gpio-r8a7793",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055400 0 0x50>;
+                        interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 192 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 905>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 905>;
+                };
 
-        gpio4: gpio@e6054000 {
-                compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6054000 0 0x50>;
-                interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 128 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 908>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 908>;
-        };
+                gpio7: gpio@e6055800 {
+                        compatible = "renesas,gpio-r8a7793",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055800 0 0x50>;
+                        interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 224 26>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 904>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 904>;
+                };
 
-        gpio5: gpio@e6055000 {
-                compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055000 0 0x50>;
-                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 160 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 907>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 907>;
-        };
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a7793";
+                        reg = <0 0xe6060000 0 0x250>;
+                };
 
-        gpio6: gpio@e6055400 {
-                compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055400 0 0x50>;
-                interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 192 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 905>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 905>;
-        };
+                /* Special CPG clocks */
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a7793-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>, <&usb_extal_clk>;
+                        clock-names = "extal", "usb_extal";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
 
-        gpio7: gpio@e6055800 {
-                compatible = "renesas,gpio-r8a7793", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055800 0 0x50>;
-                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 224 26>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 904>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 904>;
-        };
+                apmu@e6152000 {
+                        compatible = "renesas,r8a7793-apmu", "renesas,apmu";
+                        reg = <0 0xe6152000 0 0x188>;
+                        cpus = <&cpu0 &cpu1>;
+                };
 
-        thermal: thermal@e61f0000 {
-                compatible =    "renesas,thermal-r8a7793",
-                                "renesas,rcar-gen2-thermal",
-                                "renesas,rcar-thermal";
-                reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>;
-                interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 522>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 522>;
-                #thermal-sensor-cells = <0>;
-        };
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a7793-rst";
+                        reg = <0 0xe6160000 0 0x0100>;
+                };
 
-        timer {
-                compatible = "arm,armv7-timer";
-                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
-        };
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a7793-sysc";
+                        reg = <0 0xe6180000 0 0x0200>;
+                        #power-domain-cells = <1>;
+                };
 
-        cmt0: timer@ffca0000 {
-                compatible = "renesas,r8a7793-cmt0", "renesas,rcar-gen2-cmt0";
-                reg = <0 0xffca0000 0 0x1004>;
-                interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 124>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 124>;
-
-                status = "disabled";
-        };
+                irqc0: interrupt-controller@e61c0000 {
+                        compatible = "renesas,irqc-r8a7793", "renesas,irqc";
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0 0xe61c0000 0 0x200>;
+                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 407>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 407>;
+                };
 
-        cmt1: timer@e6130000 {
-                compatible = "renesas,r8a7793-cmt1", "renesas,rcar-gen2-cmt1";
-                reg = <0 0xe6130000 0 0x1004>;
-                interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 329>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 329>;
-
-                status = "disabled";
-        };
+                thermal: thermal@e61f0000 {
+                        compatible = "renesas,thermal-r8a7793",
+                                     "renesas,rcar-gen2-thermal",
+                                     "renesas,rcar-thermal";
+                        reg = <0 0xe61f0000 0 0x10>, <0 0xe61f0100 0 0x38>;
+                        interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 522>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 522>;
+                        #thermal-sensor-cells = <0>;
+                };
 
-        irqc0: interrupt-controller@e61c0000 {
-                compatible = "renesas,irqc-r8a7793", "renesas,irqc";
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                reg = <0 0xe61c0000 0 0x200>;
-                interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 407>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 407>;
-        };
+                ipmmu_sy0: mmu@e6280000 {
+                        compatible = "renesas,ipmmu-r8a7793",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6280000 0 0x1000>;
+                        interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        dmac0: dma-controller@e6700000 {
-                compatible = "renesas,dmac-r8a7793", "renesas,rcar-dmac";
-                reg = <0 0xe6700000 0 0x20000>;
-                interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12", "ch13", "ch14";
-                clocks = <&cpg CPG_MOD 219>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 219>;
-                #dma-cells = <1>;
-                dma-channels = <15>;
-        };
+                ipmmu_sy1: mmu@e6290000 {
+                        compatible = "renesas,ipmmu-r8a7793",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6290000 0 0x1000>;
+                        interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        dmac1: dma-controller@e6720000 {
-                compatible = "renesas,dmac-r8a7793", "renesas,rcar-dmac";
-                reg = <0 0xe6720000 0 0x20000>;
-                interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12", "ch13", "ch14";
-                clocks = <&cpg CPG_MOD 218>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 218>;
-                #dma-cells = <1>;
-                dma-channels = <15>;
-        };
+                ipmmu_ds: mmu@e6740000 {
+                        compatible = "renesas,ipmmu-r8a7793",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6740000 0 0x1000>;
+                        interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        audma0: dma-controller@ec700000 {
-                compatible = "renesas,dmac-r8a7793", "renesas,rcar-dmac";
-                reg = <0 0xec700000 0 0x10000>;
-                interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12";
-                clocks = <&cpg CPG_MOD 502>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 502>;
-                #dma-cells = <1>;
-                dma-channels = <13>;
-        };
+                ipmmu_mp: mmu@ec680000 {
+                        compatible = "renesas,ipmmu-r8a7793",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xec680000 0 0x1000>;
+                        interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        audma1: dma-controller@ec720000 {
-                compatible = "renesas,dmac-r8a7793", "renesas,rcar-dmac";
-                reg = <0 0xec720000 0 0x10000>;
-                interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12";
-                clocks = <&cpg CPG_MOD 501>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 501>;
-                #dma-cells = <1>;
-                dma-channels = <13>;
-        };
+                ipmmu_mx: mmu@fe951000 {
+                        compatible = "renesas,ipmmu-r8a7793",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xfe951000 0 0x1000>;
+                        interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        /* The memory map in the User's Manual maps the cores to bus numbers */
-        i2c0: i2c@e6508000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6508000 0 0x40>;
-                interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 931>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 931>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                ipmmu_rt: mmu@ffc80000 {
+                        compatible = "renesas,ipmmu-r8a7793",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xffc80000 0 0x1000>;
+                        interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c1: i2c@e6518000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6518000 0 0x40>;
-                interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 930>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 930>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                ipmmu_gp: mmu@e62a0000 {
+                        compatible = "renesas,ipmmu-r8a7793",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe62a0000 0 0x1000>;
+                        interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        i2c2: i2c@e6530000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6530000 0 0x40>;
-                interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 929>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 929>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                icram0: sram@e63a0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63a0000 0 0x12000>;
+                };
 
-        i2c3: i2c@e6540000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6540000 0 0x40>;
-                interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 928>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 928>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                icram1: sram@e63c0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63c0000 0 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0 0xe63c0000 0x1000>;
 
-        i2c4: i2c@e6520000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6520000 0 0x40>;
-                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 927>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 927>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                        smp-sram@0 {
+                                compatible = "renesas,smp-sram";
+                                reg = <0 0x10>;
+                        };
+                };
 
-        i2c5: i2c@e6528000 {
-                /* doesn't need pinmux */
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,i2c-r8a7793", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6528000 0 0x40>;
-                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 925>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 925>;
-                i2c-scl-internal-delay-ns = <110>;
-                status = "disabled";
-        };
+                /* The memory map in the User's Manual maps the cores to
+                 * bus numbers
+                 */
+                i2c0: i2c@e6508000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7793",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6508000 0 0x40>;
+                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 931>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 931>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        i2c6: i2c@e60b0000 {
-                /* doesn't need pinmux */
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe60b0000 0 0x425>;
-                interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 926>;
-                dmas = <&dmac0 0x77>, <&dmac0 0x78>,
-                       <&dmac1 0x77>, <&dmac1 0x78>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 926>;
-                status = "disabled";
-        };
+                i2c1: i2c@e6518000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7793",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6518000 0 0x40>;
+                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 930>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 930>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        i2c7: i2c@e6500000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6500000 0 0x425>;
-                interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 318>;
-                dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                       <&dmac1 0x61>, <&dmac1 0x62>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 318>;
-                status = "disabled";
-        };
+                i2c2: i2c@e6530000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7793",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6530000 0 0x40>;
+                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 929>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 929>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        i2c8: i2c@e6510000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,iic-r8a7793", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6510000 0 0x425>;
-                interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 323>;
-                dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                       <&dmac1 0x65>, <&dmac1 0x66>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 323>;
-                status = "disabled";
-        };
+                i2c3: i2c@e6540000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7793",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6540000 0 0x40>;
+                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 928>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 928>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        pfc: pin-controller@e6060000 {
-                compatible = "renesas,pfc-r8a7793";
-                reg = <0 0xe6060000 0 0x250>;
-        };
+                i2c4: i2c@e6520000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7793",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6520000 0 0x40>;
+                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 927>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 927>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        sdhi0: sd@ee100000 {
-                compatible = "renesas,sdhi-r8a7793",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee100000 0 0x328>;
-                interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 314>;
-                dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                       <&dmac1 0xcd>, <&dmac1 0xce>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <195000000>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 314>;
-                status = "disabled";
-        };
+                i2c5: i2c@e6528000 {
+                        /* doesn't need pinmux */
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a7793",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6528000 0 0x40>;
+                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 925>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 925>;
+                        i2c-scl-internal-delay-ns = <110>;
+                        status = "disabled";
+                };
 
-        sdhi1: sd@ee140000 {
-                compatible = "renesas,sdhi-r8a7793",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee140000 0 0x100>;
-                interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 312>;
-                dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                       <&dmac1 0xc1>, <&dmac1 0xc2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <97500000>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 312>;
-                status = "disabled";
-        };
+                i2c6: i2c@e60b0000 {
+                        /* doesn't need pinmux */
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7793",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe60b0000 0 0x425>;
+                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 926>;
+                        dmas = <&dmac0 0x77>, <&dmac0 0x78>,
+                               <&dmac1 0x77>, <&dmac1 0x78>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 926>;
+                        status = "disabled";
+                };
 
-        sdhi2: sd@ee160000 {
-                compatible = "renesas,sdhi-r8a7793",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee160000 0 0x100>;
-                interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 311>;
-                dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                       <&dmac1 0xd3>, <&dmac1 0xd4>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <97500000>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 311>;
-                status = "disabled";
-        };
+                i2c7: i2c@e6500000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7793",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6500000 0 0x425>;
+                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 318>;
+                        dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                               <&dmac1 0x61>, <&dmac1 0x62>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 318>;
+                        status = "disabled";
+                };
 
-        mmcif0: mmc@ee200000 {
-                compatible = "renesas,mmcif-r8a7793", "renesas,sh-mmcif";
-                reg = <0 0xee200000 0 0x80>;
-                interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 315>;
-                dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                       <&dmac1 0xd1>, <&dmac1 0xd2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 315>;
-                reg-io-width = <4>;
-                status = "disabled";
-                max-frequency = <97500000>;
-        };
+                i2c8: i2c@e6510000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a7793",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6510000 0 0x425>;
+                        interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 323>;
+                        dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                               <&dmac1 0x65>, <&dmac1 0x66>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 323>;
+                        status = "disabled";
+                };
 
-        scifa0: serial@e6c40000 {
-                compatible = "renesas,scifa-r8a7793",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c40000 0 64>;
-                interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 204>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x21>, <&dmac0 0x22>,
-                       <&dmac1 0x21>, <&dmac1 0x22>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 204>;
-                status = "disabled";
-        };
+                dmac0: dma-controller@e6700000 {
+                        compatible = "renesas,dmac-r8a7793",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6700000 0 0x20000>;
+                        interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 219>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 219>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
 
-        scifa1: serial@e6c50000 {
-                compatible = "renesas,scifa-r8a7793",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c50000 0 64>;
-                interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 203>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x25>, <&dmac0 0x26>,
-                       <&dmac1 0x25>, <&dmac1 0x26>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 203>;
-                status = "disabled";
-        };
+                dmac1: dma-controller@e6720000 {
+                        compatible = "renesas,dmac-r8a7793",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6720000 0 0x20000>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 218>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 218>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
 
-        scifa2: serial@e6c60000 {
-                compatible = "renesas,scifa-r8a7793",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c60000 0 64>;
-                interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 202>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x27>, <&dmac0 0x28>,
-                       <&dmac1 0x27>, <&dmac1 0x28>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 202>;
-                status = "disabled";
-        };
+                qspi: spi@e6b10000 {
+                        compatible = "renesas,qspi-r8a7793", "renesas,qspi";
+                        reg = <0 0xe6b10000 0 0x2c>;
+                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 917>;
+                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                               <&dmac1 0x17>, <&dmac1 0x18>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 917>;
+                        num-cs = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        scifa3: serial@e6c70000 {
-                compatible = "renesas,scifa-r8a7793",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c70000 0 64>;
-                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1106>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
-                       <&dmac1 0x1b>, <&dmac1 0x1c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 1106>;
-                status = "disabled";
-        };
+                scifa0: serial@e6c40000 {
+                        compatible = "renesas,scifa-r8a7793",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c40000 0 64>;
+                        interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 204>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x21>, <&dmac0 0x22>,
+                               <&dmac1 0x21>, <&dmac1 0x22>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 204>;
+                        status = "disabled";
+                };
 
-        scifa4: serial@e6c78000 {
-                compatible = "renesas,scifa-r8a7793",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c78000 0 64>;
-                interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1107>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
-                       <&dmac1 0x1f>, <&dmac1 0x20>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 1107>;
-                status = "disabled";
-        };
+                scifa1: serial@e6c50000 {
+                        compatible = "renesas,scifa-r8a7793",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c50000 0 64>;
+                        interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 203>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x25>, <&dmac0 0x26>,
+                               <&dmac1 0x25>, <&dmac1 0x26>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 203>;
+                        status = "disabled";
+                };
 
-        scifa5: serial@e6c80000 {
-                compatible = "renesas,scifa-r8a7793",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c80000 0 64>;
-                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1108>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x23>, <&dmac0 0x24>,
-                       <&dmac1 0x23>, <&dmac1 0x24>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 1108>;
-                status = "disabled";
-        };
+                scifa2: serial@e6c60000 {
+                        compatible = "renesas,scifa-r8a7793",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c60000 0 64>;
+                        interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 202>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x27>, <&dmac0 0x28>,
+                               <&dmac1 0x27>, <&dmac1 0x28>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 202>;
+                        status = "disabled";
+                };
 
-        scifb0: serial@e6c20000 {
-                compatible = "renesas,scifb-r8a7793",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6c20000 0 0x100>;
-                interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 206>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
-                       <&dmac1 0x3d>, <&dmac1 0x3e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 206>;
-                status = "disabled";
-        };
+                scifa3: serial@e6c70000 {
+                        compatible = "renesas,scifa-r8a7793",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c70000 0 64>;
+                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1106>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
+                               <&dmac1 0x1b>, <&dmac1 0x1c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 1106>;
+                        status = "disabled";
+                };
 
-        scifb1: serial@e6c30000 {
-                compatible = "renesas,scifb-r8a7793",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6c30000 0 0x100>;
-                interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 207>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
-                       <&dmac1 0x19>, <&dmac1 0x1a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 207>;
-                status = "disabled";
-        };
+                scifa4: serial@e6c78000 {
+                        compatible = "renesas,scifa-r8a7793",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c78000 0 64>;
+                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1107>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
+                               <&dmac1 0x1f>, <&dmac1 0x20>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 1107>;
+                        status = "disabled";
+                };
 
-        scifb2: serial@e6ce0000 {
-                compatible = "renesas,scifb-r8a7793",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6ce0000 0 0x100>;
-                interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 216>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
-                       <&dmac1 0x1d>, <&dmac1 0x1e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 216>;
-                status = "disabled";
-        };
+                scifa5: serial@e6c80000 {
+                        compatible = "renesas,scifa-r8a7793",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c80000 0 64>;
+                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1108>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x23>, <&dmac0 0x24>,
+                               <&dmac1 0x23>, <&dmac1 0x24>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 1108>;
+                        status = "disabled";
+                };
 
-        scif0: serial@e6e60000 {
-                compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e60000 0 64>;
-                interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                       <&dmac1 0x29>, <&dmac1 0x2a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 721>;
-                status = "disabled";
-        };
+                scifb0: serial@e6c20000 {
+                        compatible = "renesas,scifb-r8a7793",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6c20000 0 0x100>;
+                        interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 206>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
+                               <&dmac1 0x3d>, <&dmac1 0x3e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 206>;
+                        status = "disabled";
+                };
 
-        scif1: serial@e6e68000 {
-                compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e68000 0 64>;
-                interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
-                       <&dmac1 0x2d>, <&dmac1 0x2e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 720>;
-                status = "disabled";
-        };
+                scifb1: serial@e6c30000 {
+                        compatible = "renesas,scifb-r8a7793",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6c30000 0 0x100>;
+                        interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 207>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
+                               <&dmac1 0x19>, <&dmac1 0x1a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 207>;
+                        status = "disabled";
+                };
 
-        scif2: serial@e6e58000 {
-                compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e58000 0 64>;
-                interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
-                       <&dmac1 0x2b>, <&dmac1 0x2c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 719>;
-                status = "disabled";
-        };
+                scifb2: serial@e6ce0000 {
+                        compatible = "renesas,scifb-r8a7793",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6ce0000 0 0x100>;
+                        interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 216>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
+                               <&dmac1 0x1d>, <&dmac1 0x1e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 216>;
+                        status = "disabled";
+                };
 
-        scif3: serial@e6ea8000 {
-                compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ea8000 0 64>;
-                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
-                       <&dmac1 0x2f>, <&dmac1 0x30>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 718>;
-                status = "disabled";
-        };
+                scif0: serial@e6e60000 {
+                        compatible = "renesas,scif-r8a7793",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6e60000 0 64>;
+                        interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                               <&dmac1 0x29>, <&dmac1 0x2a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 721>;
+                        status = "disabled";
+                };
 
-        scif4: serial@e6ee0000 {
-                compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ee0000 0 64>;
-                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
-                       <&dmac1 0xfb>, <&dmac1 0xfc>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 715>;
-                status = "disabled";
-        };
+                scif1: serial@e6e68000 {
+                        compatible = "renesas,scif-r8a7793",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6e68000 0 64>;
+                        interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
+                               <&dmac1 0x2d>, <&dmac1 0x2e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 720>;
+                        status = "disabled";
+                };
 
-        scif5: serial@e6ee8000 {
-                compatible = "renesas,scif-r8a7793", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ee8000 0 64>;
-                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
-                       <&dmac1 0xfd>, <&dmac1 0xfe>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 714>;
-                status = "disabled";
-        };
+                scif2: serial@e6e58000 {
+                        compatible = "renesas,scif-r8a7793",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6e58000 0 64>;
+                        interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
+                               <&dmac1 0x2b>, <&dmac1 0x2c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 719>;
+                        status = "disabled";
+                };
 
-        hscif0: serial@e62c0000 {
-                compatible = "renesas,hscif-r8a7793",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62c0000 0 96>;
-                interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
-                       <&dmac1 0x39>, <&dmac1 0x3a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 717>;
-                status = "disabled";
-        };
+                scif3: serial@e6ea8000 {
+                        compatible = "renesas,scif-r8a7793",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ea8000 0 64>;
+                        interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
+                               <&dmac1 0x2f>, <&dmac1 0x30>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 718>;
+                        status = "disabled";
+                };
 
-        hscif1: serial@e62c8000 {
-                compatible = "renesas,hscif-r8a7793",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62c8000 0 96>;
-                interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
-                       <&dmac1 0x4d>, <&dmac1 0x4e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 716>;
-                status = "disabled";
-        };
+                scif4: serial@e6ee0000 {
+                        compatible = "renesas,scif-r8a7793",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ee0000 0 64>;
+                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
+                               <&dmac1 0xfb>, <&dmac1 0xfc>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 715>;
+                        status = "disabled";
+                };
 
-        hscif2: serial@e62d0000 {
-                compatible = "renesas,hscif-r8a7793",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62d0000 0 96>;
-                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
-                       <&dmac1 0x3b>, <&dmac1 0x3c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 713>;
-                status = "disabled";
-        };
+                scif5: serial@e6ee8000 {
+                        compatible = "renesas,scif-r8a7793",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ee8000 0 64>;
+                        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
+                               <&dmac1 0xfd>, <&dmac1 0xfe>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 714>;
+                        status = "disabled";
+                };
 
-        icram0: sram@e63a0000 {
-                compatible = "mmio-sram";
-                reg = <0 0xe63a0000 0 0x12000>;
-        };
+                hscif0: serial@e62c0000 {
+                        compatible = "renesas,hscif-r8a7793",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62c0000 0 96>;
+                        interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
+                               <&dmac1 0x39>, <&dmac1 0x3a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 717>;
+                        status = "disabled";
+                };
 
-        icram1: sram@e63c0000 {
-                compatible = "mmio-sram";
-                reg = <0 0xe63c0000 0 0x1000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges = <0 0 0xe63c0000 0x1000>;
+                hscif1: serial@e62c8000 {
+                        compatible = "renesas,hscif-r8a7793",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62c8000 0 96>;
+                        interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
+                               <&dmac1 0x4d>, <&dmac1 0x4e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 716>;
+                        status = "disabled";
+                };
 
-                smp-sram@0 {
-                        compatible = "renesas,smp-sram";
-                        reg = <0 0x10>;
+                hscif2: serial@e62d0000 {
+                        compatible = "renesas,hscif-r8a7793",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62d0000 0 96>;
+                        interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7793_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
+                               <&dmac1 0x3b>, <&dmac1 0x3c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 713>;
+                        status = "disabled";
                 };
-        };
 
-        ether: ethernet@ee700000 {
-                compatible = "renesas,ether-r8a7793",
-                             "renesas,rcar-gen2-ether";
-                reg = <0 0xee700000 0 0x400>;
-                interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 813>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 813>;
-                phy-mode = "rmii";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                can0: can@e6e80000 {
+                        compatible = "renesas,can-r8a7793",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e80000 0 0x1000>;
+                        interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7793_CLK_RCAN>,
+                                 <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 916>;
+                        status = "disabled";
+                };
 
-        vin0: video@e6ef0000 {
-                compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef0000 0 0x1000>;
-                interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 811>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 811>;
-                status = "disabled";
-        };
+                can1: can@e6e88000 {
+                        compatible = "renesas,can-r8a7793",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e88000 0 0x1000>;
+                        interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7793_CLK_RCAN>,
+                                 <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 915>;
+                        status = "disabled";
+                };
 
-        vin1: video@e6ef1000 {
-                compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef1000 0 0x1000>;
-                interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 810>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 810>;
-                status = "disabled";
-        };
+                vin0: video@e6ef0000 {
+                        compatible = "renesas,vin-r8a7793",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef0000 0 0x1000>;
+                        interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 811>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 811>;
+                        status = "disabled";
+                };
 
-        vin2: video@e6ef2000 {
-                compatible = "renesas,vin-r8a7793", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef2000 0 0x1000>;
-                interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 809>;
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 809>;
-                status = "disabled";
-        };
+                vin1: video@e6ef1000 {
+                        compatible = "renesas,vin-r8a7793",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef1000 0 0x1000>;
+                        interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 810>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 810>;
+                        status = "disabled";
+                };
 
-        qspi: spi@e6b10000 {
-                compatible = "renesas,qspi-r8a7793", "renesas,qspi";
-                reg = <0 0xe6b10000 0 0x2c>;
-                interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 917>;
-                dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                       <&dmac1 0x17>, <&dmac1 0x18>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 917>;
-                num-cs = <1>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                vin2: video@e6ef2000 {
+                        compatible = "renesas,vin-r8a7793",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef2000 0 0x1000>;
+                        interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 809>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 809>;
+                        status = "disabled";
+                };
 
-        du: display@feb00000 {
-                compatible = "renesas,du-r8a7793";
-                reg = <0 0xfeb00000 0 0x40000>,
-                      <0 0xfeb90000 0 0x1c>;
-                reg-names = "du", "lvds.0";
-                interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 724>,
-                         <&cpg CPG_MOD 723>,
-                         <&cpg CPG_MOD 726>;
-                clock-names = "du.0", "du.1", "lvds.0";
-                status = "disabled";
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                rcar_sound: sound@ec500000 {
+                        /*
+                         * #sound-dai-cells is required
+                         *
+                         * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
+                         * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
+                         */
+                        compatible = "renesas,rcar_sound-r8a7793",
+                                     "renesas,rcar_sound-gen2";
+                        reg = <0 0xec500000 0 0x1000>, /* SCU */
+                              <0 0xec5a0000 0 0x100>,  /* ADG */
+                              <0 0xec540000 0 0x1000>, /* SSIU */
+                              <0 0xec541000 0 0x280>,  /* SSI */
+                              <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
+                        reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+                        clocks = <&cpg CPG_MOD 1005>,
+                                 <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
+                                 <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
+                                 <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
+                                 <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
+                                 <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
+                                 <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
+                                 <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
+                                 <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
+                                 <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
+                                 <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
+                                 <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
+                                 <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
+                                 <&cpg CPG_CORE R8A7793_CLK_M2>;
+                        clock-names = "ssi-all",
+                                      "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                      "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                      "ssi.1", "ssi.0",
+                                      "src.9", "src.8", "src.7", "src.6",
+                                      "src.5", "src.4", "src.3", "src.2",
+                                      "src.1", "src.0",
+                                      "dvc.0", "dvc.1",
+                                      "clk_a", "clk_b", "clk_c", "clk_i";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 1005>,
+                                 <&cpg 1006>, <&cpg 1007>,
+                                 <&cpg 1008>, <&cpg 1009>,
+                                 <&cpg 1010>, <&cpg 1011>,
+                                 <&cpg 1012>, <&cpg 1013>,
+                                 <&cpg 1014>, <&cpg 1015>;
+                        reset-names = "ssi-all",
+                                      "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                      "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                      "ssi.1", "ssi.0";
+
+                        status = "disabled";
+
+                        rcar_sound,dvc {
+                                dvc0: dvc-0 {
+                                        dmas = <&audma1 0xbc>;
+                                        dma-names = "tx";
+                                };
+                                dvc1: dvc-1 {
+                                        dmas = <&audma1 0xbe>;
+                                        dma-names = "tx";
+                                };
+                        };
 
-                        port@0 {
-                                reg = <0>;
-                                du_out_rgb: endpoint {
+                        rcar_sound,src {
+                                src0: src-0 {
+                                        interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x85>, <&audma1 0x9a>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src1: src-1 {
+                                        interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x87>, <&audma1 0x9c>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src2: src-2 {
+                                        interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x89>, <&audma1 0x9e>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src3: src-3 {
+                                        interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src4: src-4 {
+                                        interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src5: src-5 {
+                                        interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src6: src-6 {
+                                        interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x91>, <&audma1 0xb4>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src7: src-7 {
+                                        interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x93>, <&audma1 0xb6>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src8: src-8 {
+                                        interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x95>, <&audma1 0xb8>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src9: src-9 {
+                                        interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x97>, <&audma1 0xba>;
+                                        dma-names = "rx", "tx";
                                 };
                         };
-                        port@1 {
-                                reg = <1>;
-                                du_out_lvds0: endpoint {
+
+                        rcar_sound,ssi {
+                                ssi0: ssi-0 {
+                                        interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x01>, <&audma1 0x02>,
+                                               <&audma0 0x15>, <&audma1 0x16>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi1: ssi-1 {
+                                         interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x03>, <&audma1 0x04>,
+                                               <&audma0 0x49>, <&audma1 0x4a>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi2: ssi-2 {
+                                        interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x05>, <&audma1 0x06>,
+                                               <&audma0 0x63>, <&audma1 0x64>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi3: ssi-3 {
+                                        interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x07>, <&audma1 0x08>,
+                                               <&audma0 0x6f>, <&audma1 0x70>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi4: ssi-4 {
+                                        interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x09>, <&audma1 0x0a>,
+                                               <&audma0 0x71>, <&audma1 0x72>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi5: ssi-5 {
+                                        interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0b>, <&audma1 0x0c>,
+                                               <&audma0 0x73>, <&audma1 0x74>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi6: ssi-6 {
+                                        interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0d>, <&audma1 0x0e>,
+                                               <&audma0 0x75>, <&audma1 0x76>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi7: ssi-7 {
+                                        interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0f>, <&audma1 0x10>,
+                                               <&audma0 0x79>, <&audma1 0x7a>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi8: ssi-8 {
+                                        interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x11>, <&audma1 0x12>,
+                                               <&audma0 0x7b>, <&audma1 0x7c>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi9: ssi-9 {
+                                        interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x13>, <&audma1 0x14>,
+                                               <&audma0 0x7d>, <&audma1 0x7e>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
                                 };
                         };
                 };
-        };
 
-        can0: can@e6e80000 {
-                compatible = "renesas,can-r8a7793", "renesas,rcar-gen2-can";
-                reg = <0 0xe6e80000 0 0x1000>;
-                interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7793_CLK_RCAN>,
-                         <&can_clk>;
-                clock-names = "clkp1", "clkp2", "can_clk";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 916>;
-                status = "disabled";
-        };
-
-        can1: can@e6e88000 {
-                compatible = "renesas,can-r8a7793", "renesas,rcar-gen2-can";
-                reg = <0 0xe6e88000 0 0x1000>;
-                interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7793_CLK_RCAN>,
-                         <&can_clk>;
-                clock-names = "clkp1", "clkp2", "can_clk";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 915>;
-                status = "disabled";
-        };
-
-        /* External root clock */
-        extal_clk: extal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
-
-        /*
-         * The external audio clocks are configured as 0 Hz fixed frequency
-         * clocks by default.
-         * Boards that provide audio clocks should override them.
-         */
-        audio_clk_a: audio_clk_a {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-        audio_clk_b: audio_clk_b {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-        audio_clk_c: audio_clk_c {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-
-        /* External USB clock - can be overridden by the board */
-        usb_extal_clk: usb_extal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <48000000>;
-        };
+                audma0: dma-controller@ec700000 {
+                        compatible = "renesas,dmac-r8a7793",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec700000 0 0x10000>;
+                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 502>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 502>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
 
-        /* External CAN clock */
-        can_clk: can {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                audma1: dma-controller@ec720000 {
+                        compatible = "renesas,dmac-r8a7793",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec720000 0 0x10000>;
+                        interrupts = <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 333 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 501>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 501>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
 
-        /* External SCIF clock */
-        scif_clk: scif {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                sdhi0: sd@ee100000 {
+                        compatible = "renesas,sdhi-r8a7793",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee100000 0 0x328>;
+                        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 314>;
+                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                               <&dmac1 0xcd>, <&dmac1 0xce>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <195000000>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 314>;
+                        status = "disabled";
+                };
 
-        /* Special CPG clocks */
-        cpg: clock-controller@e6150000 {
-                compatible = "renesas,r8a7793-cpg-mssr";
-                reg = <0 0xe6150000 0 0x1000>;
-                clocks = <&extal_clk>, <&usb_extal_clk>;
-                clock-names = "extal", "usb_extal";
-                #clock-cells = <2>;
-                #power-domain-cells = <0>;
-                #reset-cells = <1>;
-        };
+                sdhi1: sd@ee140000 {
+                        compatible = "renesas,sdhi-r8a7793",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee140000 0 0x100>;
+                        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 312>;
+                        dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                               <&dmac1 0xc1>, <&dmac1 0xc2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 312>;
+                        status = "disabled";
+                };
 
-        rst: reset-controller@e6160000 {
-                compatible = "renesas,r8a7793-rst";
-                reg = <0 0xe6160000 0 0x0100>;
-        };
+                sdhi2: sd@ee160000 {
+                        compatible = "renesas,sdhi-r8a7793",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee160000 0 0x100>;
+                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 311>;
+                        dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                               <&dmac1 0xd3>, <&dmac1 0xd4>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 311>;
+                        status = "disabled";
+                };
 
-        prr: chipid@ff000044 {
-                compatible = "renesas,prr";
-                reg = <0 0xff000044 0 4>;
-        };
+                mmcif0: mmc@ee200000 {
+                        compatible = "renesas,mmcif-r8a7793",
+                                     "renesas,sh-mmcif";
+                        reg = <0 0xee200000 0 0x80>;
+                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 315>;
+                        dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                               <&dmac1 0xd1>, <&dmac1 0xd2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 315>;
+                        reg-io-width = <4>;
+                        status = "disabled";
+                        max-frequency = <97500000>;
+                };
 
-        sysc: system-controller@e6180000 {
-                compatible = "renesas,r8a7793-sysc";
-                reg = <0 0xe6180000 0 0x0200>;
-                #power-domain-cells = <1>;
-        };
+                ether: ethernet@ee700000 {
+                        compatible = "renesas,ether-r8a7793",
+                                     "renesas,rcar-gen2-ether";
+                        reg = <0 0xee700000 0 0x400>;
+                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 813>;
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 813>;
+                        phy-mode = "rmii";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        ipmmu_sy0: mmu@e6280000 {
-                compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6280000 0 0x1000>;
-                interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                gic: interrupt-controller@f1001000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        #address-cells = <0>;
+                        interrupt-controller;
+                        reg = <0 0xf1001000 0 0x1000>,
+                                <0 0xf1002000 0 0x2000>,
+                                <0 0xf1004000 0 0x2000>,
+                                <0 0xf1006000 0 0x2000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 408>;
+                };
 
-        ipmmu_sy1: mmu@e6290000 {
-                compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6290000 0 0x1000>;
-                interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                du: display@feb00000 {
+                        compatible = "renesas,du-r8a7793";
+                        reg = <0 0xfeb00000 0 0x40000>,
+                              <0 0xfeb90000 0 0x1c>;
+                        reg-names = "du", "lvds.0";
+                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 724>,
+                                 <&cpg CPG_MOD 723>,
+                                 <&cpg CPG_MOD 726>;
+                        clock-names = "du.0", "du.1", "lvds.0";
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb: endpoint {
+                                        };
+                                };
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_lvds0: endpoint {
+                                        };
+                                };
+                        };
+                };
 
-        ipmmu_ds: mmu@e6740000 {
-                compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6740000 0 0x1000>;
-                interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                prr: chipid@ff000044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xff000044 0 4>;
+                };
 
-        ipmmu_mp: mmu@ec680000 {
-                compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-                reg = <0 0xec680000 0 0x1000>;
-                interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                cmt0: timer@ffca0000 {
+                        compatible = "renesas,r8a7793-cmt0",
+                                     "renesas,rcar-gen2-cmt0";
+                        reg = <0 0xffca0000 0 0x1004>;
+                        interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 124>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 124>;
+
+                        status = "disabled";
+                };
 
-        ipmmu_mx: mmu@fe951000 {
-                compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-                reg = <0 0xfe951000 0 0x1000>;
-                interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
+                cmt1: timer@e6130000 {
+                        compatible = "renesas,r8a7793-cmt1",
+                                     "renesas,rcar-gen2-cmt1";
+                        reg = <0 0xe6130000 0 0x1004>;
+                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 329>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
+                        resets = <&cpg 329>;
+
+                        status = "disabled";
+                };
         };
 
-        ipmmu_rt: mmu@ffc80000 {
-                compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-                reg = <0 0xffc80000 0 0x1000>;
-                interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <0>;
+                        polling-delay = <0>;
 
-        ipmmu_gp: mmu@e62a0000 {
-                compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa";
-                reg = <0 0xe62a0000 0 0x1000>;
-                interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                        thermal-sensors = <&thermal>;
 
-        rcar_sound: sound@ec500000 {
-                /*
-                 * #sound-dai-cells is required
-                 *
-                 * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
-                 * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
-                 */
-                compatible =  "renesas,rcar_sound-r8a7793", "renesas,rcar_sound-gen2";
-                reg =   <0 0xec500000 0 0x1000>, /* SCU */
-                        <0 0xec5a0000 0 0x100>,  /* ADG */
-                        <0 0xec540000 0 0x1000>, /* SSIU */
-                        <0 0xec541000 0 0x280>,  /* SSI */
-                        <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-                reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
-
-                clocks = <&cpg CPG_MOD 1005>,
-                         <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-                         <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
-                         <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
-                         <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
-                         <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
-                         <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>,
-                         <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>,
-                         <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>,
-                         <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>,
-                         <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>,
-                         <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
-                         <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>,
-                         <&cpg CPG_CORE R8A7793_CLK_M2>;
-                clock-names = "ssi-all",
-                                "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                                "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
-                                "src.9", "src.8", "src.7", "src.6", "src.5",
-                                "src.4", "src.3", "src.2", "src.1", "src.0",
-                                "dvc.0", "dvc.1",
-                                "clk_a", "clk_b", "clk_c", "clk_i";
-                power-domains = <&sysc R8A7793_PD_ALWAYS_ON>;
-                resets = <&cpg 1005>,
-                         <&cpg 1006>, <&cpg 1007>, <&cpg 1008>, <&cpg 1009>,
-                         <&cpg 1010>, <&cpg 1011>, <&cpg 1012>, <&cpg 1013>,
-                         <&cpg 1014>, <&cpg 1015>;
-                reset-names = "ssi-all",
-                              "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                              "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0";
-
-                status = "disabled";
-
-                rcar_sound,dvc {
-                        dvc0: dvc-0 {
-                                dmas = <&audma1 0xbc>;
-                                dma-names = "tx";
+                        trips {
+                                cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <0>;
+                                        type = "critical";
+                                };
                         };
-                        dvc1: dvc-1 {
-                                dmas = <&audma1 0xbe>;
-                                dma-names = "tx";
+                        cooling-maps {
                         };
                 };
+        };
 
-                rcar_sound,src {
-                        src0: src-0 {
-                                interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x85>, <&audma1 0x9a>;
-                                dma-names = "rx", "tx";
-                        };
-                        src1: src-1 {
-                                interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x87>, <&audma1 0x9c>;
-                                dma-names = "rx", "tx";
-                        };
-                        src2: src-2 {
-                                interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x89>, <&audma1 0x9e>;
-                                dma-names = "rx", "tx";
-                        };
-                        src3: src-3 {
-                                interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8b>, <&audma1 0xa0>;
-                                dma-names = "rx", "tx";
-                        };
-                        src4: src-4 {
-                                interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8d>, <&audma1 0xb0>;
-                                dma-names = "rx", "tx";
-                        };
-                        src5: src-5 {
-                                interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8f>, <&audma1 0xb2>;
-                                dma-names = "rx", "tx";
-                        };
-                        src6: src-6 {
-                                interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x91>, <&audma1 0xb4>;
-                                dma-names = "rx", "tx";
-                        };
-                        src7: src-7 {
-                                interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x93>, <&audma1 0xb6>;
-                                dma-names = "rx", "tx";
-                        };
-                        src8: src-8 {
-                                interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x95>, <&audma1 0xb8>;
-                                dma-names = "rx", "tx";
-                        };
-                        src9: src-9 {
-                                interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x97>, <&audma1 0xba>;
-                                dma-names = "rx", "tx";
-                        };
-                };
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+        };
 
-                rcar_sound,ssi {
-                        ssi0: ssi-0 {
-                                interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi1: ssi-1 {
-                                 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi2: ssi-2 {
-                                interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi3: ssi-3 {
-                                interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi4: ssi-4 {
-                                interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi5: ssi-5 {
-                                interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi6: ssi-6 {
-                                interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi7: ssi-7 {
-                                interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi8: ssi-8 {
-                                interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi9: ssi-9 {
-                                interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                };
+        /* External USB clock - can be overridden by the board */
+        usb_extal_clk: usb_extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <48000000>;
         };
 };
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 60c6515c4996..26a883484ea8 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -18,7 +18,9 @@
 
         aliases {
                 serial0 = &scif2;
+                i2c9 = &gpioi2c1;
                 i2c10 = &gpioi2c4;
+                i2c11 = &i2chdmi;
                 i2c12 = &i2cexio4;
         };
 
@@ -138,17 +140,50 @@
                 clock-frequency = <148500000>;
         };
 
+        gpioi2c1: i2c-9 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "i2c-gpio";
+                status = "disabled";
+                scl-gpios = <&gpio4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+        };
+
         gpioi2c4: i2c-10 {
                 #address-cells = <1>;
                 #size-cells = <0>;
                 compatible = "i2c-gpio";
                 status = "disabled";
-                sda-gpios = <&gpio4 9 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                 scl-gpios = <&gpio4 8 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio4 9 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                 i2c-gpio,delay-us = <5>;
         };
 
         /*
+         * A fallback to GPIO is provided for I2C1.
+         */
+        i2chdmi: i2c-11 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&i2c1>, <&gpioi2c1>;
+                i2c-bus-name = "i2c-hdmi";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                composite-in@20 {
+                        compatible = "adi,adv7180";
+                        reg = <0x20>;
+                        remote = <&vin0>;
+
+                        port {
+                                adv7180: endpoint {
+                                        bus-width = <8>;
+                                        remote-endpoint = <&vin0ep>;
+                                };
+                        };
+                };
+        };
+
+        /*
          * I2C4 is routed to EXIO connector B, pins 73 (SCL) + 74 (SDA).
          * A fallback to GPIO is provided.
          */
@@ -324,23 +359,9 @@
 
 &i2c1 {
         pinctrl-0 = <&i2c1_pins>;
-        pinctrl-names = "default";
+        pinctrl-names = "i2c-hdmi";
 
-        status = "okay";
         clock-frequency = <400000>;
-
-        composite-in@20 {
-                compatible = "adi,adv7180";
-                reg = <0x20>;
-                remote = <&vin0>;
-
-                port {
-                        adv7180: endpoint {
-                                bus-width = <8>;
-                                remote-endpoint = <&vin0ep>;
-                        };
-                };
-        };
 };
 
 &i2c4 {
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index edfad0e5ac53..351cb3b3d966 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -24,6 +24,7 @@
 /dts-v1/;
 #include "r8a7794.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
         model = "SILK";
@@ -31,6 +32,8 @@
 
         aliases {
                 serial0 = &scif2;
+                i2c9 = &gpioi2c1;
+                i2c10 = &i2chdmi;
         };
 
         chosen {
@@ -43,6 +46,60 @@
                 reg = <0 0x40000000 0 0x40000000>;
         };
 
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                key-3 {
+                        gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_3>;
+                        label = "SW3";
+                        wakeup-source;
+                        debounce-interval = <20>;
+                };
+                key-4 {
+                        gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_4>;
+                        label = "SW4";
+                        wakeup-source;
+                        debounce-interval = <20>;
+                };
+                key-6 {
+                        gpios = <&gpio5 12 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_6>;
+                        label = "SW6";
+                        wakeup-source;
+                        debounce-interval = <20>;
+                };
+                key-a {
+                        gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_A>;
+                        label = "SW12-1";
+                        wakeup-source;
+                        debounce-interval = <20>;
+                };
+                key-b {
+                        gpios = <&gpio3 10 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_B>;
+                        label = "SW12-2";
+                        wakeup-source;
+                        debounce-interval = <20>;
+                };
+                key-c {
+                        gpios = <&gpio3 11 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_C>;
+                        label = "SW12-3";
+                        wakeup-source;
+                        debounce-interval = <20>;
+                };
+                key-d {
+                        gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_D>;
+                        label = "SW12-4";
+                        wakeup-source;
+                        debounce-interval = <20>;
+                };
+        };
+
         d3_3v: regulator-d3-3v {
                 compatible = "regulator-fixed";
                 regulator-name = "D3.3V";
@@ -153,6 +210,84 @@
                         clocks = <&x9_clk>;
                 };
         };
+
+        gpioi2c1: i2c-9 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "i2c-gpio";
+                status = "disabled";
+                scl-gpios = <&gpio4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                sda-gpios = <&gpio4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+                i2c-gpio,delay-us = <5>;
+        };
+
+        /*
+         * A fallback to GPIO is provided for I2C1.
+         */
+        i2chdmi: i2c-10 {
+                compatible = "i2c-demux-pinctrl";
+                i2c-parent = <&i2c1>, <&gpioi2c1>;
+                i2c-bus-name = "i2c-hdmi";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ak4643: codec@12 {
+                        compatible = "asahi-kasei,ak4643";
+                        #sound-dai-cells = <0>;
+                        reg = <0x12>;
+                };
+
+                composite-in@20 {
+                        compatible = "adi,adv7180";
+                        reg = <0x20>;
+                        remote = <&vin0>;
+
+                        port {
+                                adv7180: endpoint {
+                                        bus-width = <8>;
+                                        remote-endpoint = <&vin0ep>;
+                                };
+                        };
+                };
+
+                hdmi@39 {
+                        compatible = "adi,adv7511w";
+                        reg = <0x39>;
+                        interrupt-parent = <&gpio5>;
+                        interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
+
+                        adi,input-depth = <8>;
+                        adi,input-colorspace = "rgb";
+                        adi,input-clock = "1x";
+                        adi,input-style = <1>;
+                        adi,input-justification = "evenly";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        adv7511_in: endpoint {
+                                                remote-endpoint = <&du_out_rgb0>;
+                                        };
+                                };
+
+                                port@1 {
+                                        reg = <1>;
+                                        adv7511_out: endpoint {
+                                                remote-endpoint = <&hdmi_con>;
+                                        };
+                                };
+                        };
+                };
+
+                eeprom@50 {
+                        compatible = "renesas,r1ex24002", "atmel,24c02";
+                        reg = <0x50>;
+                        pagesize = <16>;
+                };
+        };
 };
 
 &extal_clk {
@@ -268,61 +403,9 @@
 
 &i2c1 {
         pinctrl-0 = <&i2c1_pins>;
-        pinctrl-names = "default";
+        pinctrl-names = "i2c-hdmi";
 
-        status = "okay";
         clock-frequency = <400000>;
-
-        ak4643: codec@12 {
-                compatible = "asahi-kasei,ak4643";
-                #sound-dai-cells = <0>;
-                reg = <0x12>;
-        };
-
-        composite-in@20 {
-                compatible = "adi,adv7180";
-                reg = <0x20>;
-                remote = <&vin0>;
-
-                port {
-                        adv7180: endpoint {
-                                bus-width = <8>;
-                                remote-endpoint = <&vin0ep>;
-                        };
-                };
-        };
-
-        hdmi@39 {
-                compatible = "adi,adv7511w";
-                reg = <0x39>;
-                interrupt-parent = <&gpio5>;
-                interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
-
-                adi,input-depth = <8>;
-                adi,input-colorspace = "rgb";
-                adi,input-clock = "1x";
-                adi,input-style = <1>;
-                adi,input-justification = "evenly";
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        port@0 {
-                                reg = <0>;
-                                adv7511_in: endpoint {
-                                        remote-endpoint = <&du_out_rgb0>;
-                                };
-                        };
-
-                        port@1 {
-                                reg = <1>;
-                                adv7511_out: endpoint {
-                                        remote-endpoint = <&hdmi_con>;
-                                };
-                        };
-                };
-        };
 };
 
 &mmcif0 {
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 106b4e1649ff..d588efa6aeaa 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -16,7 +16,6 @@
 
 / {
         compatible = "renesas,r8a7794";
-        interrupt-parent = <&gic>;
         #address-cells = <2>;
         #size-cells = <2>;
 
@@ -34,6 +33,35 @@
                 vin1 = &vin1;
         };
 
+        /*
+         * The external audio clocks are configured as 0 Hz fixed frequency
+         * clocks by default.
+         * Boards that provide audio clocks should override them.
+         */
+        audio_clka: audio_clka {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+        audio_clkb: audio_clkb {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+        audio_clkc: audio_clkc {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        /* External CAN clock */
+        can_clk: can {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -67,1290 +95,1313 @@
                 };
         };
 
-        apmu@e6151000 {
-                compatible = "renesas,r8a7794-apmu", "renesas,apmu";
-                reg = <0 0xe6151000 0 0x188>;
-                cpus = <&cpu0 &cpu1>;
-        };
-
-        gic: interrupt-controller@f1001000 {
-                compatible = "arm,gic-400";
-                #interrupt-cells = <3>;
-                #address-cells = <0>;
-                interrupt-controller;
-                reg = <0 0xf1001000 0 0x1000>,
-                        <0 0xf1002000 0 0x2000>,
-                        <0 0xf1004000 0 0x2000>,
-                        <0 0xf1006000 0 0x2000>;
-                interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
-                clocks = <&cpg CPG_MOD 408>;
-                clock-names = "clk";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 408>;
+        /* External root clock */
+        extal_clk: extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
         };
 
-        gpio0: gpio@e6050000 {
-                compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6050000 0 0x50>;
-                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 0 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 912>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 912>;
+        /* External SCIF clock */
+        scif_clk: scif {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board. */
+                clock-frequency = <0>;
         };
 
-        gpio1: gpio@e6051000 {
-                compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6051000 0 0x50>;
-                interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 32 26>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 911>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 911>;
-        };
+        soc {
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
 
-        gpio2: gpio@e6052000 {
-                compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6052000 0 0x50>;
-                interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 64 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 910>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 910>;
-        };
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                gpio0: gpio@e6050000 {
+                        compatible = "renesas,gpio-r8a7794",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6050000 0 0x50>;
+                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 0 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 912>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 912>;
+                };
 
-        gpio3: gpio@e6053000 {
-                compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6053000 0 0x50>;
-                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 96 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 909>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 909>;
-        };
+                gpio1: gpio@e6051000 {
+                        compatible = "renesas,gpio-r8a7794",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6051000 0 0x50>;
+                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 32 26>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 911>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 911>;
+                };
 
-        gpio4: gpio@e6054000 {
-                compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6054000 0 0x50>;
-                interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 128 32>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 908>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 908>;
-        };
+                gpio2: gpio@e6052000 {
+                        compatible = "renesas,gpio-r8a7794",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6052000 0 0x50>;
+                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 64 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 910>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 910>;
+                };
 
-        gpio5: gpio@e6055000 {
-                compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055000 0 0x50>;
-                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 160 28>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 907>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 907>;
-        };
+                gpio3: gpio@e6053000 {
+                        compatible = "renesas,gpio-r8a7794",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6053000 0 0x50>;
+                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 96 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 909>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 909>;
+                };
 
-        gpio6: gpio@e6055400 {
-                compatible = "renesas,gpio-r8a7794", "renesas,rcar-gen2-gpio";
-                reg = <0 0xe6055400 0 0x50>;
-                interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-                #gpio-cells = <2>;
-                gpio-controller;
-                gpio-ranges = <&pfc 0 192 26>;
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                clocks = <&cpg CPG_MOD 905>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 905>;
-        };
+                gpio4: gpio@e6054000 {
+                        compatible = "renesas,gpio-r8a7794",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6054000 0 0x50>;
+                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 128 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 908>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 908>;
+                };
 
-        cmt0: timer@ffca0000 {
-                compatible = "renesas,r8a7794-cmt0", "renesas,rcar-gen2-cmt0";
-                reg = <0 0xffca0000 0 0x1004>;
-                interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 124>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 124>;
-
-                status = "disabled";
-        };
+                gpio5: gpio@e6055000 {
+                        compatible = "renesas,gpio-r8a7794",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055000 0 0x50>;
+                        interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 160 28>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 907>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 907>;
+                };
 
-        cmt1: timer@e6130000 {
-                compatible = "renesas,r8a7794-cmt1", "renesas,rcar-gen2-cmt1";
-                reg = <0 0xe6130000 0 0x1004>;
-                interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 329>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 329>;
-
-                status = "disabled";
-        };
+                gpio6: gpio@e6055400 {
+                        compatible = "renesas,gpio-r8a7794",
+                                     "renesas,rcar-gen2-gpio";
+                        reg = <0 0xe6055400 0 0x50>;
+                        interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 192 26>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 905>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 905>;
+                };
 
-        timer {
-                compatible = "arm,armv7-timer";
-                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-                             <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
-        };
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a7794";
+                        reg = <0 0xe6060000 0 0x11c>;
+                };
 
-        irqc0: interrupt-controller@e61c0000 {
-                compatible = "renesas,irqc-r8a7794", "renesas,irqc";
-                #interrupt-cells = <2>;
-                interrupt-controller;
-                reg = <0 0xe61c0000 0 0x200>;
-                interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 407>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 407>;
-        };
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a7794-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>, <&usb_extal_clk>;
+                        clock-names = "extal", "usb_extal";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
 
-        pfc: pin-controller@e6060000 {
-                compatible = "renesas,pfc-r8a7794";
-                reg = <0 0xe6060000 0 0x11c>;
-        };
+                apmu@e6151000 {
+                        compatible = "renesas,r8a7794-apmu", "renesas,apmu";
+                        reg = <0 0xe6151000 0 0x188>;
+                        cpus = <&cpu0 &cpu1>;
+                };
 
-        dmac0: dma-controller@e6700000 {
-                compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac";
-                reg = <0 0xe6700000 0 0x20000>;
-                interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12", "ch13", "ch14";
-                clocks = <&cpg CPG_MOD 219>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 219>;
-                #dma-cells = <1>;
-                dma-channels = <15>;
-        };
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a7794-rst";
+                        reg = <0 0xe6160000 0 0x0100>;
+                };
 
-        dmac1: dma-controller@e6720000 {
-                compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac";
-                reg = <0 0xe6720000 0 0x20000>;
-                interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
-                              GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                "ch0", "ch1", "ch2", "ch3",
-                                "ch4", "ch5", "ch6", "ch7",
-                                "ch8", "ch9", "ch10", "ch11",
-                                "ch12", "ch13", "ch14";
-                clocks = <&cpg CPG_MOD 218>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 218>;
-                #dma-cells = <1>;
-                dma-channels = <15>;
-        };
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a7794-sysc";
+                        reg = <0 0xe6180000 0 0x0200>;
+                        #power-domain-cells = <1>;
+                };
 
-        audma0: dma-controller@ec700000 {
-                compatible = "renesas,dmac-r8a7794", "renesas,rcar-dmac";
-                reg = <0 0xec700000 0 0x10000>;
-                interrupts =    <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
-                                 GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "error",
-                                  "ch0", "ch1", "ch2", "ch3", "ch4", "ch5",
-                                  "ch6", "ch7", "ch8", "ch9", "ch10", "ch11",
-                                  "ch12";
-                clocks = <&cpg CPG_MOD 502>;
-                clock-names = "fck";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 502>;
-                #dma-cells = <1>;
-                dma-channels = <13>;
-        };
+                irqc0: interrupt-controller@e61c0000 {
+                        compatible = "renesas,irqc-r8a7794", "renesas,irqc";
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0 0xe61c0000 0 0x200>;
+                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 407>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 407>;
+                };
 
-        scifa0: serial@e6c40000 {
-                compatible = "renesas,scifa-r8a7794",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c40000 0 64>;
-                interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 204>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x21>, <&dmac0 0x22>,
-                       <&dmac1 0x21>, <&dmac1 0x22>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 204>;
-                status = "disabled";
-        };
+                ipmmu_sy0: mmu@e6280000 {
+                        compatible = "renesas,ipmmu-r8a7794",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6280000 0 0x1000>;
+                        interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        scifa1: serial@e6c50000 {
-                compatible = "renesas,scifa-r8a7794",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c50000 0 64>;
-                interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 203>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x25>, <&dmac0 0x26>,
-                       <&dmac1 0x25>, <&dmac1 0x26>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 203>;
-                status = "disabled";
-        };
+                ipmmu_sy1: mmu@e6290000 {
+                        compatible = "renesas,ipmmu-r8a7794",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6290000 0 0x1000>;
+                        interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        scifa2: serial@e6c60000 {
-                compatible = "renesas,scifa-r8a7794",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c60000 0 64>;
-                interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 202>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x27>, <&dmac0 0x28>,
-                       <&dmac1 0x27>, <&dmac1 0x28>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 202>;
-                status = "disabled";
-        };
+                ipmmu_ds: mmu@e6740000 {
+                        compatible = "renesas,ipmmu-r8a7794",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe6740000 0 0x1000>;
+                        interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        scifa3: serial@e6c70000 {
-                compatible = "renesas,scifa-r8a7794",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c70000 0 64>;
-                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1106>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
-                       <&dmac1 0x1b>, <&dmac1 0x1c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 1106>;
-                status = "disabled";
-        };
+                ipmmu_mp: mmu@ec680000 {
+                        compatible = "renesas,ipmmu-r8a7794",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xec680000 0 0x1000>;
+                        interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        scifa4: serial@e6c78000 {
-                compatible = "renesas,scifa-r8a7794",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c78000 0 64>;
-                interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1107>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
-                       <&dmac1 0x1f>, <&dmac1 0x20>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 1107>;
-                status = "disabled";
-        };
+                ipmmu_mx: mmu@fe951000 {
+                        compatible = "renesas,ipmmu-r8a7794",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xfe951000 0 0x1000>;
+                        interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        scifa5: serial@e6c80000 {
-                compatible = "renesas,scifa-r8a7794",
-                             "renesas,rcar-gen2-scifa", "renesas,scifa";
-                reg = <0 0xe6c80000 0 64>;
-                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 1108>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x23>, <&dmac0 0x24>,
-                       <&dmac1 0x23>, <&dmac1 0x24>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 1108>;
-                status = "disabled";
-        };
+                ipmmu_gp: mmu@e62a0000 {
+                        compatible = "renesas,ipmmu-r8a7794",
+                                     "renesas,ipmmu-vmsa";
+                        reg = <0 0xe62a0000 0 0x1000>;
+                        interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
 
-        scifb0: serial@e6c20000 {
-                compatible = "renesas,scifb-r8a7794",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6c20000 0 0x100>;
-                interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 206>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
-                       <&dmac1 0x3d>, <&dmac1 0x3e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 206>;
-                status = "disabled";
-        };
+                icram0: sram@e63a0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63a0000 0 0x12000>;
+                };
 
-        scifb1: serial@e6c30000 {
-                compatible = "renesas,scifb-r8a7794",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6c30000 0 0x100>;
-                interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 207>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
-                       <&dmac1 0x19>, <&dmac1 0x1a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 207>;
-                status = "disabled";
-        };
+                icram1: sram@e63c0000 {
+                        compatible = "mmio-sram";
+                        reg = <0 0xe63c0000 0 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0 0xe63c0000 0x1000>;
 
-        scifb2: serial@e6ce0000 {
-                compatible = "renesas,scifb-r8a7794",
-                             "renesas,rcar-gen2-scifb", "renesas,scifb";
-                reg = <0 0xe6ce0000 0 0x100>;
-                interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 216>;
-                clock-names = "fck";
-                dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
-                       <&dmac1 0x1d>, <&dmac1 0x1e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 216>;
-                status = "disabled";
-        };
+                        smp-sram@0 {
+                                compatible = "renesas,smp-sram";
+                                reg = <0 0x10>;
+                        };
+                };
 
-        scif0: serial@e6e60000 {
-                compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e60000 0 64>;
-                interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
-                       <&dmac1 0x29>, <&dmac1 0x2a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 721>;
-                status = "disabled";
-        };
+                /* The memory map in the User's Manual maps the cores to
+                 * bus numbers
+                 */
+                i2c0: i2c@e6508000 {
+                        compatible = "renesas,i2c-r8a7794",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6508000 0 0x40>;
+                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 931>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 931>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scif1: serial@e6e68000 {
-                compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e68000 0 64>;
-                interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
-                       <&dmac1 0x2d>, <&dmac1 0x2e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 720>;
-                status = "disabled";
-        };
+                i2c1: i2c@e6518000 {
+                        compatible = "renesas,i2c-r8a7794",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6518000 0 0x40>;
+                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 930>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 930>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scif2: serial@e6e58000 {
-                compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6e58000 0 64>;
-                interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
-                       <&dmac1 0x2b>, <&dmac1 0x2c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 719>;
-                status = "disabled";
-        };
+                i2c2: i2c@e6530000 {
+                        compatible = "renesas,i2c-r8a7794",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6530000 0 0x40>;
+                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 929>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 929>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scif3: serial@e6ea8000 {
-                compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ea8000 0 64>;
-                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
-                       <&dmac1 0x2f>, <&dmac1 0x30>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 718>;
-                status = "disabled";
-        };
+                i2c3: i2c@e6540000 {
+                        compatible = "renesas,i2c-r8a7794",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6540000 0 0x40>;
+                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 928>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 928>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scif4: serial@e6ee0000 {
-                compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ee0000 0 64>;
-                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
-                       <&dmac1 0xfb>, <&dmac1 0xfc>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 715>;
-                status = "disabled";
-        };
+                i2c4: i2c@e6520000 {
+                        compatible = "renesas,i2c-r8a7794",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6520000 0 0x40>;
+                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 927>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 927>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        scif5: serial@e6ee8000 {
-                compatible = "renesas,scif-r8a7794", "renesas,rcar-gen2-scif",
-                             "renesas,scif";
-                reg = <0 0xe6ee8000 0 64>;
-                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
-                       <&dmac1 0xfd>, <&dmac1 0xfe>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 714>;
-                status = "disabled";
-        };
+                i2c5: i2c@e6528000 {
+                        compatible = "renesas,i2c-r8a7794",
+                                     "renesas,rcar-gen2-i2c";
+                        reg = <0 0xe6528000 0 0x40>;
+                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 925>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 925>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
 
-        hscif0: serial@e62c0000 {
-                compatible = "renesas,hscif-r8a7794",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62c0000 0 96>;
-                interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 717>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
-                       <&dmac1 0x39>, <&dmac1 0x3a>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 717>;
-                status = "disabled";
-        };
+                i2c6: i2c@e6500000 {
+                        compatible = "renesas,iic-r8a7794",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6500000 0 0x425>;
+                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 318>;
+                        dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+                               <&dmac1 0x61>, <&dmac1 0x62>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 318>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        hscif1: serial@e62c8000 {
-                compatible = "renesas,hscif-r8a7794",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62c8000 0 96>;
-                interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 716>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
-                       <&dmac1 0x4d>, <&dmac1 0x4e>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 716>;
-                status = "disabled";
-        };
+                i2c7: i2c@e6510000 {
+                        compatible = "renesas,iic-r8a7794",
+                                     "renesas,rcar-gen2-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe6510000 0 0x425>;
+                        interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 323>;
+                        dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+                               <&dmac1 0x65>, <&dmac1 0x66>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 323>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        hscif2: serial@e62d0000 {
-                compatible = "renesas,hscif-r8a7794",
-                             "renesas,rcar-gen2-hscif", "renesas,hscif";
-                reg = <0 0xe62d0000 0 96>;
-                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
-                         <&scif_clk>;
-                clock-names = "fck", "brg_int", "scif_clk";
-                dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
-                       <&dmac1 0x3b>, <&dmac1 0x3c>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 713>;
-                status = "disabled";
-        };
+                hsusb: usb@e6590000 {
+                        compatible = "renesas,usbhs-r8a7794",
+                                     "renesas,rcar-gen2-usbhs";
+                        reg = <0 0xe6590000 0 0x100>;
+                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        renesas,buswait = <4>;
+                        phys = <&usb0 1>;
+                        phy-names = "usb";
+                        status = "disabled";
+                };
 
-        icram0: sram@e63a0000 {
-                compatible = "mmio-sram";
-                reg = <0 0xe63a0000 0 0x12000>;
-        };
+                usbphy: usb-phy@e6590100 {
+                        compatible = "renesas,usb-phy-r8a7794",
+                                     "renesas,rcar-gen2-usb-phy";
+                        reg = <0 0xe6590100 0 0x100>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&cpg CPG_MOD 704>;
+                        clock-names = "usbhs";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 704>;
+                        status = "disabled";
 
-        icram1: sram@e63c0000 {
-                compatible = "mmio-sram";
-                reg = <0 0xe63c0000 0 0x1000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges = <0 0 0xe63c0000 0x1000>;
+                        usb0: usb-channel@0 {
+                                reg = <0>;
+                                #phy-cells = <1>;
+                        };
+                        usb2: usb-channel@2 {
+                                reg = <2>;
+                                #phy-cells = <1>;
+                        };
+                };
 
-                smp-sram@0 {
-                        compatible = "renesas,smp-sram";
-                        reg = <0 0x10>;
+                dmac0: dma-controller@e6700000 {
+                        compatible = "renesas,dmac-r8a7794",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6700000 0 0x20000>;
+                        interrupts = <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 219>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 219>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
                 };
-        };
 
-        ether: ethernet@ee700000 {
-                compatible = "renesas,ether-r8a7794",
-                             "renesas,rcar-gen2-ether";
-                reg = <0 0xee700000 0 0x400>;
-                interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 813>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 813>;
-                phy-mode = "rmii";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                dmac1: dma-controller@e6720000 {
+                        compatible = "renesas,dmac-r8a7794",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6720000 0 0x20000>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14";
+                        clocks = <&cpg CPG_MOD 218>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 218>;
+                        #dma-cells = <1>;
+                        dma-channels = <15>;
+                };
 
-        avb: ethernet@e6800000 {
-                compatible = "renesas,etheravb-r8a7794",
-                             "renesas,etheravb-rcar-gen2";
-                reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
-                interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 812>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 812>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                avb: ethernet@e6800000 {
+                        compatible = "renesas,etheravb-r8a7794",
+                                     "renesas,etheravb-rcar-gen2";
+                        reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+                        interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 812>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 812>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        /* The memory map in the User's Manual maps the cores to bus numbers */
-        i2c0: i2c@e6508000 {
-                compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6508000 0 0x40>;
-                interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 931>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 931>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                qspi: spi@e6b10000 {
+                        compatible = "renesas,qspi-r8a7794", "renesas,qspi";
+                        reg = <0 0xe6b10000 0 0x2c>;
+                        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 917>;
+                        dmas = <&dmac0 0x17>, <&dmac0 0x18>,
+                               <&dmac1 0x17>, <&dmac1 0x18>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 917>;
+                        num-cs = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        i2c1: i2c@e6518000 {
-                compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6518000 0 0x40>;
-                interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 930>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 930>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                scifa0: serial@e6c40000 {
+                        compatible = "renesas,scifa-r8a7794",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c40000 0 64>;
+                        interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 204>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x21>, <&dmac0 0x22>,
+                               <&dmac1 0x21>, <&dmac1 0x22>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 204>;
+                        status = "disabled";
+                };
 
-        i2c2: i2c@e6530000 {
-                compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6530000 0 0x40>;
-                interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 929>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 929>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                scifa1: serial@e6c50000 {
+                        compatible = "renesas,scifa-r8a7794",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c50000 0 64>;
+                        interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 203>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x25>, <&dmac0 0x26>,
+                               <&dmac1 0x25>, <&dmac1 0x26>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 203>;
+                        status = "disabled";
+                };
 
-        i2c3: i2c@e6540000 {
-                compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6540000 0 0x40>;
-                interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 928>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 928>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                scifa2: serial@e6c60000 {
+                        compatible = "renesas,scifa-r8a7794",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c60000 0 64>;
+                        interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 202>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x27>, <&dmac0 0x28>,
+                               <&dmac1 0x27>, <&dmac1 0x28>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 202>;
+                        status = "disabled";
+                };
 
-        i2c4: i2c@e6520000 {
-                compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6520000 0 0x40>;
-                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 927>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 927>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                scifa3: serial@e6c70000 {
+                        compatible = "renesas,scifa-r8a7794",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c70000 0 64>;
+                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1106>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1b>, <&dmac0 0x1c>,
+                               <&dmac1 0x1b>, <&dmac1 0x1c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 1106>;
+                        status = "disabled";
+                };
 
-        i2c5: i2c@e6528000 {
-                compatible = "renesas,i2c-r8a7794", "renesas,rcar-gen2-i2c";
-                reg = <0 0xe6528000 0 0x40>;
-                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 925>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 925>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                i2c-scl-internal-delay-ns = <6>;
-                status = "disabled";
-        };
+                scifa4: serial@e6c78000 {
+                        compatible = "renesas,scifa-r8a7794",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c78000 0 64>;
+                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1107>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1f>, <&dmac0 0x20>,
+                               <&dmac1 0x1f>, <&dmac1 0x20>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 1107>;
+                        status = "disabled";
+                };
 
-        i2c6: i2c@e6500000 {
-                compatible = "renesas,iic-r8a7794", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6500000 0 0x425>;
-                interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 318>;
-                dmas = <&dmac0 0x61>, <&dmac0 0x62>,
-                       <&dmac1 0x61>, <&dmac1 0x62>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 318>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                scifa5: serial@e6c80000 {
+                        compatible = "renesas,scifa-r8a7794",
+                                     "renesas,rcar-gen2-scifa", "renesas,scifa";
+                        reg = <0 0xe6c80000 0 64>;
+                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 1108>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x23>, <&dmac0 0x24>,
+                               <&dmac1 0x23>, <&dmac1 0x24>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 1108>;
+                        status = "disabled";
+                };
 
-        i2c7: i2c@e6510000 {
-                compatible = "renesas,iic-r8a7794", "renesas,rcar-gen2-iic",
-                             "renesas,rmobile-iic";
-                reg = <0 0xe6510000 0 0x425>;
-                interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 323>;
-                dmas = <&dmac0 0x65>, <&dmac0 0x66>,
-                       <&dmac1 0x65>, <&dmac1 0x66>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 323>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                scifb0: serial@e6c20000 {
+                        compatible = "renesas,scifb-r8a7794",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6c20000 0 0x100>;
+                        interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 206>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x3d>, <&dmac0 0x3e>,
+                               <&dmac1 0x3d>, <&dmac1 0x3e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 206>;
+                        status = "disabled";
+                };
 
-        mmcif0: mmc@ee200000 {
-                compatible = "renesas,mmcif-r8a7794", "renesas,sh-mmcif";
-                reg = <0 0xee200000 0 0x80>;
-                interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 315>;
-                dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
-                       <&dmac1 0xd1>, <&dmac1 0xd2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 315>;
-                reg-io-width = <4>;
-                status = "disabled";
-        };
+                scifb1: serial@e6c30000 {
+                        compatible = "renesas,scifb-r8a7794",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6c30000 0 0x100>;
+                        interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 207>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x19>, <&dmac0 0x1a>,
+                               <&dmac1 0x19>, <&dmac1 0x1a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 207>;
+                        status = "disabled";
+                };
 
-        sdhi0: sd@ee100000 {
-                compatible = "renesas,sdhi-r8a7794",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee100000 0 0x328>;
-                interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 314>;
-                dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
-                       <&dmac1 0xcd>, <&dmac1 0xce>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <195000000>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 314>;
-                status = "disabled";
-        };
+                scifb2: serial@e6ce0000 {
+                        compatible = "renesas,scifb-r8a7794",
+                                     "renesas,rcar-gen2-scifb", "renesas,scifb";
+                        reg = <0 0xe6ce0000 0 0x100>;
+                        interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 216>;
+                        clock-names = "fck";
+                        dmas = <&dmac0 0x1d>, <&dmac0 0x1e>,
+                               <&dmac1 0x1d>, <&dmac1 0x1e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 216>;
+                        status = "disabled";
+                };
 
-        sdhi1: sd@ee140000 {
-                compatible = "renesas,sdhi-r8a7794",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee140000 0 0x100>;
-                interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 312>;
-                dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
-                       <&dmac1 0xc1>, <&dmac1 0xc2>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <97500000>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 312>;
-                status = "disabled";
-        };
+                scif0: serial@e6e60000 {
+                        compatible = "renesas,scif-r8a7794",
+                                     "renesas,rcar-gen2-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6e60000 0 64>;
+                        interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 721>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x29>, <&dmac0 0x2a>,
+                               <&dmac1 0x29>, <&dmac1 0x2a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 721>;
+                        status = "disabled";
+                };
 
-        sdhi2: sd@ee160000 {
-                compatible = "renesas,sdhi-r8a7794",
-                             "renesas,rcar-gen2-sdhi";
-                reg = <0 0xee160000 0 0x100>;
-                interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 311>;
-                dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
-                       <&dmac1 0xd3>, <&dmac1 0xd4>;
-                dma-names = "tx", "rx", "tx", "rx";
-                max-frequency = <97500000>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 311>;
-                status = "disabled";
-        };
+                scif1: serial@e6e68000 {
+                        compatible = "renesas,scif-r8a7794",
+                                     "renesas,rcar-gen2-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6e68000 0 64>;
+                        interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 720>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2d>, <&dmac0 0x2e>,
+                               <&dmac1 0x2d>, <&dmac1 0x2e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 720>;
+                        status = "disabled";
+                };
 
-        qspi: spi@e6b10000 {
-                compatible = "renesas,qspi-r8a7794", "renesas,qspi";
-                reg = <0 0xe6b10000 0 0x2c>;
-                interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 917>;
-                dmas = <&dmac0 0x17>, <&dmac0 0x18>,
-                       <&dmac1 0x17>, <&dmac1 0x18>;
-                dma-names = "tx", "rx", "tx", "rx";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 917>;
-                num-cs = <1>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                status = "disabled";
-        };
+                scif2: serial@e6e58000 {
+                        compatible = "renesas,scif-r8a7794",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6e58000 0 64>;
+                        interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 719>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2b>, <&dmac0 0x2c>,
+                               <&dmac1 0x2b>, <&dmac1 0x2c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 719>;
+                        status = "disabled";
+                };
 
-        vin0: video@e6ef0000 {
-                compatible = "renesas,vin-r8a7794", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef0000 0 0x1000>;
-                interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 811>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 811>;
-                status = "disabled";
-        };
+                scif3: serial@e6ea8000 {
+                        compatible = "renesas,scif-r8a7794",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ea8000 0 64>;
+                        interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 718>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x2f>, <&dmac0 0x30>,
+                               <&dmac1 0x2f>, <&dmac1 0x30>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 718>;
+                        status = "disabled";
+                };
 
-        vin1: video@e6ef1000 {
-                compatible = "renesas,vin-r8a7794", "renesas,rcar-gen2-vin";
-                reg = <0 0xe6ef1000 0 0x1000>;
-                interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 810>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 810>;
-                status = "disabled";
-        };
+                scif4: serial@e6ee0000 {
+                        compatible = "renesas,scif-r8a7794",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ee0000 0 64>;
+                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 715>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0xfb>, <&dmac0 0xfc>,
+                               <&dmac1 0xfb>, <&dmac1 0xfc>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 715>;
+                        status = "disabled";
+                };
 
-        pci0: pci@ee090000 {
-                compatible = "renesas,pci-r8a7794", "renesas,pci-rcar-gen2";
-                device_type = "pci";
-                reg = <0 0xee090000 0 0xc00>,
-                      <0 0xee080000 0 0x1100>;
-                interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 703>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 703>;
-                status = "disabled";
-
-                bus-range = <0 0>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                #interrupt-cells = <1>;
-                ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
-                interrupt-map-mask = <0xff00 0 0 0x7>;
-                interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                 0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
-                                 0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-
-                usb@1,0 {
-                        reg = <0x800 0 0 0 0>;
-                        phys = <&usb0 0>;
-                        phy-names = "usb";
+                scif5: serial@e6ee8000 {
+                        compatible = "renesas,scif-r8a7794",
+                                     "renesas,rcar-gen2-scif", "renesas,scif";
+                        reg = <0 0xe6ee8000 0 64>;
+                        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 714>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0xfd>, <&dmac0 0xfe>,
+                               <&dmac1 0xfd>, <&dmac1 0xfe>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 714>;
+                        status = "disabled";
                 };
 
-                usb@2,0 {
-                        reg = <0x1000 0 0 0 0>;
-                        phys = <&usb0 0>;
-                        phy-names = "usb";
+                hscif0: serial@e62c0000 {
+                        compatible = "renesas,hscif-r8a7794",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62c0000 0 96>;
+                        interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 717>,
+                                 <&cpg CPG_CORE R8A7794_CLK_ZS>, <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x39>, <&dmac0 0x3a>,
+                               <&dmac1 0x39>, <&dmac1 0x3a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 717>;
+                        status = "disabled";
                 };
-        };
 
-        pci1: pci@ee0d0000 {
-                compatible = "renesas,pci-r8a7794", "renesas,pci-rcar-gen2";
-                device_type = "pci";
-                reg = <0 0xee0d0000 0 0xc00>,
-                      <0 0xee0c0000 0 0x1100>;
-                interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 703>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 703>;
-                status = "disabled";
-
-                bus-range = <1 1>;
-                #address-cells = <3>;
-                #size-cells = <2>;
-                #interrupt-cells = <1>;
-                ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
-                interrupt-map-mask = <0xff00 0 0 0x7>;
-                interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                 0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
-                                 0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-
-                usb@1,0 {
-                        reg = <0x10800 0 0 0 0>;
-                        phys = <&usb2 0>;
-                        phy-names = "usb";
+                hscif1: serial@e62c8000 {
+                        compatible = "renesas,hscif-r8a7794",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62c8000 0 96>;
+                        interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 716>,
+                                 <&cpg CPG_CORE R8A7794_CLK_ZS>, <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x4d>, <&dmac0 0x4e>,
+                               <&dmac1 0x4d>, <&dmac1 0x4e>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 716>;
+                        status = "disabled";
                 };
 
-                usb@2,0 {
-                        reg = <0x11000 0 0 0 0>;
-                        phys = <&usb2 0>;
-                        phy-names = "usb";
+                hscif2: serial@e62d0000 {
+                        compatible = "renesas,hscif-r8a7794",
+                                     "renesas,rcar-gen2-hscif", "renesas,hscif";
+                        reg = <0 0xe62d0000 0 96>;
+                        interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 713>, <&cpg CPG_CORE R8A7794_CLK_ZS>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x3b>, <&dmac0 0x3c>,
+                               <&dmac1 0x3b>, <&dmac1 0x3c>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 713>;
+                        status = "disabled";
                 };
-        };
 
-        hsusb: usb@e6590000 {
-                compatible = "renesas,usbhs-r8a7794", "renesas,rcar-gen2-usbhs";
-                reg = <0 0xe6590000 0 0x100>;
-                interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 704>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 704>;
-                renesas,buswait = <4>;
-                phys = <&usb0 1>;
-                phy-names = "usb";
-                status = "disabled";
-        };
+                can0: can@e6e80000 {
+                        compatible = "renesas,can-r8a7794",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e80000 0 0x1000>;
+                        interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7794_CLK_RCAN>,
+                                 <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 916>;
+                        status = "disabled";
+                };
 
-        usbphy: usb-phy@e6590100 {
-                compatible = "renesas,usb-phy-r8a7794",
-                             "renesas,rcar-gen2-usb-phy";
-                reg = <0 0xe6590100 0 0x100>;
-                #address-cells = <1>;
-                #size-cells = <0>;
-                clocks = <&cpg CPG_MOD 704>;
-                clock-names = "usbhs";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 704>;
-                status = "disabled";
+                can1: can@e6e88000 {
+                        compatible = "renesas,can-r8a7794",
+                                     "renesas,rcar-gen2-can";
+                        reg = <0 0xe6e88000 0 0x1000>;
+                        interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7794_CLK_RCAN>,
+                                 <&can_clk>;
+                        clock-names = "clkp1", "clkp2", "can_clk";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 915>;
+                        status = "disabled";
+                };
 
-                usb0: usb-channel@0 {
-                        reg = <0>;
-                        #phy-cells = <1>;
+                vin0: video@e6ef0000 {
+                        compatible = "renesas,vin-r8a7794",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef0000 0 0x1000>;
+                        interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 811>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 811>;
+                        status = "disabled";
                 };
-                usb2: usb-channel@2 {
-                        reg = <2>;
-                        #phy-cells = <1>;
+
+                vin1: video@e6ef1000 {
+                        compatible = "renesas,vin-r8a7794",
+                                     "renesas,rcar-gen2-vin";
+                        reg = <0 0xe6ef1000 0 0x1000>;
+                        interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 810>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 810>;
+                        status = "disabled";
                 };
-        };
 
-        vsp@fe928000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe928000 0 0x8000>;
-                interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 131>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 131>;
-        };
+                rcar_sound: sound@ec500000 {
+                        /*
+                         * #sound-dai-cells is required
+                         *
+                         * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
+                         * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
+                         */
+                        compatible = "renesas,rcar_sound-r8a7794",
+                                     "renesas,rcar_sound-gen2";
+                        reg = <0 0xec500000 0 0x1000>, /* SCU */
+                              <0 0xec5a0000 0 0x100>,  /* ADG */
+                              <0 0xec540000 0 0x1000>, /* SSIU */
+                              <0 0xec541000 0 0x280>,  /* SSI */
+                              <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri */
+                        reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+
+                        clocks = <&cpg CPG_MOD 1005>,
+                                 <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
+                                 <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
+                                 <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
+                                 <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
+                                 <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
+                                 <&cpg CPG_MOD 1025>, <&cpg CPG_MOD 1026>,
+                                 <&cpg CPG_MOD 1027>, <&cpg CPG_MOD 1028>,
+                                 <&cpg CPG_MOD 1029>, <&cpg CPG_MOD 1030>,
+                                 <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                 <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
+                                 <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
+                                 <&audio_clka>, <&audio_clkb>, <&audio_clkc>,
+                                 <&cpg CPG_CORE R8A7794_CLK_M2>;
+                        clock-names = "ssi-all",
+                                      "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                      "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                      "ssi.1", "ssi.0",
+                                      "src.6", "src.5", "src.4", "src.3",
+                                      "src.2", "src.1",
+                                      "ctu.0", "ctu.1",
+                                      "mix.0", "mix.1",
+                                      "dvc.0", "dvc.1",
+                                      "clk_a", "clk_b", "clk_c", "clk_i";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 1005>,
+                                 <&cpg 1006>, <&cpg 1007>,
+                                 <&cpg 1008>, <&cpg 1009>,
+                                 <&cpg 1010>, <&cpg 1011>,
+                                 <&cpg 1012>, <&cpg 1013>,
+                                 <&cpg 1014>, <&cpg 1015>;
+                        reset-names = "ssi-all",
+                                      "ssi.9", "ssi.8", "ssi.7", "ssi.6",
+                                      "ssi.5", "ssi.4", "ssi.3", "ssi.2",
+                                      "ssi.1", "ssi.0";
+
+                        status = "disabled";
+
+                        rcar_sound,dvc {
+                                dvc0: dvc-0 {
+                                        dmas = <&audma0 0xbc>;
+                                        dma-names = "tx";
+                                };
+                                dvc1: dvc-1 {
+                                        dmas = <&audma0 0xbe>;
+                                        dma-names = "tx";
+                                };
+                        };
 
-        vsp@fe930000 {
-                compatible = "renesas,vsp1";
-                reg = <0 0xfe930000 0 0x8000>;
-                interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 128>;
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 128>;
-        };
+                        rcar_sound,mix {
+                                mix0: mix-0 { };
+                                mix1: mix-1 { };
+                        };
 
-        du: display@feb00000 {
-                compatible = "renesas,du-r8a7794";
-                reg = <0 0xfeb00000 0 0x40000>;
-                reg-names = "du";
-                interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
-                clock-names = "du.0", "du.1";
-                status = "disabled";
-
-                ports {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                        rcar_sound,ctu {
+                                ctu00: ctu-0 { };
+                                ctu01: ctu-1 { };
+                                ctu02: ctu-2 { };
+                                ctu03: ctu-3 { };
+                                ctu10: ctu-4 { };
+                                ctu11: ctu-5 { };
+                                ctu12: ctu-6 { };
+                                ctu13: ctu-7 { };
+                        };
 
-                        port@0 {
-                                reg = <0>;
-                                du_out_rgb0: endpoint {
+                        rcar_sound,src {
+                                src-0 {
+                                        status = "disabled";
+                                };
+                                src1: src-1 {
+                                        interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x87>, <&audma0 0x9c>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src2: src-2 {
+                                        interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x89>, <&audma0 0x9e>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src3: src-3 {
+                                        interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8b>, <&audma0 0xa0>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src4: src-4 {
+                                        interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8d>, <&audma0 0xb0>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src5: src-5 {
+                                        interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x8f>, <&audma0 0xb2>;
+                                        dma-names = "rx", "tx";
+                                };
+                                src6: src-6 {
+                                        interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x91>, <&audma0 0xb4>;
+                                        dma-names = "rx", "tx";
                                 };
                         };
-                        port@1 {
-                                reg = <1>;
-                                du_out_rgb1: endpoint {
+
+                        rcar_sound,ssi {
+                                ssi0: ssi-0 {
+                                        interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x01>, <&audma0 0x02>,
+                                               <&audma0 0x15>, <&audma0 0x16>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi1: ssi-1 {
+                                        interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x03>, <&audma0 0x04>,
+                                               <&audma0 0x49>, <&audma0 0x4a>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi2: ssi-2 {
+                                        interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x05>, <&audma0 0x06>,
+                                               <&audma0 0x63>, <&audma0 0x64>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi3: ssi-3 {
+                                        interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x07>, <&audma0 0x08>,
+                                               <&audma0 0x6f>, <&audma0 0x70>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi4: ssi-4 {
+                                        interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x09>, <&audma0 0x0a>,
+                                               <&audma0 0x71>, <&audma0 0x72>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi5: ssi-5 {
+                                        interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0b>, <&audma0 0x0c>,
+                                               <&audma0 0x73>, <&audma0 0x74>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi6: ssi-6 {
+                                        interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0d>, <&audma0 0x0e>,
+                                               <&audma0 0x75>, <&audma0 0x76>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi7: ssi-7 {
+                                        interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x0f>, <&audma0 0x10>,
+                                               <&audma0 0x79>, <&audma0 0x7a>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi8: ssi-8 {
+                                        interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x11>, <&audma0 0x12>,
+                                               <&audma0 0x7b>, <&audma0 0x7c>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
+                                };
+                                ssi9: ssi-9 {
+                                        interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&audma0 0x13>, <&audma0 0x14>,
+                                               <&audma0 0x7d>, <&audma0 0x7e>;
+                                        dma-names = "rx", "tx", "rxu", "txu";
                                 };
                         };
                 };
-        };
-
-        can0: can@e6e80000 {
-                compatible = "renesas,can-r8a7794", "renesas,rcar-gen2-can";
-                reg = <0 0xe6e80000 0 0x1000>;
-                interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 916>, <&cpg CPG_CORE R8A7794_CLK_RCAN>,
-                         <&can_clk>;
-                clock-names = "clkp1", "clkp2", "can_clk";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 916>;
-                status = "disabled";
-        };
 
-        can1: can@e6e88000 {
-                compatible = "renesas,can-r8a7794", "renesas,rcar-gen2-can";
-                reg = <0 0xe6e88000 0 0x1000>;
-                interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&cpg CPG_MOD 915>, <&cpg CPG_CORE R8A7794_CLK_RCAN>,
-                         <&can_clk>;
-                clock-names = "clkp1", "clkp2", "can_clk";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 915>;
-                status = "disabled";
-        };
-
-        /* External root clock */
-        extal_clk: extal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
-
-        /* External USB clock - can be overridden by the board */
-        usb_extal_clk: usb_extal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <48000000>;
-        };
-
-        /* External CAN clock */
-        can_clk: can {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                audma0: dma-controller@ec700000 {
+                        compatible = "renesas,dmac-r8a7794",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xec700000 0 0x10000>;
+                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 327 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 328 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 329 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3", "ch4",
+                                          "ch5", "ch6", "ch7", "ch8", "ch9",
+                                          "ch10", "ch11",
+                                          "ch12";
+                        clocks = <&cpg CPG_MOD 502>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 502>;
+                        #dma-cells = <1>;
+                        dma-channels = <13>;
+                };
 
-        /* External SCIF clock */
-        scif_clk: scif {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                /* This value must be overridden by the board. */
-                clock-frequency = <0>;
-        };
+                pci0: pci@ee090000 {
+                        compatible = "renesas,pci-r8a7794",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee090000 0 0xc00>,
+                              <0 0xee080000 0 0x1100>;
+                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x800 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
 
-        /*
-         * The external audio clocks are configured  as 0 Hz fixed
-         * frequency clocks by default.  Boards that provide audio
-         * clocks should override them.
-         */
-        audio_clka: audio_clka {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-        audio_clkb: audio_clkb {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
-        audio_clkc: audio_clkc {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+                        usb@2,0 {
+                                reg = <0x1000 0 0 0 0>;
+                                phys = <&usb0 0>;
+                                phy-names = "usb";
+                        };
+                };
 
-        cpg: clock-controller@e6150000 {
-                compatible = "renesas,r8a7794-cpg-mssr";
-                reg = <0 0xe6150000 0 0x1000>;
-                clocks = <&extal_clk>, <&usb_extal_clk>;
-                clock-names = "extal", "usb_extal";
-                #clock-cells = <2>;
-                #power-domain-cells = <0>;
-                #reset-cells = <1>;
-        };
+                pci1: pci@ee0d0000 {
+                        compatible = "renesas,pci-r8a7794",
+                                     "renesas,pci-rcar-gen2";
+                        device_type = "pci";
+                        reg = <0 0xee0d0000 0 0xc00>,
+                              <0 0xee0c0000 0 0x1100>;
+                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 703>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 703>;
+                        status = "disabled";
+
+                        bus-range = <1 1>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                        interrupt-map-mask = <0xff00 0 0 0x7>;
+                        interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH
+                                         0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+
+                        usb@1,0 {
+                                reg = <0x10800 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
 
-        rst: reset-controller@e6160000 {
-                compatible = "renesas,r8a7794-rst";
-                reg = <0 0xe6160000 0 0x0100>;
-        };
+                        usb@2,0 {
+                                reg = <0x11000 0 0 0 0>;
+                                phys = <&usb2 0>;
+                                phy-names = "usb";
+                        };
+                };
 
-        prr: chipid@ff000044 {
-                compatible = "renesas,prr";
-                reg = <0 0xff000044 0 4>;
-        };
+                sdhi0: sd@ee100000 {
+                        compatible = "renesas,sdhi-r8a7794",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee100000 0 0x328>;
+                        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 314>;
+                        dmas = <&dmac0 0xcd>, <&dmac0 0xce>,
+                               <&dmac1 0xcd>, <&dmac1 0xce>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <195000000>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 314>;
+                        status = "disabled";
+                };
 
-        sysc: system-controller@e6180000 {
-                compatible = "renesas,r8a7794-sysc";
-                reg = <0 0xe6180000 0 0x0200>;
-                #power-domain-cells = <1>;
-        };
+                sdhi1: sd@ee140000 {
+                        compatible = "renesas,sdhi-r8a7794",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee140000 0 0x100>;
+                        interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 312>;
+                        dmas = <&dmac0 0xc1>, <&dmac0 0xc2>,
+                               <&dmac1 0xc1>, <&dmac1 0xc2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 312>;
+                        status = "disabled";
+                };
 
-        ipmmu_sy0: mmu@e6280000 {
-                compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6280000 0 0x1000>;
-                interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                sdhi2: sd@ee160000 {
+                        compatible = "renesas,sdhi-r8a7794",
+                                     "renesas,rcar-gen2-sdhi";
+                        reg = <0 0xee160000 0 0x100>;
+                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 311>;
+                        dmas = <&dmac0 0xd3>, <&dmac0 0xd4>,
+                               <&dmac1 0xd3>, <&dmac1 0xd4>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        max-frequency = <97500000>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 311>;
+                        status = "disabled";
+                };
 
-        ipmmu_sy1: mmu@e6290000 {
-                compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6290000 0 0x1000>;
-                interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                mmcif0: mmc@ee200000 {
+                        compatible = "renesas,mmcif-r8a7794",
+                                     "renesas,sh-mmcif";
+                        reg = <0 0xee200000 0 0x80>;
+                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 315>;
+                        dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+                               <&dmac1 0xd1>, <&dmac1 0xd2>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 315>;
+                        reg-io-width = <4>;
+                        status = "disabled";
+                };
 
-        ipmmu_ds: mmu@e6740000 {
-                compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-                reg = <0 0xe6740000 0 0x1000>;
-                interrupts = <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                ether: ethernet@ee700000 {
+                        compatible = "renesas,ether-r8a7794",
+                                     "renesas,rcar-gen2-ether";
+                        reg = <0 0xee700000 0 0x400>;
+                        interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 813>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 813>;
+                        phy-mode = "rmii";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
 
-        ipmmu_mp: mmu@ec680000 {
-                compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-                reg = <0 0xec680000 0 0x1000>;
-                interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                gic: interrupt-controller@f1001000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        #address-cells = <0>;
+                        interrupt-controller;
+                        reg = <0 0xf1001000 0 0x1000>,
+                              <0 0xf1002000 0 0x2000>,
+                              <0 0xf1004000 0 0x2000>,
+                              <0 0xf1006000 0 0x2000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 408>;
+                };
 
-        ipmmu_mx: mmu@fe951000 {
-                compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-                reg = <0 0xfe951000 0 0x1000>;
-                interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                vsp@fe928000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe928000 0 0x8000>;
+                        interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 131>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 131>;
+                };
 
-        ipmmu_gp: mmu@e62a0000 {
-                compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa";
-                reg = <0 0xe62a0000 0 0x1000>;
-                interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
-                #iommu-cells = <1>;
-                status = "disabled";
-        };
+                vsp@fe930000 {
+                        compatible = "renesas,vsp1";
+                        reg = <0 0xfe930000 0 0x8000>;
+                        interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 128>;
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 128>;
+                };
 
-        rcar_sound: sound@ec500000 {
-                /*
-                 * #sound-dai-cells is required
-                 *
-                 * Single DAI : #sound-dai-cells = <0>;         <&rcar_sound>;
-                 * Multi  DAI : #sound-dai-cells = <1>;         <&rcar_sound N>;
-                 */
-                compatible = "renesas,rcar_sound-r8a7794",
-                             "renesas,rcar_sound-gen2";
-                reg =   <0 0xec500000 0 0x1000>, /* SCU */
-                        <0 0xec5a0000 0 0x100>,  /* ADG */
-                        <0 0xec540000 0 0x1000>, /* SSIU */
-                        <0 0xec541000 0 0x280>,  /* SSI */
-                        <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri */
-                reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
-
-                clocks = <&cpg CPG_MOD 1005>,
-                         <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-                         <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>,
-                         <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>,
-                         <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>,
-                         <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>,
-                         <&cpg CPG_MOD 1025>, <&cpg CPG_MOD 1026>,
-                         <&cpg CPG_MOD 1027>, <&cpg CPG_MOD 1028>,
-                         <&cpg CPG_MOD 1029>, <&cpg CPG_MOD 1030>,
-                         <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                         <&cpg CPG_MOD 1021>, <&cpg CPG_MOD 1020>,
-                         <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
-                         <&audio_clka>, <&audio_clkb>, <&audio_clkc>,
-                         <&cpg CPG_CORE R8A7794_CLK_M2>;
-                clock-names = "ssi-all",
-                              "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                              "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
-                              "src.6", "src.5", "src.4", "src.3", "src.2",
-                              "src.1",
-                              "ctu.0", "ctu.1",
-                              "mix.0", "mix.1",
-                              "dvc.0", "dvc.1",
-                              "clk_a", "clk_b", "clk_c", "clk_i";
-                power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
-                resets = <&cpg 1005>,
-                         <&cpg 1006>, <&cpg 1007>, <&cpg 1008>, <&cpg 1009>,
-                         <&cpg 1010>, <&cpg 1011>, <&cpg 1012>, <&cpg 1013>,
-                         <&cpg 1014>, <&cpg 1015>;
-                reset-names = "ssi-all",
-                              "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
-                              "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0";
-
-                status = "disabled";
-
-                rcar_sound,dvc {
-                        dvc0: dvc-0 {
-                                dmas = <&audma0 0xbc>;
-                                dma-names = "tx";
-                        };
-                        dvc1: dvc-1 {
-                                dmas = <&audma0 0xbe>;
-                                dma-names = "tx";
+                du: display@feb00000 {
+                        compatible = "renesas,du-r8a7794";
+                        reg = <0 0xfeb00000 0 0x40000>;
+                        reg-names = "du";
+                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>;
+                        clock-names = "du.0", "du.1";
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb0: endpoint {
+                                        };
+                                };
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_rgb1: endpoint {
+                                        };
+                                };
                         };
                 };
 
-                rcar_sound,mix {
-                        mix0: mix-0 { };
-                        mix1: mix-1 { };
+                prr: chipid@ff000044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xff000044 0 4>;
                 };
 
-                rcar_sound,ctu {
-                        ctu00: ctu-0 { };
-                        ctu01: ctu-1 { };
-                        ctu02: ctu-2 { };
-                        ctu03: ctu-3 { };
-                        ctu10: ctu-4 { };
-                        ctu11: ctu-5 { };
-                        ctu12: ctu-6 { };
-                        ctu13: ctu-7 { };
+                cmt0: timer@ffca0000 {
+                        compatible = "renesas,r8a7794-cmt0",
+                                     "renesas,rcar-gen2-cmt0";
+                        reg = <0 0xffca0000 0 0x1004>;
+                        interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 124>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 124>;
+
+                        status = "disabled";
                 };
 
-                rcar_sound,src {
-                        src-0 {
-                                status = "disabled";
-                        };
-                        src1: src-1 {
-                                interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x87>, <&audma0 0x9c>;
-                                dma-names = "rx", "tx";
-                        };
-                        src2: src-2 {
-                                interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x89>, <&audma0 0x9e>;
-                                dma-names = "rx", "tx";
-                        };
-                        src3: src-3 {
-                                interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8b>, <&audma0 0xa0>;
-                                dma-names = "rx", "tx";
-                        };
-                        src4: src-4 {
-                                interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8d>, <&audma0 0xb0>;
-                                dma-names = "rx", "tx";
-                        };
-                        src5: src-5 {
-                                interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x8f>, <&audma0 0xb2>;
-                                dma-names = "rx", "tx";
-                        };
-                        src6: src-6 {
-                                interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x91>, <&audma0 0xb4>;
-                                dma-names = "rx", "tx";
-                        };
+                cmt1: timer@e6130000 {
+                        compatible = "renesas,r8a7794-cmt1",
+                                     "renesas,rcar-gen2-cmt1";
+                        reg = <0 0xe6130000 0 0x1004>;
+                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 329>;
+                        clock-names = "fck";
+                        power-domains = <&sysc R8A7794_PD_ALWAYS_ON>;
+                        resets = <&cpg 329>;
+
+                        status = "disabled";
                 };
+        };
 
-                rcar_sound,ssi {
-                        ssi0: ssi-0 {
-                                interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x01>, <&audma0 0x02>,
-                                       <&audma0 0x15>, <&audma0 0x16>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi1: ssi-1 {
-                                interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x03>, <&audma0 0x04>,
-                                       <&audma0 0x49>, <&audma0 0x4a>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi2: ssi-2 {
-                                interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x05>, <&audma0 0x06>,
-                                       <&audma0 0x63>, <&audma0 0x64>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi3: ssi-3 {
-                                interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x07>, <&audma0 0x08>,
-                                       <&audma0 0x6f>, <&audma0 0x70>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi4: ssi-4 {
-                                interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x09>, <&audma0 0x0a>,
-                                       <&audma0 0x71>, <&audma0 0x72>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi5: ssi-5 {
-                                interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0b>, <&audma0 0x0c>,
-                                       <&audma0 0x73>, <&audma0 0x74>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi6: ssi-6 {
-                                interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0d>, <&audma0 0x0e>,
-                                       <&audma0 0x75>, <&audma0 0x76>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi7: ssi-7 {
-                                interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x0f>, <&audma0 0x10>,
-                                       <&audma0 0x79>, <&audma0 0x7a>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi8: ssi-8 {
-                                interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x11>, <&audma0 0x12>,
-                                       <&audma0 0x7b>, <&audma0 0x7c>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                        ssi9: ssi-9 {
-                                interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-                                dmas = <&audma0 0x13>, <&audma0 0x14>,
-                                       <&audma0 0x7d>, <&audma0 0x7e>;
-                                dma-names = "rx", "tx", "rxu", "txu";
-                        };
-                };
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+        };
+
+        /* External USB clock - can be overridden by the board */
+        usb_extal_clk: usb_extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <48000000>;
         };
 };
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index 341deaf62ff6..df1e47858675 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -233,7 +233,7 @@
         };
 
         grf: syscon@11000000 {
-                compatible = "syscon", "simple-mfd";
+                compatible = "rockchip,rk3228-grf", "syscon", "simple-mfd";
                 reg = <0x11000000 0x1000>;
                 #address-cells = <1>;
                 #size-cells = <1>;
diff --git a/arch/arm/boot/dts/rk3288-phycore-rdk.dts b/arch/arm/boot/dts/rk3288-phycore-rdk.dts
index 1241cbcfc16f..985743fa134c 100644
--- a/arch/arm/boot/dts/rk3288-phycore-rdk.dts
+++ b/arch/arm/boot/dts/rk3288-phycore-rdk.dts
@@ -265,7 +265,11 @@
         disable-wp;
         pinctrl-names = "default";
         pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
-        vmmc-supply = <&vdd_io_sd>;
+        sd-uhs-sdr12;
+        sd-uhs-sdr25;
+        sd-uhs-sdr50;
+        sd-uhs-sdr104;
+        vmmc-supply = <&vdd_sd>;
         vqmmc-supply = <&vdd_io_sd>;
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/rk3288-phycore-som.dtsi b/arch/arm/boot/dts/rk3288-phycore-som.dtsi
index 5eae4776ffde..f13bcb1cd3d9 100644
--- a/arch/arm/boot/dts/rk3288-phycore-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-phycore-som.dtsi
@@ -336,11 +336,10 @@
                                 regulator-name = "vdd_io_sd";
                                 regulator-always-on;
                                 regulator-boot-on;
-                                regulator-min-microvolt = <3300000>;
+                                regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-state-mem {
-                                        regulator-on-in-suspend;
-                                        regulator-suspend-microvolt = <3300000>;
+                                        regulator-off-in-suspend;
                                 };
                         };
                 };
diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
index b9c471fcbd42..51f36a1b698e 100644
--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
@@ -280,6 +280,10 @@
         };
 };
 
+&saradc {
+        vref-supply = <&vcc_18>;
+};
+
 &tsadc {
         rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
         rockchip,hw-tshut-polarity = <0>; /* tshut polarity 0:LOW 1:HIGH */
diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts
index 0e084b8a86ac..8ccc89dbdfaf 100644
--- a/arch/arm/boot/dts/rk3288-rock2-square.dts
+++ b/arch/arm/boot/dts/rk3288-rock2-square.dts
@@ -39,6 +39,7 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/input/input.h>
 #include "rk3288-rock2-som.dtsi"
 
 / {
@@ -49,6 +50,32 @@
                 stdout-path = "serial2:115200n8";
         };
 
+        adc-keys {
+                compatible = "adc-keys";
+                io-channels = <&saradc 1>;
+                io-channel-names = "buttons";
+                keyup-threshold-microvolt = <1800000>;
+
+                button-recovery {
+                        label = "Recovery";
+                        linux,code = <KEY_VENDOR>;
+                        press-threshold-microvolt = <0>;
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                power {
+                        gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
+                        label = "GPIO Power";
+                        linux,code = <KEY_POWER>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pwr_key>;
+                        wakeup-source;
+                };
+        };
+
         gpio-leds {
                 compatible = "gpio-leds";
 
@@ -220,6 +247,12 @@
                 };
         };
 
+        keys {
+                pwr_key: pwr-key {
+                        rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+                };
+        };
+
         pmic {
                 pmic_int: pmic-int {
                         rockchip,pins = <0 4 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -261,6 +294,10 @@
         };
 };
 
+&saradc {
+        status = "okay";
+};
+
 &spdif {
         status = "okay";
 };
@@ -284,3 +321,7 @@
 &usb_host1 {
         status = "okay";
 };
+
+&usb_otg {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
index d752a315f884..be487111d025 100644
--- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
@@ -92,7 +92,6 @@
                         248 249 250 251 252 253 254 255>;
                 default-brightness-level = <128>;
                 enable-gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
-                backlight-boot-off;
                 pinctrl-names = "default";
                 pinctrl-0 = <&bl_en>;
                 pwms = <&pwm0 0 1000000 0>;
diff --git a/arch/arm/boot/dts/rk3288-vyasa.dts b/arch/arm/boot/dts/rk3288-vyasa.dts
index 9842a006e823..14c896bfc639 100644
--- a/arch/arm/boot/dts/rk3288-vyasa.dts
+++ b/arch/arm/boot/dts/rk3288-vyasa.dts
@@ -155,6 +155,17 @@
         cpu0-supply = <&vdd_cpu>;
 };
 
+&emmc {
+        bus-width = <8>;
+        cap-mmc-highspeed;
+        disable-wp;
+        non-removable;
+        pinctrl-names = "default";
+        pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
+        vmmc-supply = <&vcc_io>;
+        status = "okay";
+};
+
 &gmac {
         assigned-clocks = <&cru SCLK_MAC>;
         assigned-clock-parents = <&ext_gmac>;
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index b9c05b57735e..eae5e1ee9cd8 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -861,24 +861,24 @@
                                 uart0 {
                                         pinctrl_uart0: uart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_NONE   /* conflicts with PWMFI2, ISI_D8 */
-                                                         AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* conflicts with ISI_PCK */
+                                                        <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* conflicts with PWMFI2, ISI_D8 */
+                                                         AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with ISI_PCK */
                                         };
                                 };
 
                                 uart1 {
                                         pinctrl_uart1: uart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE   /* conflicts with TWD0, ISI_VSYNC */
-                                                         AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* conflicts with TWCK0, ISI_HSYNC */
+                                                        <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* conflicts with TWD0, ISI_VSYNC */
+                                                         AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with TWCK0, ISI_HSYNC */
                                         };
                                 };
 
                                 usart0 {
                                         pinctrl_usart0: usart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PD17 periph A */
-                                                         AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PD18 periph A with pullup */
+                                                        <AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                                         AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_NONE>;
                                         };
 
                                         pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
@@ -891,8 +891,8 @@
                                 usart1 {
                                         pinctrl_usart1: usart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PB28 periph A */
-                                                         AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PB29 periph A with pullup */
+                                                        <AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                                         AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE>;
                                         };
 
                                         pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
@@ -905,8 +905,8 @@
                                 usart2 {
                                         pinctrl_usart2: usart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PE25 periph B, conflicts with A25 */
-                                                         AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PE26 periph B with pullup, conflicts NCS0 */
+                                                        <AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* conflicts with A25 */
+                                                         AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts NCS0 */
                                         };
 
                                         pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
@@ -919,8 +919,8 @@
                                 usart3 {
                                         pinctrl_usart3: usart3-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PE18 periph B, conflicts with A18 */
-                                                         AT91_PIOE 19 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PE19 periph B with pullup, conflicts with A19 */
+                                                        <AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* conflicts with A18 */
+                                                         AT91_PIOE 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with A19 */
                                         };
 
                                         pinctrl_usart3_rts_cts: usart3_rts_cts-0 {
diff --git a/arch/arm/boot/dts/sama5d34ek.dts b/arch/arm/boot/dts/sama5d34ek.dts
index c8b8449fdc3e..15d5c46013a4 100644
--- a/arch/arm/boot/dts/sama5d34ek.dts
+++ b/arch/arm/boot/dts/sama5d34ek.dts
@@ -38,7 +38,7 @@
                                 status = "okay";
 
                                 24c256@50 {
-                                        compatible = "24c256";
+                                        compatible = "atmel,24c256";
                                         reg = <0x50>;
                                         pagesize = <64>;
                                 };
diff --git a/arch/arm/boot/dts/sama5d3_uart.dtsi b/arch/arm/boot/dts/sama5d3_uart.dtsi
index 186377d41c91..f599f8a5f664 100644
--- a/arch/arm/boot/dts/sama5d3_uart.dtsi
+++ b/arch/arm/boot/dts/sama5d3_uart.dtsi
@@ -23,16 +23,16 @@
                                 uart0 {
                                         pinctrl_uart0: uart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_NONE   /* PC29 periph A, conflicts with PWMFI2, ISI_D8 */
-                                                         AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;      /* PC30 periph A with pullup, conflicts with ISI_PCK */
+                                                        <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* conflicts with PWMFI2, ISI_D8 */
+                                                         AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with ISI_PCK */
                                         };
                                 };
 
                                 uart1 {
                                         pinctrl_uart1: uart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE   /* PA30 periph B, conflicts with TWD0, ISI_VSYNC */
-                                                         AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;      /* PA31 periph B with pullup, conflicts with TWCK0, ISI_HSYNC */
+                                                        <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* conflicts with TWD0, ISI_VSYNC */
+                                                         AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with TWCK0, ISI_HSYNC */
                                         };
                                 };
                         };
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 373b3621b536..0cf9beddd556 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -1379,7 +1379,7 @@
                         pinctrl@fc06a000 {
                                 #address-cells = <1>;
                                 #size-cells = <1>;
-                                compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
+                                compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus";
                                 ranges = <0xfc068000 0xfc068000 0x100
                                           0xfc06a000 0xfc06a000 0x4000>;
                                 /* WARNING: revisit as pin spec has changed */
@@ -1926,8 +1926,8 @@
                                 uart0 {
                                         pinctrl_uart0: uart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOE 29 AT91_PERIPH_B AT91_PINCTRL_NONE           /* RXD */
-                                                         AT91_PIOE 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* TXD */
+                                                        <AT91_PIOE 29 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* RXD */
+                                                         AT91_PIOE 30 AT91_PERIPH_B AT91_PINCTRL_NONE           /* TXD */
                                                         >;
                                         };
                                 };
@@ -1935,8 +1935,8 @@
                                 uart1 {
                                         pinctrl_uart1: uart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOC 25 AT91_PERIPH_C AT91_PINCTRL_NONE           /* RXD */
-                                                         AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_PULL_UP        /* TXD */
+                                                        <AT91_PIOC 25 AT91_PERIPH_C AT91_PINCTRL_PULL_UP        /* RXD */
+                                                         AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_NONE           /* TXD */
                                                         >;
                                         };
                                 };
@@ -1944,8 +1944,8 @@
                                 usart0 {
                                         pinctrl_usart0: usart0-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE           /* RXD */
-                                                         AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* TXD */
+                                                        <AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* RXD */
+                                                         AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_NONE           /* TXD */
                                                         >;
                                         };
                                         pinctrl_usart0_rts: usart0_rts-0 {
@@ -1959,8 +1959,8 @@
                                 usart1 {
                                         pinctrl_usart1: usart1-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE           /* RXD */
-                                                         AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* TXD */
+                                                        <AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP        /* RXD */
+                                                         AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE           /* TXD */
                                                         >;
                                         };
                                         pinctrl_usart1_rts: usart1_rts-0 {
@@ -1974,8 +1974,8 @@
                                 usart2 {
                                         pinctrl_usart2: usart2-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_NONE            /* RXD - conflicts with G0_CRS, ISI_HSYNC */
-                                                         AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP         /* TXD - conflicts with G0_COL, PCK2 */
+                                                        <AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP         /* RXD - conflicts with G0_CRS, ISI_HSYNC */
+                                                         AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_NONE            /* TXD - conflicts with G0_COL, PCK2 */
                                                         >;
                                         };
                                         pinctrl_usart2_rts: usart2_rts-0 {
@@ -1989,8 +1989,8 @@
                                 usart3 {
                                         pinctrl_usart3: usart3-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOE 16 AT91_PERIPH_B AT91_PINCTRL_NONE           /* RXD */
-                                                         AT91_PIOE 17 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* TXD */
+                                                        <AT91_PIOE 16 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* RXD */
+                                                         AT91_PIOE 17 AT91_PERIPH_B AT91_PINCTRL_NONE           /* TXD */
                                                         >;
                                         };
                                 };
@@ -1998,8 +1998,8 @@
                                 usart4 {
                                         pinctrl_usart4: usart4-0 {
                                                 atmel,pins =
-                                                        <AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_NONE           /* RXD */
-                                                         AT91_PIOE 27 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* TXD */
+                                                        <AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_PULL_UP        /* RXD */
+                                                         AT91_PIOE 27 AT91_PERIPH_B AT91_PINCTRL_NONE           /* TXD */
                                                         >;
                                         };
                                         pinctrl_usart4_rts: usart4_rts-0 {
diff --git a/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi b/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
deleted file mode 100644
index dbdda36179ee..000000000000
--- a/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
+++ /dev/null
@@ -1,68 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Timings and Geometry for Samsung K3PE0E000B memory part
- */
-
-/ {
-        samsung_K3PE0E000B: lpddr2 {
-                compatible      = "Samsung,K3PE0E000B","jedec,lpddr2-s4";
-                density         = <4096>;
-                io-width        = <32>;
-
-                tRPab-min-tck   = <3>;
-                tRCD-min-tck    = <3>;
-                tWR-min-tck     = <3>;
-                tRASmin-min-tck = <3>;
-                tRRD-min-tck    = <2>;
-                tWTR-min-tck    = <2>;
-                tXP-min-tck     = <2>;
-                tRTP-min-tck    = <2>;
-                tCKE-min-tck    = <3>;
-                tCKESR-min-tck  = <3>;
-                tFAW-min-tck    = <8>;
-
-                timings_samsung_K3PE0E000B_533MHz: lpddr2-timings@0 {
-                        compatible      = "jedec,lpddr2-timings";
-                        min-freq        = <10000000>;
-                        max-freq        = <533333333>;
-                        tRPab           = <21000>;
-                        tRCD            = <18000>;
-                        tWR             = <15000>;
-                        tRAS-min        = <42000>;
-                        tRRD            = <10000>;
-                        tWTR            = <7500>;
-                        tXP             = <7500>;
-                        tRTP            = <7500>;
-                        tCKESR          = <15000>;
-                        tDQSCK-max      = <5500>;
-                        tFAW            = <50000>;
-                        tZQCS           = <90000>;
-                        tZQCL           = <360000>;
-                        tZQinit         = <1000000>;
-                        tRAS-max-ns     = <70000>;
-                        tDQSCK-max-derated = <6000>;
-                };
-
-                timings_samsung_K3PE0E000B_266MHz: lpddr2-timings@1 {
-                        compatible      = "jedec,lpddr2-timings";
-                        min-freq        = <10000000>;
-                        max-freq        = <266666666>;
-                        tRPab           = <21000>;
-                        tRCD            = <18000>;
-                        tWR             = <15000>;
-                        tRAS-min        = <42000>;
-                        tRRD            = <10000>;
-                        tWTR            = <7500>;
-                        tXP             = <7500>;
-                        tRTP            = <7500>;
-                        tCKESR          = <15000>;
-                        tDQSCK-max      = <5500>;
-                        tFAW            = <50000>;
-                        tZQCS           = <90000>;
-                        tZQCL           = <360000>;
-                        tZQinit         = <1000000>;
-                        tRAS-max-ns     = <70000>;
-                        tDQSCK-max-derated = <6000>;
-                };
-        };
-};
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index c42ca7022e8c..486d4e7433ed 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -831,7 +831,7 @@
                 timer@fffec600 {
                         compatible = "arm,cortex-a9-twd-timer";
                         reg = <0xfffec600 0x100>;
-                        interrupts = <1 13 0xf04>;
+                        interrupts = <1 13 0xf01>;
                         clocks = <&mpu_periph_clk>;
                 };
 
diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts
index a7a0f76e9cbc..62ce1cecbb1f 100644
--- a/arch/arm/boot/dts/stih407-b2120.dts
+++ b/arch/arm/boot/dts/stih407-b2120.dts
@@ -15,10 +15,10 @@
 
         chosen {
                 bootargs = "clk_ignore_unused";
-                linux,stdout-path = &sbc_serial0;
+                stdout-path = &sbc_serial0;
         };
 
-        memory {
+        memory@40000000 {
                 device_type = "memory";
                 reg = <0x40000000 0x80000000>;
         };
diff --git a/arch/arm/boot/dts/stih407-clock.dtsi b/arch/arm/boot/dts/stih407-clock.dtsi
index d0a24d9e517a..ea7833489832 100644
--- a/arch/arm/boot/dts/stih407-clock.dtsi
+++ b/arch/arm/boot/dts/stih407-clock.dtsi
@@ -7,33 +7,27 @@
  */
 #include <dt-bindings/clock/stih407-clks.h>
 / {
+        /*
+         * Fixed 30MHz oscillator inputs to SoC
+         */
+        clk_sysin: clk-sysin {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <30000000>;
+        };
+
+        clk_tmdsout_hdmi: clk-tmdsout-hdmi {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <0>;
+        };
+
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 ranges;
 
                 /*
-                 * Fixed 30MHz oscillator inputs to SoC
-                 */
-                clk_sysin: clk-sysin {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <30000000>;
-                };
-
-                /*
-                 * ARM Peripheral clock for timers
-                 */
-                arm_periph_clk: clk-m-a9-periphs {
-                        #clock-cells = <0>;
-                        compatible = "fixed-factor-clock";
-
-                        clocks = <&clk_m_a9>;
-                        clock-div = <2>;
-                        clock-mult = <1>;
-                };
-
-                /*
                  * A9 PLL.
                  */
                 clockgen-a9@92b0000 {
@@ -62,32 +56,19 @@
                                  <&clockgen_a9_pll 0>,
                                  <&clk_s_c0_flexgen 13>,
                                  <&clk_m_a9_ext2f_div2>;
-                };
 
-                /*
-                 * ARM Peripheral clock for timers
-                 */
-                clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2s {
-                        #clock-cells = <0>;
-                        compatible = "fixed-factor-clock";
-
-                        clocks = <&clk_s_c0_flexgen 13>;
-
-                        clock-output-names = "clk-m-a9-ext2f-div2";
 
-                        clock-div = <2>;
-                        clock-mult = <1>;
-                };
+                        /*
+                         * ARM Peripheral clock for timers
+                         */
+                        arm_periph_clk: clk-m-a9-periphs {
+                                #clock-cells = <0>;
+                                compatible = "fixed-factor-clock";
 
-                /*
-                 * Bootloader initialized system infrastructure clock for
-                 * serial devices.
-                 */
-                clk_ext2f_a9: clockgen-c0@13 {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <200000000>;
-                        clock-output-names = "clk-s-icn-reg-0";
+                                clocks = <&clk_m_a9>;
+                                clock-div = <2>;
+                                clock-mult = <1>;
+                        };
                 };
 
                 clockgen-a@90ff000 {
@@ -204,6 +185,21 @@
                                                  <CLK_EXT2F_A9>,
                                                  <CLK_ICN_LMI>,
                                                  <CLK_ICN_SBC>;
+
+                                /*
+                                 * ARM Peripheral clock for timers
+                                 */
+                                clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2s {
+                                        #clock-cells = <0>;
+                                        compatible = "fixed-factor-clock";
+
+                                        clocks = <&clk_s_c0_flexgen 13>;
+
+                                        clock-output-names = "clk-m-a9-ext2f-div2";
+
+                                        clock-div = <2>;
+                                        clock-mult = <1>;
+                                };
                         };
                 };
 
@@ -254,13 +250,7 @@
                                              "clk-s-d2-fs0-ch3";
                 };
 
-                clk_tmdsout_hdmi: clk-tmdsout-hdmi {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <0>;
-                };
-
-                clockgen-d2@x9106000 {
+                clockgen-d2@9106000 {
                         compatible = "st,clkgen-c32";
                         reg = <0x9106000 0x1000>;
 
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index cf3756976c39..f7362c31de29 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -92,7 +92,7 @@
                 clocks = <&arm_periph_clk>;
         };
 
-        l2: cache-controller {
+        l2: cache-controller@8762000 {
                 compatible = "arm,pl310-cache";
                 reg = <0x08762000 0x1000>;
                 arm,data-latency = <3 3 3>;
@@ -125,24 +125,28 @@
                 ranges;
                 compatible = "simple-bus";
 
-                restart {
+                restart: restart-controller@0 {
                         compatible = "st,stih407-restart";
+                        reg = <0 0>;
                         st,syscfg = <&syscfg_sbc_reg>;
                         status = "okay";
                 };
 
-                powerdown: powerdown-controller {
+                powerdown: powerdown-controller@0 {
                         compatible = "st,stih407-powerdown";
+                        reg = <0 0>;
                         #reset-cells = <1>;
                 };
 
-                softreset: softreset-controller {
+                softreset: softreset-controller@0 {
                         compatible = "st,stih407-softreset";
+                        reg = <0 0>;
                         #reset-cells = <1>;
                 };
 
-                picophyreset: picophyreset-controller {
+                picophyreset: picophyreset-controller@0 {
                         compatible = "st,stih407-picophyreset";
+                        reg = <0 0>;
                         #reset-cells = <1>;
                 };
 
@@ -174,6 +178,13 @@
                 syscfg_core: core-syscfg@92b0000 {
                         compatible = "st,stih407-core-syscfg", "syscon";
                         reg = <0x92b0000 0x1000>;
+
+                        sti_sasg_codec: sti-sasg-codec {
+                                compatible = "st,stih407-sas-codec";
+                                #sound-dai-cells = <1>;
+                                status = "disabled";
+                                st,syscfg = <&syscfg_core>;
+                        };
                 };
 
                 syscfg_lpm: lpm-syscfg@94b5100 {
@@ -181,8 +192,9 @@
                         reg = <0x94b5100 0x1000>;
                 };
 
-                irq-syscfg {
+                irq-syscfg@0 {
                         compatible    = "st,stih407-irq-syscfg";
+                        reg = <0 0>;
                         st,syscfg     = <&syscfg_core>;
                         st,irq-device = <ST_IRQ_SYSCFG_PMU_0>,
                                         <ST_IRQ_SYSCFG_PMU_1>;
@@ -380,8 +392,9 @@
                         status = "disabled";
                 };
 
-                usb2_picophy0: phy1 {
+                usb2_picophy0: phy1@0 {
                         compatible = "st,stih407-usb2-phy";
+                        reg = <0 0>;
                         #phy-cells = <0>;
                         st,syscfg = <&syscfg_core 0x100 0xf4>;
                         resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
@@ -389,12 +402,13 @@
                         reset-names = "global", "port";
                 };
 
-                miphy28lp_phy: miphy28lp@9b22000 {
+                miphy28lp_phy: miphy28lp@0 {
                         compatible = "st,miphy28lp-phy";
                         st,syscfg = <&syscfg_core>;
                         #address-cells  = <1>;
                         #size-cells     = <1>;
                         ranges;
+                        reg = <0 0>;
 
                         phy_port0: port@9b22000 {
                                 reg = <0x9b22000 0xff>,
@@ -805,6 +819,7 @@
 
                 st231_gp0: st231-gp0@0 {
                         compatible      = "st,st231-rproc";
+                        reg             = <0 0>;
                         memory-region   = <&gp0_reserved>;
                         resets          = <&softreset STIH407_ST231_GP0_SOFTRESET>;
                         reset-names     = "sw_reset";
@@ -818,6 +833,7 @@
 
                 st231_delta: st231-delta@0 {
                         compatible      = "st,st231-rproc";
+                        reg             = <0 0>;
                         memory-region   = <&delta_reserved>;
                         resets          = <&softreset STIH407_ST231_DMU_SOFTRESET>;
                         reset-names     = "sw_reset";
@@ -885,13 +901,6 @@
                         status = "disabled";
                 };
 
-                sti_sasg_codec: sti-sasg-codec {
-                        compatible = "st,stih407-sas-codec";
-                        #sound-dai-cells = <1>;
-                        status = "disabled";
-                        st,syscfg = <&syscfg_core>;
-                };
-
                 sti_uni_player0: sti-uni-player@8d80000 {
                         compatible = "st,stih407-uni-player-hdmi";
                         #sound-dai-cells = <0>;
@@ -980,8 +989,9 @@
                         status = "disabled";
                 };
 
-                delta0 {
+                delta0@0 {
                         compatible = "st,st-delta";
+                        reg = <0 0>;
                         clock-names = "delta",
                                       "delta-st231",
                                       "delta-flash-promip";
diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi
index a29090077fdf..53c6888d1fc0 100644
--- a/arch/arm/boot/dts/stih407-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi
@@ -45,7 +45,7 @@
         };
 
         soc {
-                pin-controller-sbc {
+                pin-controller-sbc@961f080 {
                         #address-cells = <1>;
                         #size-cells = <1>;
                         compatible = "st,stih407-sbc-pinctrl";
@@ -369,7 +369,7 @@
                         };
                 };
 
-                pin-controller-front0 {
+                pin-controller-front0@920f080 {
                         #address-cells = <1>;
                         #size-cells = <1>;
                         compatible = "st,stih407-front-pinctrl";
@@ -929,7 +929,7 @@
                         };
                 };
 
-                pin-controller-front1 {
+                pin-controller-front1@921f080 {
                         #address-cells = <1>;
                         #size-cells = <1>;
                         compatible = "st,stih407-front-pinctrl";
@@ -962,7 +962,7 @@
                         };
                 };
 
-                pin-controller-rear {
+                pin-controller-rear@922f080 {
                         #address-cells = <1>;
                         #size-cells = <1>;
                         compatible = "st,stih407-rear-pinctrl";
@@ -1157,7 +1157,7 @@
                         };
                 };
 
-                pin-controller-flash {
+                pin-controller-flash@923f080 {
                         #address-cells = <1>;
                         #size-cells = <1>;
                         compatible = "st,stih407-flash-pinctrl";
diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi
index 11fdecd9312e..57efc87dec2b 100644
--- a/arch/arm/boot/dts/stih407.dtsi
+++ b/arch/arm/boot/dts/stih407.dtsi
@@ -11,11 +11,11 @@
 #include <dt-bindings/gpio/gpio.h>
 / {
         soc {
-                sti-display-subsystem {
+                sti-display-subsystem@0 {
                         compatible = "st,sti-display-subsystem";
                         #address-cells = <1>;
                         #size-cells = <1>;
-
+                        reg = <0 0>;
                         assigned-clocks = <&clk_s_d2_quadfs 0>,
                                           <&clk_s_d2_quadfs 1>,
                                           <&clk_s_c0_pll1 0>,
@@ -107,6 +107,7 @@
                                 compatible = "st,stih407-hdmi";
                                 reg = <0x8d04000 0x1000>;
                                 reg-names = "hdmi-reg";
+                                #sound-dai-cells = <0>;
                                 interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>;
                                 interrupt-names = "irq";
                                 clock-names = "pix",
diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts
index 6c6b4cc37e97..2a5a9802a5ec 100644
--- a/arch/arm/boot/dts/stih410-b2120.dts
+++ b/arch/arm/boot/dts/stih410-b2120.dts
@@ -15,10 +15,10 @@
 
         chosen {
                 bootargs = "clk_ignore_unused";
-                linux,stdout-path = &sbc_serial0;
+                stdout-path = &sbc_serial0;
         };
 
-        memory {
+        memory@40000000 {
                 device_type = "memory";
                 reg = <0x40000000 0x80000000>;
         };
@@ -37,11 +37,11 @@
                         sd-uhs-ddr50;
                 };
 
-                usb2_picophy1: phy2 {
+                usb2_picophy1: phy2@0 {
                         status = "okay";
                 };
 
-                usb2_picophy2: phy3 {
+                usb2_picophy2: phy3@0 {
                         status = "okay";
                 };
 
@@ -61,7 +61,7 @@
                         status = "okay";
                 };
 
-                sti-display-subsystem {
+                sti-display-subsystem@0 {
                         sti-hda@8d02000 {
                                 status = "okay";
                         };
diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index 50d36758391c..155caa8c002a 100644
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -16,10 +16,10 @@
 
         chosen {
                 bootargs = "clk_ignore_unused";
-                linux,stdout-path = &uart1;
+                stdout-path = &uart1;
         };
 
-        memory {
+        memory@40000000 {
                 device_type = "memory";
                 reg = <0x40000000 0x40000000>;
         };
@@ -29,36 +29,54 @@
                 ethernet0 = &ethernet0;
         };
 
-        soc {
+        leds {
+                compatible = "gpio-leds";
+                user_green_1 {
+                        label = "User_green_1";
+                        gpios = <&pio1 3 GPIO_ACTIVE_LOW>;
+                        linux,default-trigger = "heartbeat";
+                        default-state = "off";
+                };
 
-                leds {
-                        compatible = "gpio-leds";
-                        user_green_1 {
-                                label = "User_green_1";
-                                gpios = <&pio1 3 GPIO_ACTIVE_LOW>;
-                                linux,default-trigger = "heartbeat";
-                                default-state = "off";
-                        };
+                user_green_2 {
+                        label = "User_green_2";
+                        gpios = <&pio4 1 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                };
 
-                        user_green_2 {
-                                label = "User_green_2";
-                                gpios = <&pio4 1 GPIO_ACTIVE_LOW>;
-                                default-state = "off";
-                        };
+                user_green_3 {
+                        label = "User_green_3";
+                        gpios = <&pio2 1 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                };
+
+                user_green_4 {
+                        label = "User_green_4";
+                        gpios = <&pio2 5 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                };
+        };
 
-                        user_green_3 {
-                                label = "User_green_3";
-                                gpios = <&pio2 1 GPIO_ACTIVE_LOW>;
-                                default-state = "off";
+        sound: sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "STI-B2260";
+                status = "okay";
+
+                simple-audio-card,dai-link0 {
+                        /* DAC */
+                        format = "i2s";
+                        mclk-fs = <128>;
+                        cpu {
+                                sound-dai = <&sti_uni_player0>;
                         };
 
-                        user_green_4 {
-                                label = "User_green_4";
-                                gpios = <&pio2 5 GPIO_ACTIVE_LOW>;
-                                default-state = "off";
+                        codec {
+                                sound-dai = <&sti_hdmi>;
                         };
                 };
+        };
 
+        soc {
                 /* Low speed expansion connector */
                 uart0: serial@9830000 {
                         label = "LS-UART0";
@@ -128,11 +146,11 @@
                         status = "okay";
                 };
 
-                usb2_picophy1: phy2 {
+                usb2_picophy1: phy2@0 {
                         status = "okay";
                 };
 
-                usb2_picophy2: phy3 {
+                usb2_picophy2: phy3@0 {
                         status = "okay";
                 };
 
@@ -182,26 +200,7 @@
                         status = "okay";
                 };
 
-                sound {
-                        compatible = "simple-audio-card";
-                        simple-audio-card,name = "STI-B2260";
-                        status = "okay";
-
-                        simple-audio-card,dai-link@0 {
-                                /* DAC */
-                                format = "i2s";
-                                mclk-fs = <128>;
-                                cpu {
-                                        sound-dai = <&sti_uni_player0>;
-                                };
-
-                                codec {
-                                        sound-dai = <&sti_hdmi>;
-                                };
-                        };
-                };
-
-                miphy28lp_phy: miphy28lp@9b22000 {
+                miphy28lp_phy: miphy28lp@0 {
 
                         phy_port1: port@9b2a000 {
                                 st,osc-force-ext;
diff --git a/arch/arm/boot/dts/stih410-clock.dtsi b/arch/arm/boot/dts/stih410-clock.dtsi
index fde5df17f575..5f11d09cb030 100644
--- a/arch/arm/boot/dts/stih410-clock.dtsi
+++ b/arch/arm/boot/dts/stih410-clock.dtsi
@@ -7,6 +7,22 @@
  */
 #include <dt-bindings/clock/stih410-clks.h>
 / {
+        /*
+         * Fixed 30MHz oscillator inputs to SoC
+         */
+        clk_sysin: clk-sysin {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <30000000>;
+                clock-output-names = "CLK_SYSIN";
+        };
+
+        clk_tmdsout_hdmi: clk-tmdsout-hdmi {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <0>;
+        };
+
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -15,27 +31,6 @@
                 compatible = "st,stih410-clk", "simple-bus";
 
                 /*
-                 * Fixed 30MHz oscillator inputs to SoC
-                 */
-                clk_sysin: clk-sysin {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <30000000>;
-                        clock-output-names = "CLK_SYSIN";
-                };
-
-                /*
-                 * ARM Peripheral clock for timers
-                 */
-                arm_periph_clk: clk-m-a9-periphs {
-                        #clock-cells = <0>;
-                        compatible = "fixed-factor-clock";
-                        clocks = <&clk_m_a9>;
-                        clock-div = <2>;
-                        clock-mult = <1>;
-                };
-
-                /*
                  * A9 PLL.
                  */
                 clockgen-a9@92b0000 {
@@ -64,32 +59,16 @@
                                  <&clockgen_a9_pll 0>,
                                  <&clk_s_c0_flexgen 13>,
                                  <&clk_m_a9_ext2f_div2>;
-                };
-
-                /*
-                 * ARM Peripheral clock for timers
-                 */
-                clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2s {
-                        #clock-cells = <0>;
-                        compatible = "fixed-factor-clock";
-
-                        clocks = <&clk_s_c0_flexgen 13>;
-
-                        clock-output-names = "clk-m-a9-ext2f-div2";
-
-                        clock-div = <2>;
-                        clock-mult = <1>;
-                };
-
-                /*
-                 * Bootloader initialized system infrastructure clock for
-                 * serial devices.
-                 */
-                clk_ext2f_a9: clockgen-c0@13 {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <200000000>;
-                        clock-output-names = "clk-s-icn-reg-0";
+                        /*
+                         * ARM Peripheral clock for timers
+                         */
+                        arm_periph_clk: clk-m-a9-periphs {
+                                #clock-cells = <0>;
+                                compatible = "fixed-factor-clock";
+                                clocks = <&clk_m_a9>;
+                                clock-div = <2>;
+                                clock-mult = <1>;
+                        };
                 };
 
                 clockgen-a@90ff000 {
@@ -214,6 +193,21 @@
                                                  <CLK_EXT2F_A9>,
                                                  <CLK_ICN_LMI>,
                                                  <CLK_ICN_SBC>;
+
+                                /*
+                                 * ARM Peripheral clock for timers
+                                 */
+                                clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2s {
+                                        #clock-cells = <0>;
+                                        compatible = "fixed-factor-clock";
+
+                                        clocks = <&clk_s_c0_flexgen 13>;
+
+                                        clock-output-names = "clk-m-a9-ext2f-div2";
+
+                                        clock-div = <2>;
+                                        clock-mult = <1>;
+                                };
                         };
                 };
 
@@ -266,13 +260,7 @@
                                              "clk-s-d2-fs0-ch3";
                 };
 
-                clk_tmdsout_hdmi: clk-tmdsout-hdmi {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <0>;
-                };
-
-                clockgen-d2@x9106000 {
+                clockgen-d2@9106000 {
                         compatible = "st,clkgen-c32";
                         reg = <0x9106000 0x1000>;
 
diff --git a/arch/arm/boot/dts/stih410-pinctrl.dtsi b/arch/arm/boot/dts/stih410-pinctrl.dtsi
index b3e9dfc81c07..5ae1fd66c0b8 100644
--- a/arch/arm/boot/dts/stih410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih410-pinctrl.dtsi
@@ -10,7 +10,7 @@
 / {
 
         soc {
-                pin-controller-rear {
+                pin-controller-rear@922f080 {
 
                         usb0 {
                                 pinctrl_usb0: usb2-0 {
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index 68b5ff91d6a7..3313005ee15c 100644
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -16,8 +16,9 @@
         };
 
         soc {
-                usb2_picophy1: phy2 {
+                usb2_picophy1: phy2@0 {
                         compatible = "st,stih407-usb2-phy";
+                        reg = <0 0>;
                         #phy-cells = <0>;
                         st,syscfg = <&syscfg_core 0xf8 0xf4>;
                         resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
@@ -27,8 +28,9 @@
                         status = "disabled";
                 };
 
-                usb2_picophy2: phy3 {
+                usb2_picophy2: phy3@0 {
                         compatible = "st,stih407-usb2-phy";
+                        reg = <0 0>;
                         #phy-cells = <0>;
                         st,syscfg = <&syscfg_core 0xfc 0xf4>;
                         resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
@@ -102,11 +104,12 @@
                         status = "disabled";
                 };
 
-                sti-display-subsystem {
+                sti-display-subsystem@0 {
                         compatible = "st,sti-display-subsystem";
                         #address-cells = <1>;
                         #size-cells = <1>;
 
+                        reg = <0 0>;
                         assigned-clocks = <&clk_s_d2_quadfs 0>,
                                           <&clk_s_d2_quadfs 1>,
                                           <&clk_s_c0_pll1 0>,
@@ -198,6 +201,7 @@
                                 compatible = "st,stih407-hdmi";
                                 reg = <0x8d04000 0x1000>;
                                 reg-names = "hdmi-reg";
+                                #sound-dai-cells = <0>;
                                 interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>;
                                 interrupt-names = "irq";
                                 clock-names = "pix",
@@ -235,7 +239,7 @@
                                          <&clk_s_d2_quadfs 1>;
                         };
 
-                        sti-hqvdp@9c000000 {
+                        sti-hqvdp@9c00000 {
                                 compatible = "st,stih407-hqvdp";
                                 reg = <0x9C00000 0x100000>;
                                 clock-names = "hqvdp", "pix_main";
@@ -273,7 +277,7 @@
                         interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;
                 };
 
-                delta0 {
+                delta0@0 {
                         compatible = "st,st-delta";
                         clock-names = "delta",
                                       "delta-st231",
diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
index 7f5f3252bfc7..cd0d719e31b7 100644
--- a/arch/arm/boot/dts/stih418-b2199.dts
+++ b/arch/arm/boot/dts/stih418-b2199.dts
@@ -15,10 +15,10 @@
 
         chosen {
                 bootargs = "clk_ignore_unused";
-                linux,stdout-path = &sbc_serial0;
+                stdout-path = &sbc_serial0;
         };
 
-        memory {
+        memory@40000000 {
                 device_type = "memory";
                 reg = <0x40000000 0xc0000000>;
         };
@@ -28,24 +28,24 @@
                 ethernet0 = &ethernet0;
         };
 
+        leds {
+                compatible = "gpio-leds";
+                red {
+                        label = "Front Panel LED";
+                        gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+                green {
+                        gpios = <&pio1 3 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+        };
+
         soc {
                 sbc_serial0: serial@9530000 {
                         status = "okay";
                 };
 
-                leds {
-                        compatible = "gpio-leds";
-                        red {
-                                label = "Front Panel LED";
-                                gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
-                                linux,default-trigger = "heartbeat";
-                        };
-                        green {
-                                gpios = <&pio1 3 GPIO_ACTIVE_HIGH>;
-                                default-state = "off";
-                        };
-                };
-
                 i2c@9842000 {
                         status = "okay";
                 };
@@ -88,7 +88,7 @@
                         non-removable;
                 };
 
-                miphy28lp_phy: miphy28lp@9b22000 {
+                miphy28lp_phy: miphy28lp@0 {
 
                         phy_port0: port@9b22000 {
                                 st,osc-rdy;
diff --git a/arch/arm/boot/dts/stih418-clock.dtsi b/arch/arm/boot/dts/stih418-clock.dtsi
index 9a157c1a99b1..13fb8db52fc1 100644
--- a/arch/arm/boot/dts/stih418-clock.dtsi
+++ b/arch/arm/boot/dts/stih418-clock.dtsi
@@ -7,6 +7,22 @@
  */
 #include <dt-bindings/clock/stih418-clks.h>
 / {
+        /*
+         * Fixed 30MHz oscillator inputs to SoC
+         */
+        clk_sysin: clk-sysin {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <30000000>;
+                clock-output-names = "CLK_SYSIN";
+        };
+
+        clk_tmdsout_hdmi: clk-tmdsout-hdmi {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <0>;
+        };
+
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -15,27 +31,6 @@
                 compatible = "st,stih418-clk", "simple-bus";
 
                 /*
-                 * Fixed 30MHz oscillator inputs to SoC
-                 */
-                clk_sysin: clk-sysin {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <30000000>;
-                        clock-output-names = "CLK_SYSIN";
-                };
-
-                /*
-                 * ARM Peripheral clock for timers
-                 */
-                arm_periph_clk: clk-m-a9-periphs {
-                        #clock-cells = <0>;
-                        compatible = "fixed-factor-clock";
-                        clocks = <&clk_m_a9>;
-                        clock-div = <2>;
-                        clock-mult = <1>;
-                };
-
-                /*
                  * A9 PLL.
                  */
                 clockgen-a9@92b0000 {
@@ -64,32 +59,17 @@
                                  <&clockgen_a9_pll 0>,
                                  <&clk_s_c0_flexgen 13>,
                                  <&clk_m_a9_ext2f_div2>;
-                };
-
-                /*
-                 * ARM Peripheral clock for timers
-                 */
-                clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2s {
-                        #clock-cells = <0>;
-                        compatible = "fixed-factor-clock";
-
-                        clocks = <&clk_s_c0_flexgen 13>;
 
-                        clock-output-names = "clk-m-a9-ext2f-div2";
-
-                        clock-div = <2>;
-                        clock-mult = <1>;
-                };
-
-                /*
-                 * Bootloader initialized system infrastructure clock for
-                 * serial devices.
-                 */
-                clk_ext2f_a9: clockgen-c0@13 {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <200000000>;
-                        clock-output-names = "clk-s-icn-reg-0";
+                        /*
+                         * ARM Peripheral clock for timers
+                         */
+                        arm_periph_clk: clk-m-a9-periphs {
+                                #clock-cells = <0>;
+                                compatible = "fixed-factor-clock";
+                                clocks = <&clk_m_a9>;
+                                clock-div = <2>;
+                                clock-mult = <1>;
+                        };
                 };
 
                 clockgen-a@90ff000 {
@@ -207,6 +187,21 @@
                                                      "clk-proc-mixer",
                                                      "clk-proc-sc",
                                                      "clk-avsp-hevc";
+
+                                /*
+                                 * ARM Peripheral clock for timers
+                                 */
+                                clk_m_a9_ext2f_div2: clk-m-a9-ext2f-div2s {
+                                        #clock-cells = <0>;
+                                        compatible = "fixed-factor-clock";
+
+                                        clocks = <&clk_s_c0_flexgen 13>;
+
+                                        clock-output-names = "clk-m-a9-ext2f-div2";
+
+                                        clock-div = <2>;
+                                        clock-mult = <1>;
+                                };
                         };
                 };
 
@@ -259,13 +254,7 @@
                                              "clk-s-d2-fs0-ch3";
                 };
 
-                clk_tmdsout_hdmi: clk-tmdsout-hdmi {
-                        #clock-cells = <0>;
-                        compatible = "fixed-clock";
-                        clock-frequency = <0>;
-                };
-
-                clockgen-d2@x9106000 {
+                clockgen-d2@9106000 {
                         compatible = "st,clkgen-c32";
                         reg = <0x9106000 0x1000>;
 
diff --git a/arch/arm/boot/dts/stih418.dtsi b/arch/arm/boot/dts/stih418.dtsi
index e6525ab4d9bb..0efb3cd6a86e 100644
--- a/arch/arm/boot/dts/stih418.dtsi
+++ b/arch/arm/boot/dts/stih418.dtsi
@@ -30,8 +30,9 @@
         };
 
         soc {
-                usb2_picophy1: phy2 {
+                usb2_picophy1: phy2@0 {
                         compatible = "st,stih407-usb2-phy";
+                        reg = <0 0>;
                         #phy-cells = <0>;
                         st,syscfg = <&syscfg_core 0xf8 0xf4>;
                         resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
@@ -39,8 +40,9 @@
                         reset-names = "global", "port";
                 };
 
-                usb2_picophy2: phy3 {
+                usb2_picophy2: phy3@0 {
                         compatible = "st,stih407-usb2-phy";
+                        reg = <0 0>;
                         #phy-cells = <0>;
                         st,syscfg = <&syscfg_core 0xfc 0xf4>;
                         resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index 7f80c2c414c8..c67edb1a8121 100644
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -10,23 +10,69 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/media/c8sectpfe.h>
 / {
-        soc {
-                sbc_serial0: serial@9530000 {
-                        status = "okay";
+        leds {
+                compatible = "gpio-leds";
+                red {
+                        label = "Front Panel LED";
+                        gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+                green {
+                        gpios = <&pio1 3 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+        };
+
+        sound: sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "STI-B2120";
+                status = "okay";
+
+                simple-audio-card,dai-link0 {
+                        /* HDMI */
+                        format = "i2s";
+                        mclk-fs = <128>;
+                        cpu {
+                                sound-dai = <&sti_uni_player0>;
+                        };
+
+                        codec {
+                                sound-dai = <&sti_hdmi>;
+                        };
+                };
+
+                simple-audio-card,dai-link1 {
+                        /* DAC */
+                        format = "i2s";
+                        mclk-fs = <256>;
+                        frame-inversion = <1>;
+                        cpu {
+                                sound-dai = <&sti_uni_player2>;
+                        };
+
+                        codec {
+                                sound-dai = <&sti_sasg_codec 1>;
+                        };
                 };
 
-                leds {
-                        compatible = "gpio-leds";
-                        red {
-                                label = "Front Panel LED";
-                                gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
-                                linux,default-trigger = "heartbeat";
+                simple-audio-card,dai-link2 {
+                        /* SPDIF */
+                        format = "left_j";
+                        mclk-fs = <128>;
+                        cpu {
+                                sound-dai = <&sti_uni_player3>;
                         };
-                        green {
-                                gpios = <&pio1 3 GPIO_ACTIVE_HIGH>;
-                                default-state = "off";
+
+                        codec {
+                                sound-dai = <&sti_sasg_codec 0>;
                         };
                 };
+        };
+
+        soc {
+                sbc_serial0: serial@9530000 {
+                        status = "okay";
+                };
 
                 pwm0: pwm@9810000 {
                         status = "okay";
@@ -80,7 +126,7 @@
                         st,i2c-min-sda-pulse-width-us = <5>;
                 };
 
-                miphy28lp_phy: miphy28lp@9b22000 {
+                miphy28lp_phy: miphy28lp@0 {
 
                         phy_port0: port@9b22000 {
                                 st,osc-rdy;
@@ -126,7 +172,7 @@
                         clock-names     = "c8sectpfe";
 
                         /* tsin0 is TSA on NIMA */
-                        tsin0: port@0 {
+                        tsin0: port {
                                 tsin-num        = <0>;
                                 serial-not-parallel;
                                 i2c-bus         = <&ssc2>;
@@ -147,53 +193,11 @@
                         status = "okay";
                 };
 
-                sti_sasg_codec: sti-sasg-codec {
-                        status = "okay";
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_spdif_out>;
-                };
-
-                sound {
-                        compatible = "simple-audio-card";
-                        simple-audio-card,name = "STI-B2120";
-                        status = "okay";
-
-                        simple-audio-card,dai-link@0 {
-                                /* HDMI */
-                                format = "i2s";
-                                mclk-fs = <128>;
-                                cpu {
-                                        sound-dai = <&sti_uni_player0>;
-                                };
-
-                                codec {
-                                        sound-dai = <&sti_hdmi>;
-                                };
-                        };
-                        simple-audio-card,dai-link@1 {
-                                /* DAC */
-                                format = "i2s";
-                                mclk-fs = <256>;
-                                frame-inversion = <1>;
-                                cpu {
-                                        sound-dai = <&sti_uni_player2>;
-                                };
-
-                                codec {
-                                        sound-dai = <&sti_sasg_codec 1>;
-                                };
-                        };
-                        simple-audio-card,dai-link@2 {
-                                /* SPDIF */
-                                format = "left_j";
-                                mclk-fs = <128>;
-                                cpu {
-                                        sound-dai = <&sti_uni_player3>;
-                                };
-
-                                codec {
-                                        sound-dai = <&sti_sasg_codec 0>;
-                                };
+                syscfg_core: core-syscfg@92b0000 {
+                        sti_sasg_codec: sti-sasg-codec {
+                                status = "okay";
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spdif_out>;
                         };
                 };
         };
diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts
index 293ecb957227..7eb786a2d624 100644
--- a/arch/arm/boot/dts/stm32429i-eval.dts
+++ b/arch/arm/boot/dts/stm32429i-eval.dts
@@ -144,6 +144,13 @@
                         };
                 };
         };
+
+        mmc_vcard: mmc_vcard {
+                compatible = "regulator-fixed";
+                regulator-name = "mmc_vcard";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
 };
 
 &adc {
@@ -254,6 +261,18 @@
         status = "okay";
 };
 
+&sdio {
+        status = "okay";
+        vmmc-supply = <&mmc_vcard>;
+        cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_HIGH>;
+        cd-inverted;
+        pinctrl-names = "default", "opendrain";
+        pinctrl-0 = <&sdio_pins>;
+        pinctrl-1 = <&sdio_pins_od>;
+        bus-width = <4>;
+        max-frequency = <12500000>;
+};
+
 &timers1 {
         status = "okay";
 
diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts
index 2d4e71717694..8c081eaf20fe 100644
--- a/arch/arm/boot/dts/stm32746g-eval.dts
+++ b/arch/arm/boot/dts/stm32746g-eval.dts
@@ -42,6 +42,7 @@
 
 /dts-v1/;
 #include "stm32f746.dtsi"
+#include "stm32f746-pinctrl.dtsi"
 #include <dt-bindings/input/input.h>
 
 / {
@@ -90,6 +91,13 @@
                 clocks = <&rcc 0 STM32F7_AHB1_CLOCK(OTGHSULPI)>;
                 clock-names = "main_clk";
         };
+
+        mmc_vcard: mmc_vcard {
+                compatible = "regulator-fixed";
+                regulator-name = "mmc_vcard";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
 };
 
 &clk_hse {
@@ -112,6 +120,16 @@
         status = "okay";
 };
 
+&sdio1 {
+        status = "okay";
+        vmmc-supply = <&mmc_vcard>;
+        broken-cd;
+        pinctrl-names = "default", "opendrain";
+        pinctrl-0 = <&sdio_pins_a>;
+        pinctrl-1 = <&sdio_pins_od_a>;
+        bus-width = <4>;
+};
+
 &usart1 {
         pinctrl-0 = <&usart1_pins_a>;
         pinctrl-names = "default";
@@ -119,7 +137,7 @@
 };
 
 &usbotg_hs {
-        dr_mode = "host";
+        dr_mode = "otg";
         phys = <&usbotg_hs_phy>;
         phy-names = "usb2-phy";
         pinctrl-0 = <&usbotg_hs_pins_a>;
diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
index ae94d86c53c4..35202896c093 100644
--- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
@@ -338,6 +338,37 @@
                                         slew-rate = <3>;
                                 };
                         };
+
+                        sdio_pins: sdio_pins@0 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDIO_D0 */
+                                                 <STM32_PINMUX('C', 9, AF12)>, /* SDIO_D1 */
+                                                 <STM32_PINMUX('C', 10, AF12)>, /* SDIO_D2 */
+                                                 <STM32_PINMUX('C', 11, AF12)>, /* SDIO_D3 */
+                                                 <STM32_PINMUX('C', 12, AF12)>, /* SDIO_CK */
+                                                 <STM32_PINMUX('D', 2, AF12)>; /* SDIO_CMD */
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+                        };
+
+                        sdio_pins_od: sdio_pins_od@0 {
+                                pins1 {
+                                        pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDIO_D0 */
+                                                 <STM32_PINMUX('C', 9, AF12)>, /* SDIO_D1 */
+                                                 <STM32_PINMUX('C', 10, AF12)>, /* SDIO_D2 */
+                                                 <STM32_PINMUX('C', 11, AF12)>, /* SDIO_D3 */
+                                                 <STM32_PINMUX('C', 12, AF12)>; /* SDIO_CK */
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+
+                                pins2 {
+                                        pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDIO_CMD */
+                                        drive-open-drain;
+                                        slew-rate = <2>;
+                                };
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 10099df8b73e..ede77e0f1c41 100644
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -511,6 +511,17 @@
                         };
                 };
 
+                sdio: sdio@40012c00 {
+                        compatible = "arm,pl180", "arm,primecell";
+                        arm,primecell-periphid = <0x00880180>;
+                        reg = <0x40012c00 0x400>;
+                        clocks = <&rcc 0 STM32F4_APB2_CLOCK(SDIO)>;
+                        clock-names = "apb_pclk";
+                        interrupts = <49>;
+                        max-frequency = <48000000>;
+                        status = "disabled";
+                };
+
                 syscfg: system-config@40013800 {
                         compatible = "syscon";
                         reg = <0x40013800 0x400>;
diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts
index c18acbe4cf4e..2f76726bf335 100644
--- a/arch/arm/boot/dts/stm32f469-disco.dts
+++ b/arch/arm/boot/dts/stm32f469-disco.dts
@@ -48,6 +48,8 @@
 /dts-v1/;
 #include "stm32f429.dtsi"
 #include "stm32f469-pinctrl.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
         model = "STMicroelectronics STM32F469i-DISCO board";
@@ -66,10 +68,46 @@
                 serial0 = &usart3;
         };
 
+        mmc_vcard: mmc_vcard {
+                compatible = "regulator-fixed";
+                regulator-name = "mmc_vcard";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
         soc {
                 dma-ranges = <0xc0000000 0x0 0x10000000>;
         };
 
+        leds {
+                compatible = "gpio-leds";
+                green {
+                        gpios = <&gpiog 6 GPIO_ACTIVE_LOW>;
+                        linux,default-trigger = "heartbeat";
+                };
+                orange {
+                        gpios = <&gpiod 4 GPIO_ACTIVE_LOW>;
+                };
+                red {
+                        gpios = <&gpiod 5 GPIO_ACTIVE_LOW>;
+                };
+                blue {
+                        gpios = <&gpiok 3 GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+                button@0 {
+                        label = "User";
+                        linux,code = <KEY_WAKEUP>;
+                        gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
+                };
+        };
+
         /* This turns on vbus for otg for host mode (dwc2) */
         vcc5v_otg: vcc5v-otg-regulator {
                 compatible = "regulator-fixed";
@@ -120,6 +158,18 @@
         };
 };
 
+&sdio {
+        status = "okay";
+        vmmc-supply = <&mmc_vcard>;
+        cd-gpios = <&gpiog 2 GPIO_ACTIVE_HIGH>;
+        cd-inverted;
+        broken-cd;
+        pinctrl-names = "default", "opendrain";
+        pinctrl-0 = <&sdio_pins>;
+        pinctrl-1 = <&sdio_pins_od>;
+        bus-width = <4>;
+};
+
 &usart3 {
         pinctrl-0 = <&usart3_pins_a>;
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
new file mode 100644
index 000000000000..9314128df185
--- /dev/null
+++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
@@ -0,0 +1,289 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
+ * Author: Alexandre Torgue  <alexandre.torgue@st.com> for STMicroelectronics.
+ */
+
+#include <dt-bindings/pinctrl/stm32-pinfunc.h>
+#include <dt-bindings/mfd/stm32f7-rcc.h>
+
+/ {
+        soc {
+                pinctrl: pin-controller {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0x40020000 0x3000>;
+                        interrupt-parent = <&exti>;
+                        st,syscfg = <&syscfg 0x8>;
+                        pins-are-numbered;
+
+                        gpioa: gpio@40020000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x0 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOA)>;
+                                st,bank-name = "GPIOA";
+                        };
+
+                        gpiob: gpio@40020400 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x400 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOB)>;
+                                st,bank-name = "GPIOB";
+                        };
+
+                        gpioc: gpio@40020800 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x800 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOC)>;
+                                st,bank-name = "GPIOC";
+                        };
+
+                        gpiod: gpio@40020c00 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0xc00 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOD)>;
+                                st,bank-name = "GPIOD";
+                        };
+
+                        gpioe: gpio@40021000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x1000 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOE)>;
+                                st,bank-name = "GPIOE";
+                        };
+
+                        gpiof: gpio@40021400 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x1400 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOF)>;
+                                st,bank-name = "GPIOF";
+                        };
+
+                        gpiog: gpio@40021800 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x1800 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOG)>;
+                                st,bank-name = "GPIOG";
+                        };
+
+                        gpioh: gpio@40021c00 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x1c00 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOH)>;
+                                st,bank-name = "GPIOH";
+                        };
+
+                        gpioi: gpio@40022000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x2000 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOI)>;
+                                st,bank-name = "GPIOI";
+                        };
+
+                        gpioj: gpio@40022400 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x2400 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOJ)>;
+                                st,bank-name = "GPIOJ";
+                        };
+
+                        gpiok: gpio@40022800 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x2800 0x400>;
+                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOK)>;
+                                st,bank-name = "GPIOK";
+                        };
+
+                        cec_pins_a: cec@0 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('A', 15, AF4)>; /* HDMI CEC */
+                                        slew-rate = <0>;
+                                        drive-open-drain;
+                                        bias-disable;
+                                };
+                        };
+
+                        usart1_pins_a: usart1@0 {
+                                pins1 {
+                                        pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
+                                        bias-disable;
+                                        drive-push-pull;
+                                        slew-rate = <0>;
+                                };
+                                pins2 {
+                                        pinmux = <STM32_PINMUX('A', 10, AF7)>; /* USART1_RX */
+                                        bias-disable;
+                                };
+                        };
+
+                        usart1_pins_b: usart1@1 {
+                                pins1 {
+                                        pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
+                                        bias-disable;
+                                        drive-push-pull;
+                                        slew-rate = <0>;
+                                };
+                                pins2 {
+                                        pinmux = <STM32_PINMUX('B', 7, AF7)>; /* USART1_RX */
+                                        bias-disable;
+                                };
+                        };
+
+                        i2c1_pins_b: i2c1@0 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('B', 9, AF4)>, /* I2C1 SDA */
+                                                 <STM32_PINMUX('B', 8, AF4)>; /* I2C1 SCL */
+                                        bias-disable;
+                                        drive-open-drain;
+                                        slew-rate = <0>;
+                                };
+                        };
+
+                        usbotg_hs_pins_a: usbotg-hs@0 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
+                                                 <STM32_PINMUX('I', 11, AF10)>, /* OTG_HS_ULPI_DIR */
+                                                 <STM32_PINMUX('C', 0, AF10)>, /* OTG_HS_ULPI_STP */
+                                                 <STM32_PINMUX('A', 5, AF10)>, /* OTG_HS_ULPI_CK */
+                                                 <STM32_PINMUX('A', 3, AF10)>, /* OTG_HS_ULPI_D0 */
+                                                 <STM32_PINMUX('B', 0, AF10)>, /* OTG_HS_ULPI_D1 */
+                                                 <STM32_PINMUX('B', 1, AF10)>, /* OTG_HS_ULPI_D2 */
+                                                 <STM32_PINMUX('B', 10, AF10)>, /* OTG_HS_ULPI_D3 */
+                                                 <STM32_PINMUX('B', 11, AF10)>, /* OTG_HS_ULPI_D4 */
+                                                 <STM32_PINMUX('B', 12, AF10)>, /* OTG_HS_ULPI_D5 */
+                                                 <STM32_PINMUX('B', 13, AF10)>, /* OTG_HS_ULPI_D6 */
+                                                 <STM32_PINMUX('B', 5, AF10)>; /* OTG_HS_ULPI_D7 */
+                                        bias-disable;
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+                        };
+
+                        usbotg_hs_pins_b: usbotg-hs@1 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
+                                                 <STM32_PINMUX('C', 2, AF10)>, /* OTG_HS_ULPI_DIR */
+                                                 <STM32_PINMUX('C', 0, AF10)>, /* OTG_HS_ULPI_STP */
+                                                 <STM32_PINMUX('A', 5, AF10)>, /* OTG_HS_ULPI_CK */
+                                                 <STM32_PINMUX('A', 3, AF10)>, /* OTG_HS_ULPI_D0 */
+                                                 <STM32_PINMUX('B', 0, AF10)>, /* OTG_HS_ULPI_D1 */
+                                                 <STM32_PINMUX('B', 1, AF10)>, /* OTG_HS_ULPI_D2 */
+                                                 <STM32_PINMUX('B', 10, AF10)>, /* OTG_HS_ULPI_D3 */
+                                                 <STM32_PINMUX('B', 11, AF10)>, /* OTG_HS_ULPI_D4 */
+                                                 <STM32_PINMUX('B', 12, AF10)>, /* OTG_HS_ULPI_D5 */
+                                                 <STM32_PINMUX('B', 13, AF10)>, /* OTG_HS_ULPI_D6 */
+                                                 <STM32_PINMUX('B', 5, AF10)>; /* OTG_HS_ULPI_D7 */
+                                        bias-disable;
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+                        };
+
+                        usbotg_fs_pins_a: usbotg-fs@0 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('A', 10, AF10)>, /* OTG_FS_ID */
+                                                 <STM32_PINMUX('A', 11, AF10)>, /* OTG_FS_DM */
+                                                 <STM32_PINMUX('A', 12, AF10)>; /* OTG_FS_DP */
+                                        bias-disable;
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+                        };
+
+                        sdio_pins_a: sdio_pins_a@0 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */
+                                                 <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */
+                                                 <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1 D2 */
+                                                 <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1 D3 */
+                                                 <STM32_PINMUX('C', 12, AF12)>, /* SDMMC1 CLK */
+                                                 <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1 CMD */
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+                        };
+
+                        sdio_pins_od_a: sdio_pins_od_a@0 {
+                                pins1 {
+                                        pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */
+                                                 <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */
+                                                 <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1 D2 */
+                                                 <STM32_PINMUX('C', 11, AF12)>, /* SDMMC1 D3 */
+                                                 <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1 CLK */
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+
+                                pins2 {
+                                        pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1 CMD */
+                                        drive-open-drain;
+                                        slew-rate = <2>;
+                                };
+                        };
+
+                        sdio_pins_b: sdio_pins_b@0 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
+                                                 <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
+                                                 <STM32_PINMUX('B', 3, AF10)>, /* SDMMC2 D2 */
+                                                 <STM32_PINMUX('B', 4, AF10)>, /* SDMMC2 D3 */
+                                                 <STM32_PINMUX('D', 6, AF11)>, /* SDMMC2 CLK */
+                                                 <STM32_PINMUX('D', 7, AF11)>; /* SDMMC2 CMD */
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+                        };
+
+                        sdio_pins_od_b: sdio_pins_od_b@0 {
+                                pins1 {
+                                        pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
+                                                 <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
+                                                 <STM32_PINMUX('B', 3, AF10)>, /* SDMMC2 D2 */
+                                                 <STM32_PINMUX('B', 4, AF10)>, /* SDMMC2 D3 */
+                                                 <STM32_PINMUX('D', 6, AF11)>; /* SDMMC2 CLK */
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+
+                                pins2 {
+                                        pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC2 CMD */
+                                        drive-open-drain;
+                                        slew-rate = <2>;
+                                };
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/stm32f746-disco.dts b/arch/arm/boot/dts/stm32f746-disco.dts
index 4d85dba59e1d..be94c6ad7e94 100644
--- a/arch/arm/boot/dts/stm32f746-disco.dts
+++ b/arch/arm/boot/dts/stm32f746-disco.dts
@@ -42,7 +42,9 @@
 
 /dts-v1/;
 #include "stm32f746.dtsi"
+#include "stm32f746-pinctrl.dtsi"
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
         model = "STMicroelectronics STM32F746-DISCO board";
@@ -75,12 +77,30 @@
                 regulator-name = "vcc5_host1";
                 regulator-always-on;
         };
+
+        mmc_vcard: mmc_vcard {
+                compatible = "regulator-fixed";
+                regulator-name = "mmc_vcard";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
 };
 
 &clk_hse {
         clock-frequency = <25000000>;
 };
 
+&sdio1 {
+        status = "okay";
+        vmmc-supply = <&mmc_vcard>;
+        cd-gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;
+        cd-inverted;
+        pinctrl-names = "default", "opendrain";
+        pinctrl-0 = <&sdio_pins_a>;
+        pinctrl-1 = <&sdio_pins_od_a>;
+        bus-width = <4>;
+};
+
 &usart1 {
         pinctrl-0 = <&usart1_pins_b>;
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/stm32f746-pinctrl.dtsi b/arch/arm/boot/dts/stm32f746-pinctrl.dtsi
new file mode 100644
index 000000000000..fcfd2ac7239b
--- /dev/null
+++ b/arch/arm/boot/dts/stm32f746-pinctrl.dtsi
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
+ * Author: Alexandre Torgue  <alexandre.torgue@st.com> for STMicroelectronics.
+ */
+
+#include "stm32f7-pinctrl.dtsi"
+
+&pinctrl{
+        compatible = "st,stm32f746-pinctrl";
+};
diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi
index 5f66d151eedb..4be2ee575b19 100644
--- a/arch/arm/boot/dts/stm32f746.dtsi
+++ b/arch/arm/boot/dts/stm32f746.dtsi
@@ -42,7 +42,6 @@
 
 #include "skeleton.dtsi"
 #include "armv7-m.dtsi"
-#include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <dt-bindings/clock/stm32fx-clock.h>
 #include <dt-bindings/mfd/stm32f7-rcc.h>
 
@@ -429,6 +428,28 @@
                         status = "disabled";
                 };
 
+                sdio2: sdio2@40011c00 {
+                        compatible = "arm,pl180", "arm,primecell";
+                        arm,primecell-periphid = <0x00880180>;
+                        reg = <0x40011c00 0x400>;
+                        clocks = <&rcc 0 STM32F7_APB2_CLOCK(SDMMC2)>;
+                        clock-names = "apb_pclk";
+                        interrupts = <103>;
+                        max-frequency = <48000000>;
+                        status = "disabled";
+                };
+
+                sdio1: sdio1@40012c00 {
+                        compatible = "arm,pl180", "arm,primecell";
+                        arm,primecell-periphid = <0x00880180>;
+                        reg = <0x40012c00 0x400>;
+                        clocks = <&rcc 0 STM32F7_APB2_CLOCK(SDMMC1)>;
+                        clock-names = "apb_pclk";
+                        interrupts = <49>;
+                        max-frequency = <48000000>;
+                        status = "disabled";
+                };
+
                 syscfg: system-config@40013800 {
                         compatible = "syscon";
                         reg = <0x40013800 0x400>;
@@ -498,222 +519,6 @@
                         reg = <0x40007000 0x400>;
                 };
 
-                pin-controller {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "st,stm32f746-pinctrl";
-                        ranges = <0 0x40020000 0x3000>;
-                        interrupt-parent = <&exti>;
-                        st,syscfg = <&syscfg 0x8>;
-                        pins-are-numbered;
-
-                        gpioa: gpio@40020000 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x0 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOA)>;
-                                st,bank-name = "GPIOA";
-                        };
-
-                        gpiob: gpio@40020400 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x400 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOB)>;
-                                st,bank-name = "GPIOB";
-                        };
-
-                        gpioc: gpio@40020800 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x800 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOC)>;
-                                st,bank-name = "GPIOC";
-                        };
-
-                        gpiod: gpio@40020c00 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0xc00 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOD)>;
-                                st,bank-name = "GPIOD";
-                        };
-
-                        gpioe: gpio@40021000 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x1000 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOE)>;
-                                st,bank-name = "GPIOE";
-                        };
-
-                        gpiof: gpio@40021400 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x1400 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOF)>;
-                                st,bank-name = "GPIOF";
-                        };
-
-                        gpiog: gpio@40021800 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x1800 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOG)>;
-                                st,bank-name = "GPIOG";
-                        };
-
-                        gpioh: gpio@40021c00 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x1c00 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOH)>;
-                                st,bank-name = "GPIOH";
-                        };
-
-                        gpioi: gpio@40022000 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x2000 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOI)>;
-                                st,bank-name = "GPIOI";
-                        };
-
-                        gpioj: gpio@40022400 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x2400 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOJ)>;
-                                st,bank-name = "GPIOJ";
-                        };
-
-                        gpiok: gpio@40022800 {
-                                gpio-controller;
-                                #gpio-cells = <2>;
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                                reg = <0x2800 0x400>;
-                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOK)>;
-                                st,bank-name = "GPIOK";
-                        };
-
-                        cec_pins_a: cec@0 {
-                                pins {
-                                        pinmux = <STM32_PINMUX('A', 15, AF4)>; /* HDMI CEC */
-                                        slew-rate = <0>;
-                                        drive-open-drain;
-                                        bias-disable;
-                                };
-                        };
-
-                        usart1_pins_a: usart1@0 {
-                                pins1 {
-                                        pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
-                                        bias-disable;
-                                        drive-push-pull;
-                                        slew-rate = <0>;
-                                };
-                                pins2 {
-                                        pinmux = <STM32_PINMUX('A', 10, AF7)>; /* USART1_RX */
-                                        bias-disable;
-                                };
-                        };
-
-                        usart1_pins_b: usart1@1 {
-                                pins1 {
-                                        pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
-                                        bias-disable;
-                                        drive-push-pull;
-                                        slew-rate = <0>;
-                                };
-                                pins2 {
-                                        pinmux = <STM32_PINMUX('B', 7, AF7)>; /* USART1_RX */
-                                        bias-disable;
-                                };
-                        };
-
-                        i2c1_pins_b: i2c1@0 {
-                                pins {
-                                        pinmux = <STM32_PINMUX('B', 9, AF4)>, /* I2C1 SDA */
-                                                 <STM32_PINMUX('B', 8, AF4)>; /* I2C1 SCL */
-                                        bias-disable;
-                                        drive-open-drain;
-                                        slew-rate = <0>;
-                                };
-                        };
-
-                        usbotg_hs_pins_a: usbotg-hs@0 {
-                                pins {
-                                        pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
-                                                 <STM32_PINMUX('I', 11, AF10)>, /* OTG_HS_ULPI_DIR */
-                                                 <STM32_PINMUX('C', 0, AF10)>, /* OTG_HS_ULPI_STP */
-                                                 <STM32_PINMUX('A', 5, AF10)>, /* OTG_HS_ULPI_CK */
-                                                 <STM32_PINMUX('A', 3, AF10)>, /* OTG_HS_ULPI_D0 */
-                                                 <STM32_PINMUX('B', 0, AF10)>, /* OTG_HS_ULPI_D1 */
-                                                 <STM32_PINMUX('B', 1, AF10)>, /* OTG_HS_ULPI_D2 */
-                                                 <STM32_PINMUX('B', 10, AF10)>, /* OTG_HS_ULPI_D3 */
-                                                 <STM32_PINMUX('B', 11, AF10)>, /* OTG_HS_ULPI_D4 */
-                                                 <STM32_PINMUX('B', 12, AF10)>, /* OTG_HS_ULPI_D5 */
-                                                 <STM32_PINMUX('B', 13, AF10)>, /* OTG_HS_ULPI_D6 */
-                                                 <STM32_PINMUX('B', 5, AF10)>; /* OTG_HS_ULPI_D7 */
-                                        bias-disable;
-                                        drive-push-pull;
-                                        slew-rate = <2>;
-                                };
-                        };
-
-                        usbotg_hs_pins_b: usbotg-hs@1 {
-                                pins {
-                                        pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
-                                                 <STM32_PINMUX('C', 2, AF10)>, /* OTG_HS_ULPI_DIR */
-                                                 <STM32_PINMUX('C', 0, AF10)>, /* OTG_HS_ULPI_STP */
-                                                 <STM32_PINMUX('A', 5, AF10)>, /* OTG_HS_ULPI_CK */
-                                                 <STM32_PINMUX('A', 3, AF10)>, /* OTG_HS_ULPI_D0 */
-                                                 <STM32_PINMUX('B', 0, AF10)>, /* OTG_HS_ULPI_D1 */
-                                                 <STM32_PINMUX('B', 1, AF10)>, /* OTG_HS_ULPI_D2 */
-                                                 <STM32_PINMUX('B', 10, AF10)>, /* OTG_HS_ULPI_D3 */
-                                                 <STM32_PINMUX('B', 11, AF10)>, /* OTG_HS_ULPI_D4 */
-                                                 <STM32_PINMUX('B', 12, AF10)>, /* OTG_HS_ULPI_D5 */
-                                                 <STM32_PINMUX('B', 13, AF10)>, /* OTG_HS_ULPI_D6 */
-                                                 <STM32_PINMUX('B', 5, AF10)>; /* OTG_HS_ULPI_D7 */
-                                        bias-disable;
-                                        drive-push-pull;
-                                        slew-rate = <2>;
-                                };
-                        };
-
-                        usbotg_fs_pins_a: usbotg-fs@0 {
-                                pins {
-                                        pinmux = <STM32_PINMUX('A', 10, AF10)>, /* OTG_FS_ID */
-                                                 <STM32_PINMUX('A', 11, AF10)>, /* OTG_FS_DM */
-                                                 <STM32_PINMUX('A', 12, AF10)>; /* OTG_FS_DP */
-                                        bias-disable;
-                                        drive-push-pull;
-                                        slew-rate = <2>;
-                                };
-                        };
-                };
-
                 crc: crc@40023000 {
                         compatible = "st,stm32f7-crc";
                         reg = <0x40023000 0x400>;
@@ -771,6 +576,9 @@
                         interrupts = <77>;
                         clocks = <&rcc 0 STM32F7_AHB1_CLOCK(OTGHS)>;
                         clock-names = "otg";
+                        g-rx-fifo-size = <256>;
+                        g-np-tx-fifo-size = <32>;
+                        g-tx-fifo-size = <128 128 64 64 64 64 32 32>;
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/stm32f769-disco.dts b/arch/arm/boot/dts/stm32f769-disco.dts
index 4463ca13a740..2241eecdabfe 100644
--- a/arch/arm/boot/dts/stm32f769-disco.dts
+++ b/arch/arm/boot/dts/stm32f769-disco.dts
@@ -42,11 +42,13 @@
 
 /dts-v1/;
 #include "stm32f746.dtsi"
+#include "stm32f769-pinctrl.dtsi"
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
         model = "STMicroelectronics STM32F769-DISCO board";
-        compatible = "st,stm32f769-disco", "st,stm32f7";
+        compatible = "st,stm32f769-disco", "st,stm32f769";
 
         chosen {
                 bootargs = "root=/dev/ram";
@@ -61,6 +63,42 @@
                 serial0 = &usart1;
         };
 
+        leds {
+                compatible = "gpio-leds";
+                green {
+                        gpios = <&gpioj 5 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+                red {
+                        gpios = <&gpioj 13 GPIO_ACTIVE_HIGH>;
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+                button@0 {
+                        label = "User";
+                        linux,code = <KEY_HOME>;
+                        gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
+                };
+        };
+
+        usbotg_hs_phy: usb-phy {
+                #phy-cells = <0>;
+                compatible = "usb-nop-xceiv";
+                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(OTGHSULPI)>;
+                clock-names = "main_clk";
+        };
+
+        mmc_vcard: mmc_vcard {
+                compatible = "regulator-fixed";
+                regulator-name = "mmc_vcard";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
 };
 
 &cec {
@@ -73,8 +111,33 @@
         clock-frequency = <25000000>;
 };
 
+&rtc {
+        status = "okay";
+};
+
+&sdio2 {
+        status = "okay";
+        vmmc-supply = <&mmc_vcard>;
+        cd-gpios = <&gpioi 15 GPIO_ACTIVE_HIGH>;
+        cd-inverted;
+        broken-cd;
+        pinctrl-names = "default", "opendrain";
+        pinctrl-0 = <&sdio_pins_b>;
+        pinctrl-1 = <&sdio_pins_od_b>;
+        bus-width = <4>;
+};
+
 &usart1 {
         pinctrl-0 = <&usart1_pins_a>;
         pinctrl-names = "default";
         status = "okay";
 };
+
+&usbotg_hs {
+        dr_mode = "otg";
+        phys = <&usbotg_hs_phy>;
+        phy-names = "usb2-phy";
+        pinctrl-0 = <&usbotg_hs_pins_a>;
+        pinctrl-names = "default";
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/stm32f769-pinctrl.dtsi b/arch/arm/boot/dts/stm32f769-pinctrl.dtsi
new file mode 100644
index 000000000000..31005dd9929c
--- /dev/null
+++ b/arch/arm/boot/dts/stm32f769-pinctrl.dtsi
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
+ * Author: Alexandre Torgue  <alexandre.torgue@st.com> for STMicroelectronics.
+ */
+
+#include "stm32f7-pinctrl.dtsi"
+
+&pinctrl{
+        compatible = "st,stm32f769-pinctrl";
+};
diff --git a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
index 65c1cd043987..0f15dfb98381 100644
--- a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
@@ -49,6 +49,8 @@
                         #size-cells = <1>;
                         compatible = "st,stm32h743-pinctrl";
                         ranges = <0 0x58020000 0x3000>;
+                        interrupt-parent = <&exti>;
+                        st,syscfg = <&syscfg 0x8>;
                         pins-are-numbered;
 
                         gpioa: gpio@58020000 {
@@ -57,6 +59,8 @@
                                 reg = <0x0 0x400>;
                                 clocks = <&rcc GPIOA_CK>;
                                 st,bank-name = "GPIOA";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpiob: gpio@58020400 {
@@ -65,6 +69,8 @@
                                 reg = <0x400 0x400>;
                                 clocks = <&rcc GPIOB_CK>;
                                 st,bank-name = "GPIOB";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpioc: gpio@58020800 {
@@ -73,6 +79,8 @@
                                 reg = <0x800 0x400>;
                                 clocks = <&rcc GPIOC_CK>;
                                 st,bank-name = "GPIOC";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpiod: gpio@58020c00 {
@@ -81,6 +89,8 @@
                                 reg = <0xc00 0x400>;
                                 clocks = <&rcc GPIOD_CK>;
                                 st,bank-name = "GPIOD";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpioe: gpio@58021000 {
@@ -89,6 +99,8 @@
                                 reg = <0x1000 0x400>;
                                 clocks = <&rcc GPIOE_CK>;
                                 st,bank-name = "GPIOE";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpiof: gpio@58021400 {
@@ -97,6 +109,8 @@
                                 reg = <0x1400 0x400>;
                                 clocks = <&rcc GPIOF_CK>;
                                 st,bank-name = "GPIOF";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpiog: gpio@58021800 {
@@ -105,6 +119,8 @@
                                 reg = <0x1800 0x400>;
                                 clocks = <&rcc GPIOG_CK>;
                                 st,bank-name = "GPIOG";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpioh: gpio@58021c00 {
@@ -113,6 +129,8 @@
                                 reg = <0x1c00 0x400>;
                                 clocks = <&rcc GPIOH_CK>;
                                 st,bank-name = "GPIOH";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpioi: gpio@58022000 {
@@ -121,6 +139,8 @@
                                 reg = <0x2000 0x400>;
                                 clocks = <&rcc GPIOI_CK>;
                                 st,bank-name = "GPIOI";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpioj: gpio@58022400 {
@@ -129,6 +149,8 @@
                                 reg = <0x2400 0x400>;
                                 clocks = <&rcc GPIOJ_CK>;
                                 st,bank-name = "GPIOJ";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         gpiok: gpio@58022800 {
@@ -137,6 +159,8 @@
                                 reg = <0x2800 0x400>;
                                 clocks = <&rcc GPIOK_CK>;
                                 st,bank-name = "GPIOK";
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
                         };
 
                         usart1_pins: usart1@0 {
@@ -164,6 +188,26 @@
                                         bias-disable;
                                 };
                         };
+
+                        usbotg_hs_pins_a: usbotg-hs@0 {
+                                pins {
+                                        pinmux = <STM32_PINMUX('H', 4, AF10)>,  /* ULPI_NXT */
+                                                         <STM32_PINMUX('I', 11, AF10)>, /* ULPI_DIR> */
+                                                         <STM32_PINMUX('C', 0, AF10)>,  /* ULPI_STP> */
+                                                         <STM32_PINMUX('A', 5, AF10)>,  /* ULPI_CK> */
+                                                         <STM32_PINMUX('A', 3, AF10)>,  /* ULPI_D0> */
+                                                         <STM32_PINMUX('B', 0, AF10)>,  /* ULPI_D1> */
+                                                         <STM32_PINMUX('B', 1, AF10)>,  /* ULPI_D2> */
+                                                         <STM32_PINMUX('B', 10, AF10)>, /* ULPI_D3> */
+                                                         <STM32_PINMUX('B', 11, AF10)>, /* ULPI_D4> */
+                                                         <STM32_PINMUX('B', 12, AF10)>, /* ULPI_D5> */
+                                                         <STM32_PINMUX('B', 13, AF10)>, /* ULPI_D6> */
+                                                         <STM32_PINMUX('B', 5, AF10)>;  /* ULPI_D7> */
+                                        bias-disable;
+                                        drive-push-pull;
+                                        slew-rate = <2>;
+                                };
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi
index bbfcbaca0b36..2bb103e1194d 100644
--- a/arch/arm/boot/dts/stm32h743.dtsi
+++ b/arch/arm/boot/dts/stm32h743.dtsi
@@ -44,6 +44,7 @@
 #include "armv7-m.dtsi"
 #include <dt-bindings/clock/stm32h7-clks.h>
 #include <dt-bindings/mfd/stm32h7-rcc.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
         clocks {
@@ -100,6 +101,27 @@
                         };
                 };
 
+                spi2: spi@40003800 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "st,stm32h7-spi";
+                        reg = <0x40003800 0x400>;
+                        interrupts = <36>;
+                        clocks = <&rcc SPI2_CK>;
+                        status = "disabled";
+
+                };
+
+                spi3: spi@40003c00 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "st,stm32h7-spi";
+                        reg = <0x40003c00 0x400>;
+                        interrupts = <51>;
+                        clocks = <&rcc SPI3_CK>;
+                        status = "disabled";
+                };
+
                 usart2: serial@40004400 {
                         compatible = "st,stm32f7-uart";
                         reg = <0x40004400 0x400>;
@@ -140,6 +162,36 @@
                         clocks = <&rcc USART1_CK>;
                 };
 
+                spi1: spi@40013000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "st,stm32h7-spi";
+                        reg = <0x40013000 0x400>;
+                        interrupts = <35>;
+                        clocks = <&rcc SPI1_CK>;
+                        status = "disabled";
+                };
+
+                spi4: spi@40013400 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "st,stm32h7-spi";
+                        reg = <0x40013400 0x400>;
+                        interrupts = <84>;
+                        clocks = <&rcc SPI4_CK>;
+                        status = "disabled";
+                };
+
+                spi5: spi@40015000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "st,stm32h7-spi";
+                        reg = <0x40015000 0x400>;
+                        interrupts = <85>;
+                        clocks = <&rcc SPI5_CK>;
+                        status = "disabled";
+                };
+
                 dma1: dma@40020000 {
                         compatible = "st,stm32-dma";
                         reg = <0x40020000 0x400>;
@@ -217,6 +269,27 @@
                         };
                 };
 
+                usbotg_hs: usb@40040000 {
+                        compatible = "st,stm32f7-hsotg";
+                        reg = <0x40040000 0x40000>;
+                        interrupts = <77>;
+                        clocks = <&rcc USB1OTG_CK>;
+                        clock-names = "otg";
+                        g-rx-fifo-size = <256>;
+                        g-np-tx-fifo-size = <32>;
+                        g-tx-fifo-size = <128 128 64 64 64 64 32 32>;
+                        status = "disabled";
+                };
+
+                usbotg_fs: usb@40080000 {
+                        compatible = "st,stm32f4x9-fsotg";
+                        reg = <0x40080000 0x40000>;
+                        interrupts = <101>;
+                        clocks = <&rcc USB2OTG_CK>;
+                        clock-names = "otg";
+                        status = "disabled";
+                };
+
                 mdma1: dma@52000000 {
                         compatible = "st,stm32h7-mdma";
                         reg = <0x52000000 0x1000>;
@@ -227,6 +300,29 @@
                         dma-requests = <32>;
                 };
 
+                exti: interrupt-controller@58000000 {
+                        compatible = "st,stm32h7-exti";
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        reg = <0x58000000 0x400>;
+                        interrupts = <1>, <2>, <3>, <6>, <7>, <8>, <9>, <10>, <23>, <40>, <41>, <62>, <76>;
+                };
+
+                syscfg: system-config@58000400 {
+                        compatible = "syscon";
+                        reg = <0x58000400 0x400>;
+                };
+
+                spi6: spi@58001400 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "st,stm32h7-spi";
+                        reg = <0x58001400 0x400>;
+                        interrupts = <86>;
+                        clocks = <&rcc SPI6_CK>;
+                        status = "disabled";
+                };
+
                 lptimer2: timer@58002400 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -304,7 +400,7 @@
                         };
                 };
 
-                vrefbuf: regulator@58003C00 {
+                vrefbuf: regulator@58003c00 {
                         compatible = "st,stm32-vrefbuf";
                         reg = <0x58003C00 0x8>;
                         clocks = <&rcc VREF_CK>;
@@ -313,6 +409,20 @@
                         status = "disabled";
                 };
 
+                rtc: rtc@58004000 {
+                        compatible = "st,stm32h7-rtc";
+                        reg = <0x58004000 0x400>;
+                        clocks = <&rcc RTCAPB_CK>, <&rcc RTC_CK>;
+                        clock-names = "pclk", "rtc_ck";
+                        assigned-clocks = <&rcc RTC_CK>;
+                        assigned-clock-parents = <&rcc LSE_CK>;
+                        interrupt-parent = <&exti>;
+                        interrupts = <17 IRQ_TYPE_EDGE_RISING>;
+                        interrupt-names = "alarm";
+                        st,syscfg = <&pwrcfg>;
+                        status = "disabled";
+                };
+
                 rcc: reset-clock-controller@58024400 {
                         compatible = "st,stm32h743-rcc", "st,stm32-rcc";
                         reg = <0x58024400 0x400>;
diff --git a/arch/arm/boot/dts/stm32h743i-disco.dts b/arch/arm/boot/dts/stm32h743i-disco.dts
index 79e841d94079..45e088c55741 100644
--- a/arch/arm/boot/dts/stm32h743i-disco.dts
+++ b/arch/arm/boot/dts/stm32h743i-disco.dts
@@ -63,7 +63,7 @@
 };
 
 &clk_hse {
-        clock-frequency = <125000000>;
+        clock-frequency = <25000000>;
 };
 
 &usart2 {
diff --git a/arch/arm/boot/dts/stm32h743i-eval.dts b/arch/arm/boot/dts/stm32h743i-eval.dts
index 9f0e72c67219..c7187e18ea16 100644
--- a/arch/arm/boot/dts/stm32h743i-eval.dts
+++ b/arch/arm/boot/dts/stm32h743i-eval.dts
@@ -68,6 +68,14 @@
                 regulator-max-microvolt = <3300000>;
                 regulator-always-on;
         };
+
+        usbotg_hs_phy: usb-phy {
+                #phy-cells = <0>;
+                compatible = "usb-nop-xceiv";
+                clocks = <&rcc USB1ULPI_CK>;
+                clock-names = "main_clk";
+        };
+
 };
 
 &adc_12 {
@@ -84,9 +92,21 @@
         clock-frequency = <25000000>;
 };
 
+&rtc {
+        status = "okay";
+};
+
 &usart1 {
         pinctrl-0 = <&usart1_pins>;
         pinctrl-names = "default";
         status = "okay";
 };
 
+&usbotg_hs {
+        pinctrl-0 = <&usbotg_hs_pins_a>;
+        pinctrl-names = "default";
+        phys = <&usbotg_hs_phy>;
+        phy-names = "usb2-phy";
+        dr_mode = "otg";
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
new file mode 100644
index 000000000000..c0743305f31b
--- /dev/null
+++ b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
+ * Author: Ludovic Barre <ludovic.barre@st.com> for STMicroelectronics.
+ */
+#include <dt-bindings/pinctrl/stm32-pinfunc.h>
+
+/ {
+        soc {
+                pinctrl: pin-controller {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "st,stm32mp157-pinctrl";
+                        ranges = <0 0x50002000 0xa400>;
+                        pins-are-numbered;
+
+                        gpioa: gpio@50002000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x0 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOA";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 0 16>;
+                        };
+
+                        gpiob: gpio@50003000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x1000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOB";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 16 16>;
+                        };
+
+                        gpioc: gpio@50004000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x2000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOC";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 32 16>;
+                        };
+
+                        gpiod: gpio@50005000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x3000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOD";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 48 16>;
+                        };
+
+                        gpioe: gpio@50006000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x4000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOE";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 64 16>;
+                        };
+
+                        gpiof: gpio@50007000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x5000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOF";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 80 16>;
+                        };
+
+                        gpiog: gpio@50008000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x6000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOG";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 96 16>;
+                        };
+
+                        gpioh: gpio@50009000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x7000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOH";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 112 16>;
+                        };
+
+                        gpioi: gpio@5000a000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x8000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOI";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 128 16>;
+                        };
+
+                        gpioj: gpio@5000b000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0x9000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOJ";
+                                ngpios = <16>;
+                                gpio-ranges = <&pinctrl 0 144 16>;
+                        };
+
+                        gpiok: gpio@5000c000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0xa000 0x400>;
+                                clocks = <&clk_pll3_p>;
+                                st,bank-name = "GPIOK";
+                                ngpios = <8>;
+                                gpio-ranges = <&pinctrl 0 160 8>;
+                        };
+
+                        uart4_pins_a: uart4@0 {
+                                pins1 {
+                                        pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */
+                                        bias-disable;
+                                        drive-push-pull;
+                                        slew-rate = <0>;
+                                };
+                                pins2 {
+                                        pinmux = <STM32_PINMUX('B', 2, AF8)>; /* UART4_RX */
+                                        bias-disable;
+                                };
+                        };
+                };
+
+                pinctrl_z: pin-controller-z {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "st,stm32mp157-z-pinctrl";
+                        ranges = <0 0x54004000 0x400>;
+                        pins-are-numbered;
+                        status = "disabled";
+
+                        gpioz: gpio@54004000 {
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                                reg = <0 0x400>;
+                                clocks = <&clk_pll2_p>;
+                                st,bank-name = "GPIOZ";
+                                st,bank-ioport = <11>;
+                                ngpios = <8>;
+                                gpio-ranges = <&pinctrl_z 0 400 8>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts
new file mode 100644
index 000000000000..9f90337a22e3
--- /dev/null
+++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
+ * Author: Ludovic Barre <ludovic.barre@st.com> for STMicroelectronics.
+ */
+/dts-v1/;
+
+#include "stm32mp157c.dtsi"
+#include "stm32mp157-pinctrl.dtsi"
+
+/ {
+        model = "STMicroelectronics STM32MP157C eval daughter";
+        compatible = "st,stm32mp157c-ed1", "st,stm32mp157";
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory {
+                reg = <0xC0000000 0x40000000>;
+        };
+
+        aliases {
+                serial0 = &uart4;
+        };
+};
+
+&uart4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart4_pins_a>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
new file mode 100644
index 000000000000..57e6dbc52e09
--- /dev/null
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
+ * Author: Ludovic Barre <ludovic.barre@st.com> for STMicroelectronics.
+ */
+/dts-v1/;
+
+#include "stm32mp157c-ed1.dts"
+
+/ {
+        model = "STMicroelectronics STM32MP157C eval daughter on eval mother";
+        compatible = "st,stm32mp157c-ev1", "st,stm32mp157c-ed1", "st,stm32mp157";
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        aliases {
+                serial0 = &uart4;
+        };
+};
diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi
new file mode 100644
index 000000000000..9e17e42b02b2
--- /dev/null
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
+ * Author: Ludovic Barre <ludovic.barre@st.com> for STMicroelectronics.
+ */
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu0: cpu@0 {
+                        compatible = "arm,cortex-a7";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu1: cpu@1 {
+                        compatible = "arm,cortex-a7";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        psci {
+                compatible = "arm,psci";
+                method = "smc";
+                cpu_off = <0x84000002>;
+                cpu_on = <0x84000003>;
+        };
+
+        aliases {
+                gpio0 = &gpioa;
+                gpio1 = &gpiob;
+                gpio2 = &gpioc;
+                gpio3 = &gpiod;
+                gpio4 = &gpioe;
+                gpio5 = &gpiof;
+                gpio6 = &gpiog;
+                gpio7 = &gpioh;
+                gpio8 = &gpioi;
+                gpio9 = &gpioj;
+                gpio10 = &gpiok;
+        };
+
+        intc: interrupt-controller@a0021000 {
+                compatible = "arm,cortex-a7-gic";
+                #interrupt-cells = <3>;
+                interrupt-controller;
+                reg = <0xa0021000 0x1000>,
+                      <0xa0022000 0x2000>;
+        };
+
+        timer {
+                compatible = "arm,armv7-timer";
+                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)>;
+                interrupt-parent = <&intc>;
+        };
+
+        clocks {
+                clk_hse: clk-hse {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <24000000>;
+                };
+
+                clk_pll_per: clk-pll-per {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <64000000>;
+                };
+
+                clk_hsi: clk-hsi {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <64000000>;
+                };
+
+                clk_lse: clk-lse {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <32768>;
+                };
+
+                clk_lsi: clk-lsi {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <32000>;
+                };
+
+                clk_csi: clk-csi {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <4000000>;
+                };
+
+                clk_pclk1: clk-pclk1 {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <86000000>;
+                };
+
+                clk_pll3_p: clk-pll3_p {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <172000000>;
+                };
+
+                clk_pll2_p: clk-pll2_p {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <264000000>;
+                };
+        };
+
+        soc {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                interrupt-parent = <&intc>;
+                ranges;
+
+                usart2: serial@4000e000 {
+                        compatible = "st,stm32h7-uart";
+                        reg = <0x4000e000 0x400>;
+                        interrupts = <GIC_SPI 38 IRQ_TYPE_NONE>;
+                        clocks = <&clk_pclk1>;
+                        status = "disabled";
+                };
+
+                usart3: serial@4000f000 {
+                        compatible = "st,stm32h7-uart";
+                        reg = <0x4000f000 0x400>;
+                        interrupts = <GIC_SPI 39 IRQ_TYPE_NONE>;
+                        clocks = <&clk_pclk1>;
+                        status = "disabled";
+                };
+
+                uart4: serial@40010000 {
+                        compatible = "st,stm32h7-uart";
+                        reg = <0x40010000 0x400>;
+                        interrupts = <GIC_SPI 52 IRQ_TYPE_NONE>;
+                        clocks = <&clk_pclk1>;
+                        status = "disabled";
+                };
+
+                uart5: serial@40011000 {
+                        compatible = "st,stm32h7-uart";
+                        reg = <0x40011000 0x400>;
+                        interrupts = <GIC_SPI 53 IRQ_TYPE_NONE>;
+                        clocks = <&clk_pclk1>;
+                        status = "disabled";
+                };
+
+                uart7: serial@40018000 {
+                        compatible = "st,stm32h7-uart";
+                        reg = <0x40018000 0x400>;
+                        interrupts = <GIC_SPI 82 IRQ_TYPE_NONE>;
+                        clocks = <&clk_pclk1>;
+                        status = "disabled";
+                };
+
+                uart8: serial@40019000 {
+                        compatible = "st,stm32h7-uart";
+                        reg = <0x40019000 0x400>;
+                        interrupts = <GIC_SPI 83 IRQ_TYPE_NONE>;
+                        clocks = <&clk_pclk1>;
+                        status = "disabled";
+                };
+
+                usart6: serial@44003000 {
+                        compatible = "st,stm32h7-uart";
+                        reg = <0x44003000 0x400>;
+                        interrupts = <GIC_SPI 71 IRQ_TYPE_NONE>;
+                        clocks = <&clk_pclk1>;
+                        status = "disabled";
+                };
+
+                usart1: serial@5c000000 {
+                        compatible = "st,stm32h7-uart";
+                        reg = <0x5c000000 0x400>;
+                        interrupts = <GIC_SPI 37 IRQ_TYPE_NONE>;
+                        clocks = <&clk_pclk1>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 09e909576c61..6c254ec4c85b 100644
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -164,8 +164,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
index 39ba4ccb9e2e..38a2c4134952 100644
--- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
+++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
@@ -106,8 +106,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts
index dfc88aee4fe3..cf7b392dff31 100644
--- a/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts
+++ b/arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts
@@ -123,8 +123,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index 1982c8c238c5..197a1f2b75ff 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -162,8 +162,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
index 147cbc5e08ac..896e27a08727 100644
--- a/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
+++ b/arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
@@ -150,8 +150,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
index 41ca8bded89f..ea7a59dcf8f9 100644
--- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
@@ -141,8 +141,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH01 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH01 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index f33e42d6ce8b..cc988ccd5ca7 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -106,8 +106,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
index 35c57d065dd8..f63767cddd8e 100644
--- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
@@ -78,8 +78,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts
index 9482e831a9a1..26d0c1d6a02b 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet1.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts
@@ -152,8 +152,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
index 4b5c91c8e85b..5d096528e75a 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
@@ -142,8 +142,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
index 13224f5ac166..221acd10f6c8 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
@@ -300,8 +300,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts b/arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts
index d22bd79562d8..80ecd78247ac 100644
--- a/arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts
@@ -106,8 +106,7 @@
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
index 879141ca6027..247fa27ef717 100644
--- a/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
+++ b/arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
@@ -133,8 +133,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-marsboard.dts b/arch/arm/boot/dts/sun4i-a10-marsboard.dts
index 435c551aef0f..0dbf69576512 100644
--- a/arch/arm/boot/dts/sun4i-a10-marsboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-marsboard.dts
@@ -132,8 +132,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
index 1b639e5f9172..f9d74e21031d 100644
--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
@@ -96,8 +96,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-mk802.dts b/arch/arm/boot/dts/sun4i-a10-mk802.dts
index 7198b34e2e50..059fe9c5d024 100644
--- a/arch/arm/boot/dts/sun4i-a10-mk802.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mk802.dts
@@ -56,12 +56,27 @@
         chosen {
                 stdout-path = "serial0:115200n8";
         };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
 };
 
 &codec {
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -70,11 +85,20 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-mk802ii.dts b/arch/arm/boot/dts/sun4i-a10-mk802ii.dts
index e460da2eb139..17dcdf031118 100644
--- a/arch/arm/boot/dts/sun4i-a10-mk802ii.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mk802ii.dts
@@ -82,8 +82,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
index 49247fbe6acd..b74a61496537 100644
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
@@ -97,7 +97,6 @@
                 864000  1300000
                 624000  1250000
                 >;
-        cooling-max-level = <2>;
 };
 
 &de {
@@ -165,8 +164,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index 6e140547b638..b97a0f2f20b9 100644
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -140,8 +140,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
index 5081303f79e7..84b25be1ac94 100644
--- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
@@ -138,8 +138,7 @@
 &mmc0 {
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 4f2f2eea0755..77e8436beed4 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -123,8 +123,6 @@
                                 624000  1250000
                                 >;
                         #cooling-cells = <2>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <3>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index d2dee8d434bf..39504d720efc 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -93,8 +93,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t003>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
-        cd-inverted;
+        cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index 16f839df4227..8d4fb9331212 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -104,8 +104,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
-        cd-inverted;
+        cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index 020aa9d6c31d..dd7fd5c3d76f 100644
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -92,8 +92,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_mk802>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
-        cd-inverted;
+        cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index da95118af4dc..2c902ed2c87a 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -201,8 +201,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
-        cd-inverted;
+        cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
         status = "okay";
 };
 
@@ -211,8 +210,7 @@
         pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
-        cd-inverted;
+        cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index 262b3669f04d..034853d1c08f 100644
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -80,8 +80,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_r7>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
-        cd-inverted;
+        cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index 5482be174e12..3f68ef5d92a0 100644
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -130,8 +130,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_wobo_i5>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
-        cd-inverted;
+        cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
index 3dbb0d7c2f8c..378214d8316e 100644
--- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
@@ -125,8 +125,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
-        cd-inverted;
+        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index 584fa579ded2..7ee0c3f6d7a1 100644
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -120,8 +120,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
-        cd-inverted;
+        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 3a831eaf1dfc..aa4b34fd9126 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -99,8 +99,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
-        cd-inverted;
+        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 4b9af423c6d5..437ad913a373 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -194,8 +194,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
-        cd-inverted;
+        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 4e830f5cb7f1..b1d827765530 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -116,8 +116,6 @@
                 432000  1200000
                 >;
         #cooling-cells = <2>;
-        cooling-min-level = <0>;
-        cooling-max-level = <5>;
 };
 
 &pio {
diff --git a/arch/arm/boot/dts/sun5i-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts
index 558c16a30543..5f0adc0f7bb4 100644
--- a/arch/arm/boot/dts/sun5i-gr8-evb.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts
@@ -236,8 +236,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_gr8_evb>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
-        cd-inverted;
+        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index 49229b3d5492..8acbaab14fe5 100644
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -127,8 +127,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v0>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
-        cd-inverted;
+        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 85eff0307ca4..939c497a6f70 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -117,8 +117,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>;
         vmmc-supply = <&reg_vcc3v0>;
         bus-width = <4>;
-        cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
-        cd-inverted;
+        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 19e382a11297..ce4f9e9834bf 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -218,8 +218,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
-        cd-inverted;
+        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index 010a84c7c012..d659be9dbc50 100644
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -58,6 +58,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -93,6 +104,10 @@
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -113,6 +128,16 @@
         };
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -124,8 +149,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_i7>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
-        cd-inverted;
+        cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
         status = "okay";
 };
 
@@ -161,6 +185,10 @@
         status = "okay";
 };
 
+&tcon0 {
+        status = "okay";
+};
+
 &uart0 {
         pinctrl-names = "default";
         pinctrl-0 = <&uart0_pins_a>;
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index 50605fd4449e..9698f6d38d03 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -107,8 +107,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
-        cd-inverted;
+        cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index 5219556e9f73..bb14b171b160 100644
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -107,8 +107,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
-        cd-inverted;
+        cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 72d3fe44ecaf..c72992556a86 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -113,8 +113,6 @@
                                 480000  1000000
                                 >;
                         #cooling-cells = <2>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <3>;
                 };
 
                 cpu@1 {
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index 0cdb38ab3377..4cb9664cdb29 100644
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -151,8 +151,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
-        cd-inverted;
+        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index 298476485bb4..da0ccf5a2c44 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -167,8 +167,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina31s>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */
-        cd-inverted;
+        cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index b2758dd8ce43..b8b79c0e9ee0 100644
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -120,8 +120,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 0 4 GPIO_ACTIVE_HIGH>; /* PA4 */
-        cd-inverted;
+        cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index f3edf9ca435c..aab6c1720ef7 100644
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -102,8 +102,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bs1078v2>;
         vmmc-supply = <&reg_vcc3v0>;
         bus-width = <4>;
-        cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
-        cd-inverted;
+        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
index 3cc4046b904a..4e72e4f3ef96 100644
--- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
@@ -69,8 +69,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_e708_q1>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
-        cd-inverted;
+        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index 4ed3162e3e5a..763cb03033c4 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -184,8 +184,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m1p>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
-        cd-inverted;
+        cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index 88a1c2363c6c..70dfc4ac0bb5 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -63,6 +63,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -109,6 +120,10 @@
                 >;
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -130,6 +145,16 @@
         };
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &i2c0 {
         pinctrl-names = "default";
         pinctrl-0 = <&i2c0_pins_a>;
@@ -159,8 +184,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
-        cd-inverted;
+        cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index e7af1b7c33d5..0898eb6162f5 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -158,8 +158,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapro>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
-        cd-inverted;
+        cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 39f43e4eb742..942ac9dfd4a5 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -165,8 +165,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 8c9bedc602ec..5649161de1d7 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -206,8 +206,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 6e6264cd69f8..1f0e5ecbf0c4 100644
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -163,8 +163,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v0>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 55809973a568..2e3f2f29d124 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -160,8 +160,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
index 794e7617f545..926fa194eb1b 100644
--- a/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
+++ b/arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
@@ -107,8 +107,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 8 5 GPIO_ACTIVE_HIGH>; /* PI5 */
-        cd-inverted;
+        cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
index 8a8a6dbcd414..1b05ba466e7d 100644
--- a/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
@@ -124,8 +124,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 442f3c755f36..b1ab7c1c33e3 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -227,8 +227,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_lamobo_r1>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
-        cd-inverted;
+        cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index 43c94787ef07..e91a209850bc 100644
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -120,8 +120,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
index f7413094183c..6109f794a9c1 100644
--- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts
+++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
@@ -66,12 +66,27 @@
         chosen {
                 stdout-path = "serial0:115200n8";
         };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
 };
 
 &codec {
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -80,6 +95,16 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+        remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &i2c0 {
         pinctrl-names = "default";
         pinctrl-0 = <&i2c0_pins_a>;
@@ -112,8 +137,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v0>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
index 64c8ef9a2756..f080f82b58ef 100644
--- a/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
@@ -61,6 +61,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -79,6 +90,10 @@
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -107,6 +122,16 @@
         };
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &i2c0 {
         pinctrl-names = "default";
         pinctrl-0 = <&i2c0_pins_a>;
@@ -190,8 +215,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
@@ -200,8 +224,7 @@
         pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olimex_som_evb>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
-        cd-inverted;
+        cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
new file mode 100644
index 000000000000..c56620a8fb20
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree Source for A20-SOM204-EVB-eMMC Board
+ *
+ * Copyright (C) 2018 Olimex Ltd.
+ *   Author: Stefan Mavrodiev <stefan@olimex.com>
+ */
+
+/dts-v1/;
+#include "sun7i-a20-olimex-som204-evb.dts"
+
+/ {
+        model = "Olimex A20-SOM204-EVB-eMMC";
+        compatible = "olimex,a20-olimex-som204-evb-emmc", "allwinner,sun7i-a20";
+
+        mmc2_pwrseq: mmc2_pwrseq {
+                compatible = "mmc-pwrseq-emmc";
+                reset-gpios = <&pio 2 16 GPIO_ACTIVE_LOW>;
+        };
+};
+
+&mmc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc2_pins_a>;
+        vmmc-supply = <&reg_vcc3v3>;
+        mmc-pwrseq = <&mmc2_pwrseq>;
+        bus-width = <4>;
+        non-removable;
+        status = "okay";
+
+        emmc: emmc@0 {
+                reg = <0>;
+                compatible = "mmc-card";
+                broken-hpi;
+        };
+};
diff --git a/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
new file mode 100644
index 000000000000..eae8e267b9ef
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
@@ -0,0 +1,335 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree Source for A20-SOM204-EVB Board
+ *
+ * Copyright (C) 2018 Olimex Ltd.
+ *   Author: Stefan Mavrodiev <stefan@olimex.com>
+ */
+
+/dts-v1/;
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/pwm/pwm.h>
+
+/ {
+        model = "Olimex A20-SOM204-EVB";
+        compatible = "olimex,a20-olimex-som204-evb", "allwinner,sun7i-a20";
+
+        aliases {
+                serial0 = &uart0;
+                serial1 = &uart4;
+                serial2 = &uart7;
+                spi0 = &spi1;
+                spi1 = &spi2;
+                ethernet1 = &rtl8723bs;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                stat {
+                        label = "a20-som204-evb:green:stat";
+                        gpios = <&pio 8 0 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                };
+
+                led1 {
+                        label = "a20-som204-evb:green:led1";
+                        gpios = <&pio 8 10 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                };
+
+                led2 {
+                        label = "a20-som204-evb:yellow:led2";
+                        gpios = <&pio 8 11 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                };
+        };
+
+        rtl_pwrseq: rtl_pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                reset-gpios = <&pio 6 9 GPIO_ACTIVE_LOW>;
+        };
+};
+
+&ahci {
+        target-supply = <&reg_ahci_5v>;
+        status = "okay";
+};
+
+&can0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&can0_pins_a>;
+        status = "okay";
+};
+
+&codec {
+        status = "okay";
+};
+
+&cpu0 {
+        cpu-supply = <&reg_dcdc2>;
+};
+
+&de {
+        status = "okay";
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ehci1 {
+        status = "okay";
+};
+
+&gmac {
+        pinctrl-names = "default";
+        pinctrl-0 = <&gmac_pins_rgmii_a>;
+        phy = <&phy3>;
+        phy-mode = "rgmii";
+        phy-supply = <&reg_vcc3v3>;
+
+        snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>;
+        snps,reset-active-low;
+        snps,reset-delays-us = <0 10000 1000000>;
+        status = "okay";
+
+        phy3: ethernet-phy@3 {
+                reg = <3>;
+        };
+};
+
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
+&i2c0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_pins_a>;
+        status = "okay";
+
+        axp209: pmic@34 {
+                reg = <0x34>;
+                interrupt-parent = <&nmi_intc>;
+                interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+        };
+};
+
+/* Exposed to UEXT1 */
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_pins_a>;
+        status = "okay";
+
+        eeprom: eeprom@50 {
+                compatible = "atmel,24c16";
+                reg = <0x50>;
+                pagesize = <16>;
+        };
+};
+
+/* Exposed to UEXT2 */
+&i2c2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c2_pins_a>;
+        status = "okay";
+};
+
+&ir0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&ir0_rx_pins_a>;
+        status = "okay";
+};
+
+&mmc0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc0_pins_a>;
+        vmmc-supply = <&reg_vcc3v3>;
+        bus-width = <4>;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>;
+        cd-inverted;
+        status = "okay";
+};
+
+&mmc3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc3_pins_a>;
+        vmmc-supply = <&reg_vcc3v3>;
+        mmc-pwrseq = <&rtl_pwrseq>;
+        bus-width = <4>;
+        non-removable;
+        status = "okay";
+
+        rtl8723bs: sdio_wifi@1 {
+                reg = <1>;
+        };
+};
+
+&ohci0 {
+        status = "okay";
+};
+
+&ohci1 {
+        status = "okay";
+};
+
+&otg_sram {
+        status = "okay";
+};
+
+&pio {
+        bt_uart_pins: bt_uart_pins@0 {
+                pins = "PG6", "PG7", "PG8";
+                function = "uart3";
+        };
+};
+
+#include "axp209.dtsi"
+
+&ac_power_supply {
+        status = "okay";
+};
+
+&battery_power_supply {
+        status = "okay";
+};
+
+&reg_ahci_5v {
+        gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&reg_dcdc2 {
+        regulator-always-on;
+        regulator-min-microvolt = <1000000>;
+        regulator-max-microvolt = <1400000>;
+        regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc3 {
+        regulator-always-on;
+        regulator-min-microvolt = <1000000>;
+        regulator-max-microvolt = <1400000>;
+        regulator-name = "vdd-int-dll";
+};
+
+&reg_ldo1 {
+        regulator-always-on;
+        regulator-min-microvolt = <1300000>;
+        regulator-max-microvolt = <1300000>;
+        regulator-name = "vdd-rtc";
+};
+
+&reg_ldo2 {
+        regulator-always-on;
+        regulator-min-microvolt = <3000000>;
+        regulator-max-microvolt = <3000000>;
+        regulator-name = "avcc";
+};
+
+&reg_ldo4 {
+        regulator-min-microvolt = <3300000>;
+        regulator-max-microvolt = <3300000>;
+        regulator-name = "vcc-pg";
+};
+
+&reg_usb0_vbus {
+        gpio = <&pio 2 17 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&reg_usb1_vbus {
+        status = "okay";
+};
+
+&reg_usb2_vbus {
+        status = "okay";
+};
+
+/* Exposed to UEXT1 */
+&spi1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spi1_pins_a>,
+                    <&spi1_cs0_pins_a>;
+        status = "okay";
+};
+
+/* Exposed to UEXT2 */
+&spi2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spi2_pins_a>,
+                    <&spi2_cs0_pins_a>;
+        status = "okay";
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_pins_a>;
+        status = "okay";
+};
+
+/* Used for RTL8723BS bluetooth */
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&bt_uart_pins>;
+        status = "okay";
+};
+
+/* Exposed to UEXT1 */
+&uart4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart4_pins_a>;
+        status = "okay";
+};
+
+/* Exposed to UEXT2 */
+&uart7 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart7_pins_a>;
+        status = "okay";
+};
+
+&usb_otg {
+        dr_mode = "otg";
+        status = "okay";
+};
+
+&usb_power_supply {
+        status = "okay";
+};
+
+&usbphy {
+        usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
+        usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
+        usb0_vbus_power-supply = <&usb_power_supply>;
+        usb0_vbus-supply = <&reg_usb0_vbus>;
+        usb1_vbus-supply = <&reg_usb1_vbus>;
+        usb2_vbus-supply = <&reg_usb2_vbus>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index edf9c3c6c0d7..d20fd03596e9 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -158,8 +158,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index ba250189d07f..b828677f331d 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -159,8 +159,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index dffbaa24b3ee..866d230593be 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -226,8 +226,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
@@ -236,8 +235,7 @@
         pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */
-        cd-inverted;
+        cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
index 7af4c8fc1865..f5c7178eb063 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
@@ -61,6 +61,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -98,6 +109,10 @@
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -119,6 +134,16 @@
         };
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &i2c0 {
         pinctrl-names = "default";
         pinctrl-0 = <&i2c0_pins_a>;
@@ -144,8 +169,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_orangepi>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
-        cd-inverted;
+        cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
         status = "okay";
 };
 
@@ -154,8 +178,7 @@
         pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_orangepi>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */
-        cd-inverted;
+        cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-orangepi.dts b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
index 0a8d4a05e8a0..7a4244e57589 100644
--- a/arch/arm/boot/dts/sun7i-a20-orangepi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-orangepi.dts
@@ -135,8 +135,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_orangepi>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
-        cd-inverted;
+        cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
index fb591f32252c..bfca960b03e0 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
@@ -158,8 +158,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index 777152a3df0f..c576f101fbde 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -159,8 +159,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
index f8d0aafb9f88..8202c87ca6a3 100644
--- a/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
@@ -154,8 +154,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
index 7f8405a0dd0f..ff5c1086585c 100644
--- a/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
+++ b/arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
@@ -123,8 +123,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index bd0cd3204273..e529e4ff2174 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -47,7 +47,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/thermal/thermal.h>
 #include <dt-bindings/dma/sun4i-a10.h>
-#include <dt-bindings/clock/sun4i-a10-ccu.h>
+#include <dt-bindings/clock/sun7i-a20-ccu.h>
 #include <dt-bindings/reset/sun4i-a10-ccu.h>
 
 / {
@@ -116,8 +116,6 @@
                                 144000  1000000
                                 >;
                         #cooling-cells = <2>;
-                        cooling-min-level = <0>;
-                        cooling-max-level = <6>;
                 };
 
                 cpu@1 {
@@ -1217,6 +1215,31 @@
                         #size-cells = <0>;
                 };
 
+                mali: gpu@1c40000 {
+                        compatible = "allwinner,sun7i-a20-mali", "arm,mali-400";
+                        reg = <0x01c40000 0x10000>;
+                        interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "gp",
+                                          "gpmmu",
+                                          "pp0",
+                                          "ppmmu0",
+                                          "pp1",
+                                          "ppmmu1",
+                                          "pmu";
+                        clocks = <&ccu CLK_AHB_GPU>, <&ccu CLK_GPU>;
+                        clock-names = "bus", "core";
+                        resets = <&ccu RST_GPU>;
+
+                        assigned-clocks = <&ccu CLK_GPU>;
+                        assigned-clock-rates = <384000000>;
+                };
+
                 gmac: ethernet@1c50000 {
                         compatible = "allwinner,sun7i-a20-gmac";
                         reg = <0x01c50000 0x10000>;
diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts
index 87289a60c520..8a93697df3a5 100644
--- a/arch/arm/boot/dts/sun8i-a23-evb.dts
+++ b/arch/arm/boot/dts/sun8i-a23-evb.dts
@@ -107,8 +107,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_evb>;
         vmmc-supply = <&reg_vcc3v0>;
         bus-width = <4>;
-        cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
-        cd-inverted;
+        cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index be9a6b8d7a1e..a1a1eb64caeb 100644
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -43,7 +43,6 @@
 
 /dts-v1/;
 #include "sun8i-a33.dtsi"
-#include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
@@ -62,8 +61,6 @@
 
         leds {
                 compatible = "gpio-leds";
-                pinctrl-names = "default";
-                pinctrl-0 = <&led_pin_olinuxino>;
 
                 green {
                         label = "a33-olinuxino:green:usr";
@@ -72,17 +69,24 @@
         };
 };
 
+&codec {
+        status = "okay";
+};
+
+&dai {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
 
 &mmc0 {
         pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
+        pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
-        cd-inverted;
+        cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
         status = "okay";
 };
 
@@ -90,23 +94,6 @@
         status = "okay";
 };
 
-&pio {
-        led_pin_olinuxino: led_pins@0 {
-                pins = "PB7";
-                function = "gpio_out";
-        };
-
-        mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
-                pins = "PB4";
-                function = "gpio_in";
-        };
-
-        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-                pins = "PB3";
-                function = "gpio_in";
-        };
-};
-
 &r_rsb {
         status = "okay";
 
@@ -122,6 +109,14 @@
 
 #include "axp223.dtsi"
 
+&ac_power_supply {
+        status = "okay";
+};
+
+&battery_power_supply {
+        status = "okay";
+};
+
 &reg_aldo1 {
         regulator-always-on;
         regulator-min-microvolt = <3300000>;
@@ -195,6 +190,21 @@
         vcc-lcd-supply = <&reg_dc1sw>;
 };
 
+&sound {
+        /* Board level jack widgets */
+        simple-audio-card,widgets = "Microphone", "Microphone Jack",
+                                    "Headphone", "Headphone Jack";
+        /* Board level routing. First 2 routes copied from SoC level */
+        simple-audio-card,routing =
+                "Left DAC", "AIF1 Slot 0 Left",
+                "Right DAC", "AIF1 Slot 0 Right",
+                "HP", "HPCOM",
+                "Headphone Jack", "HP",
+                "MIC1", "Microphone Jack",
+                "Microphone Jack", "MBIAS";
+        status = "okay";
+};
+
 &uart0 {
         pinctrl-names = "default";
         pinctrl-0 = <&uart0_pins_b>;
@@ -211,8 +221,6 @@
 };
 
 &usbphy {
-        pinctrl-names = "default";
-        pinctrl-0 = <&usb0_id_detect_pin>;
         usb0_id_det-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
         usb0_vbus_power-supply = <&usb_power_supply>;
         usb0_vbus-supply = <&reg_drivevbus>;
diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 433cf2a2a9a2..541acb4d2b91 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -144,8 +144,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
-        cd-inverted;
+        cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 50eb84fa246a..a21f2ed07a52 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -289,7 +289,6 @@
                         clock-names = "ahb", "mod",
                                       "ram";
                         resets = <&ccu RST_BUS_DE_FE>;
-                        status = "disabled";
 
                         ports {
                                 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
index 5091cecbcd1e..36ecebaff3c0 100644
--- a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
@@ -87,9 +87,8 @@
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         bus-width = <4>;
-        cd-inverted;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
index 6550bf0e594b..3b579d7567c8 100644
--- a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
@@ -60,6 +60,31 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                blue {
+                        label = "bananapi-m3:blue:usr";
+                        gpios = <&axp_gpio 1 GPIO_ACTIVE_HIGH>;
+                };
+
+                green {
+                        label = "bananapi-m3:green:usr";
+                        gpios = <&axp_gpio 0 GPIO_ACTIVE_HIGH>;
+                };
+        };
+
         reg_usb1_vbus: reg-usb1-vbus {
                 compatible = "regulator-fixed";
                 regulator-name = "usb1-vbus";
@@ -82,6 +107,10 @@
         };
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         /* Terminus Tech FE 1.1s 4-port USB 2.0 hub here */
         status = "okay";
@@ -100,6 +129,16 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &mdio {
         rgmii_phy: ethernet-phy@1 {
                 compatible = "ethernet-phy-ieee802.3-c22";
@@ -112,8 +151,7 @@
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
index 6da08cd0e107..88decb0747ac 100644
--- a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
@@ -176,8 +176,7 @@
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
index 511fca491fe8..1537ce148cc1 100644
--- a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts
@@ -128,6 +128,14 @@
         };
 };
 
+&cpu0 {
+        cpu-supply = <&reg_dcdc2>;
+};
+
+&cpu100 {
+        cpu-supply = <&reg_dcdc3>;
+};
+
 &de {
         status = "okay";
 };
@@ -231,6 +239,10 @@
 
 #include "axp81x.dtsi"
 
+&battery_power_supply {
+        status = "okay";
+};
+
 &reg_aldo1 {
         regulator-min-microvolt = <1800000>;
         regulator-max-microvolt = <1800000>;
diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index 7f4955a5fab7..568307639be8 100644
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -60,51 +60,63 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                cpu@0 {
+                cpu0: cpu@0 {
+                        clocks = <&ccu CLK_C0CPUX>;
+                        clock-names = "cpu";
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        operating-points-v2 = <&cpu0_opp_table>;
                         reg = <0>;
                 };
 
                 cpu@1 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        operating-points-v2 = <&cpu0_opp_table>;
                         reg = <1>;
                 };
 
                 cpu@2 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        operating-points-v2 = <&cpu0_opp_table>;
                         reg = <2>;
                 };
 
                 cpu@3 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        operating-points-v2 = <&cpu0_opp_table>;
                         reg = <3>;
                 };
 
-                cpu@100 {
+                cpu100: cpu@100 {
+                        clocks = <&ccu CLK_C1CPUX>;
+                        clock-names = "cpu";
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        operating-points-v2 = <&cpu1_opp_table>;
                         reg = <0x100>;
                 };
 
                 cpu@101 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        operating-points-v2 = <&cpu1_opp_table>;
                         reg = <0x101>;
                 };
 
                 cpu@102 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        operating-points-v2 = <&cpu1_opp_table>;
                         reg = <0x102>;
                 };
 
                 cpu@103 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        operating-points-v2 = <&cpu1_opp_table>;
                         reg = <0x103>;
                 };
         };
@@ -155,7 +167,7 @@
 
         de: display-engine {
                 compatible = "allwinner,sun8i-a83t-display-engine";
-                allwinner,pipelines = <&mixer0>;
+                allwinner,pipelines = <&mixer0>, <&mixer1>;
                 status = "disabled";
         };
 
@@ -164,6 +176,112 @@
                 device_type = "memory";
         };
 
+        cpu0_opp_table: opp_table0 {
+                compatible = "operating-points-v2";
+                opp-shared;
+
+                opp-480000000 {
+                        opp-hz = /bits/ 64 <480000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-600000000 {
+                        opp-hz = /bits/ 64 <600000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-720000000 {
+                        opp-hz = /bits/ 64 <720000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-864000000 {
+                        opp-hz = /bits/ 64 <864000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-912000000 {
+                        opp-hz = /bits/ 64 <912000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-1008000000 {
+                        opp-hz = /bits/ 64 <1008000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-1128000000 {
+                        opp-hz = /bits/ 64 <1128000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-1200000000 {
+                        opp-hz = /bits/ 64 <1200000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+        };
+
+        cpu1_opp_table: opp_table1 {
+                compatible = "operating-points-v2";
+                opp-shared;
+
+                opp-480000000 {
+                        opp-hz = /bits/ 64 <480000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-600000000 {
+                        opp-hz = /bits/ 64 <600000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-720000000 {
+                        opp-hz = /bits/ 64 <720000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-864000000 {
+                        opp-hz = /bits/ 64 <864000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-912000000 {
+                        opp-hz = /bits/ 64 <912000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-1008000000 {
+                        opp-hz = /bits/ 64 <1008000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-1128000000 {
+                        opp-hz = /bits/ 64 <1128000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+
+                opp-1200000000 {
+                        opp-hz = /bits/ 64 <1200000000>;
+                        opp-microvolt = <840000>;
+                        clock-latency-ns = <244144>; /* 8 32k periods */
+                };
+        };
+
         soc {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -208,6 +326,29 @@
                         };
                 };
 
+                mixer1: mixer@1200000 {
+                        compatible = "allwinner,sun8i-a83t-de2-mixer-1";
+                        reg = <0x01200000 0x100000>;
+                        clocks = <&display_clocks CLK_BUS_MIXER1>,
+                                 <&display_clocks CLK_MIXER1>;
+                        clock-names = "bus",
+                                      "mod";
+                        resets = <&display_clocks RST_WB>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                mixer1_out: port@1 {
+                                        reg = <1>;
+
+                                        mixer1_out_tcon1: endpoint {
+                                                remote-endpoint = <&tcon1_in_mixer1>;
+                                        };
+                                };
+                        };
+                };
+
                 syscon: syscon@1c00000 {
                         compatible = "allwinner,sun8i-a83t-system-controller",
                                 "syscon";
@@ -256,6 +397,40 @@
                         };
                 };
 
+                tcon1: lcd-controller@1c0d000 {
+                        compatible = "allwinner,sun8i-a83t-tcon-tv";
+                        reg = <0x01c0d000 0x1000>;
+                        interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_TCON1>, <&ccu CLK_TCON1>;
+                        clock-names = "ahb", "tcon-ch1";
+                        resets = <&ccu RST_BUS_TCON1>;
+                        reset-names = "lcd";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                tcon1_in: port@0 {
+                                        reg = <0>;
+
+                                        tcon1_in_mixer1: endpoint {
+                                                remote-endpoint = <&mixer1_out_tcon1>;
+                                        };
+                                };
+
+                                tcon1_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        tcon1_out_hdmi: endpoint@1 {
+                                                reg = <1>;
+                                                remote-endpoint = <&hdmi_in_tcon1>;
+                                        };
+                                };
+                        };
+                };
+
                 mmc0: mmc@1c0f000 {
                         compatible = "allwinner,sun8i-a83t-mmc",
                                      "allwinner,sun7i-a20-mmc";
@@ -427,6 +602,11 @@
                                 drive-strength = <40>;
                         };
 
+                        hdmi_pins: hdmi-pins {
+                                pins = "PH6", "PH7", "PH8";
+                                function = "hdmi";
+                        };
+
                         i2c0_pins: i2c0-pins {
                                 pins = "PH0", "PH1";
                                 function = "i2c0";
@@ -685,6 +865,50 @@
                         interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>;
                 };
 
+                hdmi: hdmi@1ee0000 {
+                        compatible = "allwinner,sun8i-a83t-dw-hdmi";
+                        reg = <0x01ee0000 0x10000>;
+                        reg-io-width = <1>;
+                        interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>,
+                                 <&ccu CLK_HDMI>;
+                        clock-names = "iahb", "isfr", "tmds";
+                        resets = <&ccu RST_BUS_HDMI1>;
+                        reset-names = "ctrl";
+                        phys = <&hdmi_phy>;
+                        phy-names = "hdmi-phy";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&hdmi_pins>;
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                hdmi_in: port@0 {
+                                        reg = <0>;
+
+                                        hdmi_in_tcon1: endpoint {
+                                                remote-endpoint = <&tcon1_out_hdmi>;
+                                        };
+                                };
+
+                                hdmi_out: port@1 {
+                                        reg = <1>;
+                                };
+                        };
+                };
+
+                hdmi_phy: hdmi-phy@1ef0000 {
+                        compatible = "allwinner,sun8i-a83t-hdmi-phy";
+                        reg = <0x01ef0000 0x10000>;
+                        clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_SLOW>;
+                        clock-names = "bus", "mod";
+                        resets = <&ccu RST_BUS_HDMI0>;
+                        reset-names = "phy";
+                        #phy-cells = <0>;
+                };
+
                 r_intc: interrupt-controller@1f00c00 {
                         compatible = "allwinner,sun8i-a83t-r-intc",
                                      "allwinner,sun6i-a31-r-intc";
diff --git a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
new file mode 100644
index 000000000000..7d01f9322658
--- /dev/null
+++ b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io>
+ *
+ * Based on sun8i-h3-bananapi-m2-plus.dts, which is:
+ *   Copyright (C) 2016 Chen-Yu Tsai <wens@csie.org>
+ */
+
+/dts-v1/;
+#include "sun8i-h3.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+        model = "Banana Pi BPI-M2-Zero";
+        compatible = "sinovoip,bpi-m2-zero", "allwinner,sun8i-h2-plus";
+
+        aliases {
+                serial0 = &uart0;
+                serial1 = &uart1;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+
+                pwr_led {
+                        label = "bananapi-m2-zero:red:pwr";
+                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
+                        default-state = "on";
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                pinctrl-names = "default";
+
+                sw4 {
+                        label = "power";
+                        linux,code = <BTN_0>;
+                        gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        wifi_pwrseq: wifi_pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                pinctrl-names = "default";
+                reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
+        };
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&mmc0 {
+        vmmc-supply = <&reg_vcc3v3>;
+        bus-width = <4>;
+        /*
+         * On the production batch of this board the card detect GPIO is
+         * high active (card inserted), although on the early samples it's
+         * low active.
+         */
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
+        status = "okay";
+};
+
+&mmc1 {
+        vmmc-supply = <&reg_vcc3v3>;
+        vqmmc-supply = <&reg_vcc3v3>;
+        mmc-pwrseq = <&wifi_pwrseq>;
+        bus-width = <4>;
+        non-removable;
+        status = "okay";
+
+        brcmf: wifi@1 {
+                reg = <1>;
+                compatible = "brcm,bcm4329-fmac";
+                interrupt-parent = <&pio>;
+                interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
+                interrupt-names = "host-wake";
+        };
+};
+
+&ohci0 {
+        status = "okay";
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_pins_a>;
+        status = "okay";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+        status = "okay";
+};
+
+&usb_otg {
+        dr_mode = "otg";
+        status = "okay";
+};
+
+&usbphy {
+        usb0_id_det-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+        /*
+         * There're two micro-USB connectors, one is power-only and another is
+         * OTG. The Vbus of these two connectors are connected together, so
+         * the external USB device will be powered just by the power input
+         * from the power-only USB port.
+         */
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts
index 112f09c67d67..3356f4210d45 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts
@@ -68,6 +68,14 @@
         };
 };
 
+&spi0 {
+        status = "okay";
+
+        flash@0 {
+                compatible = "mxicy,mx25l12805d", "jedec,spi-nor";
+        };
+};
+
 &ohci1 {
         /*
          * RTL8152B USB-Ethernet adapter is connected to USB1,
diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
index 6713d0f2b3f4..0bc031fe4c56 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -112,18 +112,13 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc_wifi>;
         mmc-pwrseq = <&wifi_pwrseq>;
         bus-width = <4>;
@@ -139,10 +134,6 @@
         };
 };
 
-&mmc1_pins_a {
-        bias-pull-up;
-};
-
 &ohci0 {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
index f1c3f1cc4d97..30540dc8e0c5 100644
--- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
@@ -61,6 +61,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -100,6 +111,10 @@
         };
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -129,6 +144,16 @@
         };
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -136,18 +161,13 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         vqmmc-supply = <&reg_vcc3v3>;
         mmc-pwrseq = <&wifi_pwrseq>;
diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
index 10da56e86ab8..cf1f970b0c6f 100644
--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
@@ -61,6 +61,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
 
@@ -100,6 +111,10 @@
         };
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -108,6 +123,16 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -115,18 +140,13 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         non-removable;
diff --git a/arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts b/arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts
index d406571a0dd6..b20a710da7bc 100644
--- a/arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts
+++ b/arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts
@@ -23,6 +23,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
 
@@ -120,6 +131,10 @@
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -143,6 +158,16 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -150,12 +175,9 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc_io>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
index a6e61915d648..65cba1050802 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
@@ -101,8 +101,6 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         vqmmc-supply = <&reg_vcc3v3>;
         mmc-pwrseq = <&wifi_pwrseq>;
@@ -119,6 +117,16 @@
         };
 };
 
+&mmc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc2_8bit_pins>;
+        vmmc-supply = <&reg_vcc3v3>;
+        vqmmc-supply = <&reg_vcc3v3>;
+        bus-width = <8>;
+        non-removable;
+        status = "okay";
+};
+
 &ohci1 {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
index c77fbca4f227..9412668bb888 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
@@ -49,6 +49,21 @@
         aliases {
                 ethernet0 = &emac;
         };
+
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+};
+
+&de {
+        status = "okay";
 };
 
 &ehci1 {
@@ -66,6 +81,16 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
index 03ff6f8b93ff..6246d3eff39d 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
@@ -72,16 +72,35 @@
                         gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
                 };
         };
+
+        wifi_pwrseq: wifi_pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
+        };
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+        status = "okay";
+};
+
+&mmc1 {
+        vmmc-supply = <&reg_vcc3v3>;
+        vqmmc-supply = <&reg_vcc3v3>;
+        mmc-pwrseq = <&wifi_pwrseq>;
+        bus-width = <4>;
+        non-removable;
         status = "okay";
+
+        brcmf: bcrmf@1 {
+                reg = <1>;
+                compatible = "brcm,bcm4329-fmac";
+                interrupt-parent = <&pio>;
+                interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
+                interrupt-names = "host-wake";
+        };
 };
 
 &uart0 {
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
index 7646e331bd29..f110ee382239 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
@@ -95,10 +95,7 @@
 
 &mmc0 {
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-        cd-inverted;
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
         status = "okay";
         vmmc-supply = <&reg_vcc3v3>;
 };
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
index b20be95b49d5..f1fc6bdca8be 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
@@ -62,6 +62,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -114,6 +125,10 @@
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci1 {
         status = "okay";
 };
@@ -125,6 +140,16 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -132,18 +157,13 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         mmc-pwrseq = <&wifi_pwrseq>;
         bus-width = <4>;
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
index a70a1daf4e2c..476ae8e387ca 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
@@ -61,6 +61,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -91,6 +102,10 @@
         };
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci1 {
         status = "okay";
 };
@@ -99,6 +114,16 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -106,18 +131,13 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         non-removable;
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
index 82e5d28cd698..3328fe583c9b 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
@@ -60,6 +60,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -90,6 +101,10 @@
         };
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -102,16 +117,22 @@
         phy-handle = <&int_mii_phy>;
         phy-mode = "mii";
         allwinner,leds-active-low;
+};
+
+&hdmi {
         status = "okay";
 };
 
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
index a10281b455f5..71fb73208939 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
@@ -59,8 +59,6 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         non-removable;
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
index d22546df1b82..cea4d647ecbf 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
@@ -60,6 +60,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
                 pinctrl-names = "default";
@@ -98,6 +109,10 @@
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -121,6 +136,16 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -128,12 +153,9 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index 8495deecedad..10da8ed7db81 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -79,6 +79,33 @@
                              <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 {
+                mali: gpu@1c40000 {
+                        compatible = "allwinner,sun8i-h3-mali", "arm,mali-400";
+                        reg = <0x01c40000 0x10000>;
+                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "gp",
+                                          "gpmmu",
+                                          "pp0",
+                                          "ppmmu0",
+                                          "pp1",
+                                          "ppmmu1",
+                                          "pmu";
+                        clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>;
+                        clock-names = "bus", "core";
+                        resets = <&ccu RST_BUS_GPU>;
+
+                        assigned-clocks = <&ccu CLK_GPU>;
+                        assigned-clock-rates = <384000000>;
+                };
+        };
 };
 
 &ccu {
diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
index eaf09666720d..0dbdb29a8fff 100644
--- a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
+++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
@@ -150,8 +150,7 @@
         pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
-        cd-inverted;
+        cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
index 8c5efe2a9881..27d9ccd0ef2f 100644
--- a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
+++ b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
@@ -164,8 +164,7 @@
 &mmc0 {
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>; /* PH13 */
-        cd-inverted;
+        cd-gpios = <&pio 7 13 GPIO_ACTIVE_LOW>; /* PH13 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index d6bd15898db6..880096c7e252 100644
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -85,8 +85,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
-        cd-inverted;
+        cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
         status = "okay";
 };
 
@@ -125,6 +124,14 @@
 
 #include "axp223.dtsi"
 
+&ac_power_supply {
+        status = "okay";
+};
+
+&battery_power_supply {
+        status = "okay";
+};
+
 &reg_aldo1 {
         regulator-always-on;
         regulator-min-microvolt = <3000000>;
diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
index fe16fc0eb518..a26d72c3f9b5 100644
--- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
+++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
@@ -150,8 +150,7 @@
 &mmc0 {
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>; /* PH13 */
-        cd-inverted;
+        cd-gpios = <&pio 7 13 GPIO_ACTIVE_LOW>; /* PH13 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
index 4024639aa005..85da85faf869 100644
--- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
+++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
@@ -74,6 +74,52 @@
                 };
         };
 
+        vga-connector {
+                compatible = "vga-connector";
+                label = "vga";
+                ddc-i2c-bus = <&i2c3>;
+
+                port {
+                        vga_con_in: endpoint {
+                                remote-endpoint = <&vga_dac_out>;
+                        };
+                };
+        };
+
+        vga-dac {
+                compatible = "corpro,gm7123", "adi,adv7123", "dumb-vga-dac";
+                vdd-supply = <&reg_dcdc1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <0>;
+
+                                vga_dac_in: endpoint@0 {
+                                        reg = <0>;
+                                        remote-endpoint = <&tcon0_out_vga>;
+                                };
+                        };
+
+                        port@1 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <1>;
+
+                                vga_dac_out: endpoint@0 {
+                                        reg = <0>;
+                                        remote-endpoint = <&vga_con_in>;
+                                };
+                        };
+                };
+        };
+
         wifi_pwrseq: wifi-pwrseq {
                 compatible = "mmc-pwrseq-simple";
                 clocks = <&ac100_rtc 1>;
@@ -83,13 +129,22 @@
         };
 };
 
+&de {
+        status = "okay";
+};
+
+&i2c3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c3_pins>;
+        status = "okay";
+};
+
 &mmc0 {
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH18 */
-        cd-inverted;
+        cd-gpios = <&pio 7 18 GPIO_ACTIVE_LOW>; /* PH18 */
         status = "okay";
 };
 
@@ -403,6 +458,18 @@
 
 #include "axp809.dtsi"
 
+&tcon0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&lcd0_rgb888_pins>;
+};
+
+&tcon0_out {
+        tcon0_out_vga: endpoint@0 {
+                reg = <0>;
+                remote-endpoint = <&vga_dac_in>;
+        };
+};
+
 &uart0 {
         pinctrl-names = "default";
         pinctrl-0 = <&uart0_ph_pins>;
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index a9b807be99a0..58a199b0e494 100644
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -125,8 +125,7 @@
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 18 GPIO_ACTIVE_HIGH>; /* PH8 */
-        cd-inverted;
+        cd-gpios = <&pio 7 18 GPIO_ACTIVE_LOW>; /* PH8 */
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index 90eac0b2a193..25591d6883ef 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -63,48 +63,72 @@
                 cpu0: cpu@0 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        cci-control-port = <&cci_control0>;
+                        clock-frequency = <12000000>;
+                        enable-method = "allwinner,sun9i-a80-smp";
                         reg = <0x0>;
                 };
 
                 cpu1: cpu@1 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        cci-control-port = <&cci_control0>;
+                        clock-frequency = <12000000>;
+                        enable-method = "allwinner,sun9i-a80-smp";
                         reg = <0x1>;
                 };
 
                 cpu2: cpu@2 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        cci-control-port = <&cci_control0>;
+                        clock-frequency = <12000000>;
+                        enable-method = "allwinner,sun9i-a80-smp";
                         reg = <0x2>;
                 };
 
                 cpu3: cpu@3 {
                         compatible = "arm,cortex-a7";
                         device_type = "cpu";
+                        cci-control-port = <&cci_control0>;
+                        clock-frequency = <12000000>;
+                        enable-method = "allwinner,sun9i-a80-smp";
                         reg = <0x3>;
                 };
 
                 cpu4: cpu@100 {
                         compatible = "arm,cortex-a15";
                         device_type = "cpu";
+                        cci-control-port = <&cci_control1>;
+                        clock-frequency = <18000000>;
+                        enable-method = "allwinner,sun9i-a80-smp";
                         reg = <0x100>;
                 };
 
                 cpu5: cpu@101 {
                         compatible = "arm,cortex-a15";
                         device_type = "cpu";
+                        cci-control-port = <&cci_control1>;
+                        clock-frequency = <18000000>;
+                        enable-method = "allwinner,sun9i-a80-smp";
                         reg = <0x101>;
                 };
 
                 cpu6: cpu@102 {
                         compatible = "arm,cortex-a15";
                         device_type = "cpu";
+                        cci-control-port = <&cci_control1>;
+                        clock-frequency = <18000000>;
+                        enable-method = "allwinner,sun9i-a80-smp";
                         reg = <0x102>;
                 };
 
                 cpu7: cpu@103 {
                         compatible = "arm,cortex-a15";
                         device_type = "cpu";
+                        cci-control-port = <&cci_control1>;
+                        clock-frequency = <18000000>;
+                        enable-method = "allwinner,sun9i-a80-smp";
                         reg = <0x103>;
                 };
         };
@@ -224,6 +248,12 @@
                 };
         };
 
+        de: display-engine {
+                compatible = "allwinner,sun9i-a80-display-engine";
+                allwinner,pipelines = <&fe0>, <&fe1>;
+                status = "disabled";
+        };
+
         soc {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -234,6 +264,25 @@
                  */
                 ranges = <0 0 0 0x20000000>;
 
+                sram_b: sram@20000 {
+                        /* 256 KiB secure SRAM at 0x20000 */
+                        compatible = "mmio-sram";
+                        reg = <0x00020000 0x40000>;
+
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0x00020000 0x40000>;
+
+                        smp-sram@1000 {
+                                /*
+                                 * This is checked by BROM to determine if
+                                 * cpu0 should jump to SMP entry vector
+                                 */
+                                compatible = "allwinner,sun9i-a80-smp-sram";
+                                reg = <0x1000 0x8>;
+                        };
+                };
+
                 ehci0: usb@a00000 {
                         compatible = "allwinner,sun9i-a80-ehci", "generic-ehci";
                         reg = <0x00a00000 0x100>;
@@ -347,6 +396,11 @@
                         #reset-cells = <1>;
                 };
 
+                cpucfg@1700000 {
+                        compatible = "allwinner,sun9i-a80-cpucfg";
+                        reg = <0x01700000 0x100>;
+                };
+
                 mmc0: mmc@1c0f000 {
                         compatible = "allwinner,sun9i-a80-mmc";
                         reg = <0x01c0f000 0x1000>;
@@ -431,6 +485,36 @@
                         interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
                 };
 
+                cci: cci@1c90000 {
+                        compatible = "arm,cci-400";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x01c90000 0x1000>;
+                        ranges = <0x0 0x01c90000 0x10000>;
+
+                        cci_control0: slave-if@4000 {
+                                compatible = "arm,cci-400-ctrl-if";
+                                interface-type = "ace";
+                                reg = <0x4000 0x1000>;
+                        };
+
+                        cci_control1: slave-if@5000 {
+                                compatible = "arm,cci-400-ctrl-if";
+                                interface-type = "ace";
+                                reg = <0x5000 0x1000>;
+                        };
+
+                        pmu@9000 {
+                                 compatible = "arm,cci-400-pmu,r1";
+                                 reg = <0x9000 0x5000>;
+                                 interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+                                              <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+                                              <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+                                              <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+                                              <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
+                        };
+                };
+
                 de_clocks: clock@3000000 {
                         compatible = "allwinner,sun9i-a80-de-clks";
                         reg = <0x03000000 0x30>;
@@ -445,6 +529,381 @@
                         #reset-cells = <1>;
                 };
 
+                fe0: display-frontend@3100000 {
+                        compatible = "allwinner,sun9i-a80-display-frontend";
+                        reg = <0x03100000 0x40000>;
+                        interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&de_clocks CLK_BUS_FE0>, <&de_clocks CLK_FE0>,
+                                 <&de_clocks CLK_DRAM_FE0>;
+                        clock-names = "ahb", "mod",
+                                      "ram";
+                        resets = <&de_clocks RST_FE0>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                fe0_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        fe0_out_deu0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&deu0_in_fe0>;
+                                        };
+                                };
+                        };
+                };
+
+                fe1: display-frontend@3140000 {
+                        compatible = "allwinner,sun9i-a80-display-frontend";
+                        reg = <0x03140000 0x40000>;
+                        interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&de_clocks CLK_BUS_FE1>, <&de_clocks CLK_FE1>,
+                                 <&de_clocks CLK_DRAM_FE1>;
+                        clock-names = "ahb", "mod",
+                                      "ram";
+                        resets = <&de_clocks RST_FE0>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                fe1_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        fe1_out_deu1: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&deu1_in_fe1>;
+                                        };
+                                };
+                        };
+                };
+
+                be0: display-backend@3200000 {
+                        compatible = "allwinner,sun9i-a80-display-backend";
+                        reg = <0x03200000 0x40000>;
+                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&de_clocks CLK_BUS_BE0>, <&de_clocks CLK_BE0>,
+                                 <&de_clocks CLK_DRAM_BE0>;
+                        clock-names = "ahb", "mod",
+                                      "ram";
+                        resets = <&de_clocks RST_BE0>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                be0_in: port@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0>;
+
+                                        be0_in_deu0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&deu0_out_be0>;
+                                        };
+
+                                        be0_in_deu1: endpoint@1 {
+                                                reg = <1>;
+                                                remote-endpoint = <&deu1_out_be0>;
+                                        };
+                                };
+
+                                be0_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        be0_out_drc0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&drc0_in_be0>;
+                                        };
+                                };
+                        };
+                };
+
+                be1: display-backend@3240000 {
+                        compatible = "allwinner,sun9i-a80-display-backend";
+                        reg = <0x03240000 0x40000>;
+                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&de_clocks CLK_BUS_BE1>, <&de_clocks CLK_BE1>,
+                                 <&de_clocks CLK_DRAM_BE1>;
+                        clock-names = "ahb", "mod",
+                                      "ram";
+                        resets = <&de_clocks RST_BE1>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                be1_in: port@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0>;
+
+                                        be1_in_deu0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&deu0_out_be1>;
+                                        };
+
+                                        be1_in_deu1: endpoint@1 {
+                                                reg = <1>;
+                                                remote-endpoint = <&deu1_out_be1>;
+                                        };
+                                };
+
+                                be1_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        be1_out_drc1: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&drc1_in_be1>;
+                                        };
+                                };
+                        };
+                };
+
+                deu0: deu@3300000 {
+                        compatible = "allwinner,sun9i-a80-deu";
+                        reg = <0x03300000 0x40000>;
+                        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&de_clocks CLK_BUS_DEU0>,
+                                 <&de_clocks CLK_IEP_DEU0>,
+                                 <&de_clocks CLK_DRAM_DEU0>;
+                        clock-names = "ahb",
+                                      "mod",
+                                      "ram";
+                        resets = <&de_clocks RST_DEU0>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                deu0_in: port@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0>;
+
+                                        deu0_in_fe0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&fe0_out_deu0>;
+                                        };
+                                };
+
+                                deu0_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        deu0_out_be0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&be0_in_deu0>;
+                                        };
+
+                                        deu0_out_be1: endpoint@1 {
+                                                reg = <1>;
+                                                remote-endpoint = <&be1_in_deu0>;
+                                        };
+                                };
+                        };
+                };
+
+                deu1: deu@3340000 {
+                        compatible = "allwinner,sun9i-a80-deu";
+                        reg = <0x03340000 0x40000>;
+                        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&de_clocks CLK_BUS_DEU1>,
+                                 <&de_clocks CLK_IEP_DEU1>,
+                                 <&de_clocks CLK_DRAM_DEU1>;
+                        clock-names = "ahb",
+                                      "mod",
+                                      "ram";
+                        resets = <&de_clocks RST_DEU1>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                deu1_in: port@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0>;
+
+                                        deu1_in_fe1: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&fe1_out_deu1>;
+                                        };
+                                };
+
+                                deu1_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        deu1_out_be0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&be0_in_deu1>;
+                                        };
+
+                                        deu1_out_be1: endpoint@1 {
+                                                reg = <1>;
+                                                remote-endpoint = <&be1_in_deu1>;
+                                        };
+                                };
+                        };
+                };
+
+                drc0: drc@3400000 {
+                        compatible = "allwinner,sun9i-a80-drc";
+                        reg = <0x03400000 0x40000>;
+                        interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&de_clocks CLK_BUS_DRC0>,
+                                 <&de_clocks CLK_IEP_DRC0>,
+                                 <&de_clocks CLK_DRAM_DRC0>;
+                        clock-names = "ahb",
+                                      "mod",
+                                      "ram";
+                        resets = <&de_clocks RST_DRC0>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                drc0_in: port@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0>;
+
+                                        drc0_in_be0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&be0_out_drc0>;
+                                        };
+                                };
+
+                                drc0_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        drc0_out_tcon0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&tcon0_in_drc0>;
+                                        };
+                                };
+                        };
+                };
+
+                drc1: drc@3440000 {
+                        compatible = "allwinner,sun9i-a80-drc";
+                        reg = <0x03440000 0x40000>;
+                        interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&de_clocks CLK_BUS_DRC1>,
+                                 <&de_clocks CLK_IEP_DRC1>,
+                                 <&de_clocks CLK_DRAM_DRC1>;
+                        clock-names = "ahb",
+                                      "mod",
+                                      "ram";
+                        resets = <&de_clocks RST_DRC1>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                drc1_in: port@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0>;
+
+                                        drc1_in_be1: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&be1_out_drc1>;
+                                        };
+                                };
+
+                                drc1_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        drc1_out_tcon1: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&tcon1_in_drc1>;
+                                        };
+                                };
+                        };
+                };
+
+                tcon0: lcd-controller@3c00000 {
+                        compatible = "allwinner,sun9i-a80-tcon-lcd";
+                        reg = <0x03c00000 0x10000>;
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_LCD0>, <&ccu CLK_LCD0>;
+                        clock-names = "ahb", "tcon-ch0";
+                        resets = <&ccu RST_BUS_LCD0>, <&ccu RST_BUS_EDP>;
+                        reset-names = "lcd", "edp";
+                        clock-output-names = "tcon0-pixel-clock";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                tcon0_in: port@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0>;
+
+                                        tcon0_in_drc0: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&drc0_out_tcon0>;
+                                        };
+                                };
+
+                                tcon0_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+                                };
+                        };
+                };
+
+                tcon1: lcd-controller@3c10000 {
+                        compatible = "allwinner,sun9i-a80-tcon-tv";
+                        reg = <0x03c10000 0x10000>;
+                        interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_LCD1>, <&ccu CLK_LCD1>;
+                        clock-names = "ahb", "tcon-ch1";
+                        resets = <&ccu RST_BUS_LCD1>, <&ccu RST_BUS_EDP>;
+                        reset-names = "lcd", "edp";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                tcon1_in: port@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0>;
+
+                                        tcon1_in_drc1: endpoint@0 {
+                                                reg = <0>;
+                                                remote-endpoint = <&drc1_out_tcon1>;
+                                        };
+                                };
+
+                                tcon1_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+                                };
+                        };
+                };
+
                 ccu: clock@6000000 {
                         compatible = "allwinner,sun9i-a80-ccu";
                         reg = <0x06000000 0x800>;
@@ -494,6 +953,17 @@
                                 function = "i2c3";
                         };
 
+                        lcd0_rgb888_pins: lcd0-rgb888-pins {
+                                pins = "PD0", "PD1", "PD2", "PD3",
+                                       "PD4", "PD5", "PD6", "PD7",
+                                       "PD8", "PD9", "PD10", "PD11",
+                                       "PD12", "PD13", "PD14", "PD15",
+                                       "PD16", "PD17", "PD18", "PD19",
+                                       "PD20", "PD21", "PD22", "PD23",
+                                       "PD24", "PD25", "PD26", "PD27";
+                                function = "lcd0";
+                        };
+
                         mmc0_pins: mmc0-pins {
                                 pins = "PF0", "PF1" ,"PF2", "PF3",
                                        "PF4", "PF5";
@@ -658,6 +1128,11 @@
                         interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
                 };
 
+                prcm@8001400 {
+                        compatible = "allwinner,sun9i-a80-prcm";
+                        reg = <0x08001400 0x200>;
+                };
+
                 apbs_rst: reset@80014b0 {
                         reg = <0x080014b0 0x4>;
                         compatible = "allwinner,sun6i-a31-clock-reset";
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index 7a83b15225c7..1be1a02d6df2 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -105,6 +105,12 @@
                 };
         };
 
+        de: display-engine {
+                compatible = "allwinner,sun8i-h3-display-engine";
+                allwinner,pipelines = <&mixer0>;
+                status = "disabled";
+        };
+
         soc {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -123,6 +129,29 @@
                         #reset-cells = <1>;
                 };
 
+                mixer0: mixer@1100000 {
+                        compatible = "allwinner,sun8i-h3-de2-mixer-0";
+                        reg = <0x01100000 0x100000>;
+                        clocks = <&display_clocks CLK_BUS_MIXER0>,
+                                 <&display_clocks CLK_MIXER0>;
+                        clock-names = "bus",
+                                      "mod";
+                        resets = <&display_clocks RST_MIXER0>;
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                mixer0_out: port@1 {
+                                        reg = <1>;
+
+                                        mixer0_out_tcon0: endpoint {
+                                                remote-endpoint = <&tcon0_in_mixer0>;
+                                        };
+                                };
+                        };
+                };
+
                 syscon: syscon@1c00000 {
                         compatible = "allwinner,sun8i-h3-system-controller",
                                 "syscon";
@@ -138,9 +167,46 @@
                         #dma-cells = <1>;
                 };
 
+                tcon0: lcd-controller@1c0c000 {
+                        compatible = "allwinner,sun8i-h3-tcon-tv",
+                                     "allwinner,sun8i-a83t-tcon-tv";
+                        reg = <0x01c0c000 0x1000>;
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_TCON0>, <&ccu CLK_TCON0>;
+                        clock-names = "ahb", "tcon-ch1";
+                        resets = <&ccu RST_BUS_TCON0>;
+                        reset-names = "lcd";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                tcon0_in: port@0 {
+                                        reg = <0>;
+
+                                        tcon0_in_mixer0: endpoint {
+                                                remote-endpoint = <&mixer0_out_tcon0>;
+                                        };
+                                };
+
+                                tcon0_out: port@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <1>;
+
+                                        tcon0_out_hdmi: endpoint@1 {
+                                                reg = <1>;
+                                                remote-endpoint = <&hdmi_in_tcon0>;
+                                        };
+                                };
+                        };
+                };
+
                 mmc0: mmc@1c0f000 {
                         /* compatible and clocks are in per SoC .dtsi file */
                         reg = <0x01c0f000 0x1000>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mmc0_pins>;
                         resets = <&ccu RST_BUS_MMC0>;
                         reset-names = "ahb";
                         interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
@@ -152,6 +218,8 @@
                 mmc1: mmc@1c10000 {
                         /* compatible and clocks are in per SoC .dtsi file */
                         reg = <0x01c10000 0x1000>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mmc1_pins>;
                         resets = <&ccu RST_BUS_MMC1>;
                         reset-names = "ahb";
                         interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
@@ -348,7 +416,7 @@
                                 function = "i2c2";
                         };
 
-                        mmc0_pins_a: mmc0 {
+                        mmc0_pins: mmc0 {
                                 pins = "PF0", "PF1", "PF2", "PF3",
                                        "PF4", "PF5";
                                 function = "mmc0";
@@ -356,13 +424,7 @@
                                 bias-pull-up;
                         };
 
-                        mmc0_cd_pin: mmc0_cd_pin {
-                                pins = "PF6";
-                                function = "gpio_in";
-                                bias-pull-up;
-                        };
-
-                        mmc1_pins_a: mmc1 {
+                        mmc1_pins: mmc1 {
                                 pins = "PG0", "PG1", "PG2", "PG3",
                                        "PG4", "PG5";
                                 function = "mmc1";
@@ -684,6 +746,50 @@
                         interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
                 };
 
+                hdmi: hdmi@1ee0000 {
+                        compatible = "allwinner,sun8i-h3-dw-hdmi",
+                                     "allwinner,sun8i-a83t-dw-hdmi";
+                        reg = <0x01ee0000 0x10000>;
+                        reg-io-width = <1>;
+                        interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>,
+                                 <&ccu CLK_HDMI>;
+                        clock-names = "iahb", "isfr", "tmds";
+                        resets = <&ccu RST_BUS_HDMI1>;
+                        reset-names = "ctrl";
+                        phys = <&hdmi_phy>;
+                        phy-names = "hdmi-phy";
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                hdmi_in: port@0 {
+                                        reg = <0>;
+
+                                        hdmi_in_tcon0: endpoint {
+                                                remote-endpoint = <&tcon0_out_hdmi>;
+                                        };
+                                };
+
+                                hdmi_out: port@1 {
+                                        reg = <1>;
+                                };
+                        };
+                };
+
+                hdmi_phy: hdmi-phy@1ef0000 {
+                        compatible = "allwinner,sun8i-h3-hdmi-phy";
+                        reg = <0x01ef0000 0x10000>;
+                        clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>,
+                                 <&ccu 6>;
+                        clock-names = "bus", "mod", "pll-0";
+                        resets = <&ccu RST_BUS_HDMI0>;
+                        reset-names = "phy";
+                        #phy-cells = <0>;
+                };
+
                 rtc: rtc@1f00000 {
                         compatible = "allwinner,sun6i-a31-rtc";
                         reg = <0x01f00000 0x54>;
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index acd6cf51b15b..eafff16765b4 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -780,7 +780,7 @@
                         compatible = "realtek,rt5640";
                         reg = <0x1c>;
                         interrupt-parent = <&gpio>;
-                        interrupts = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>;
+                        interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_FALLING>;
                         realtek,ldo1-en-gpios =
                                 <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
                 };
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index ecffcd115fa7..a6ad759dddb4 100644
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Toradex AG
+ * Copyright 2016-2018 Toradex AG
  *
  * 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
@@ -105,7 +105,7 @@
          */
         i2c@7000c000 {
                 status = "okay";
-                clock-frequency = <100000>;
+                clock-frequency = <400000>;
 
                 pcie-switch@58 {
                         compatible = "plx,pex8605";
@@ -114,7 +114,7 @@
 
                 /* M41T0M6 real time clock on carrier board */
                 rtc@68 {
-                        compatible = "st,m41t00";
+                        compatible = "st,m41t0";
                         reg = <0x68>;
                 };
         };
@@ -124,7 +124,6 @@
          */
         hdmi_ddc: i2c@7000c400 {
                 status = "okay";
-                clock-frequency = <100000>;
         };
 
         /*
@@ -133,7 +132,7 @@
          */
         i2c@7000c500 {
                 status = "okay";
-                clock-frequency = <100000>;
+                clock-frequency = <400000>;
         };
 
         /* I2C4 (DDC): unused */
@@ -226,9 +225,7 @@
 
         backlight: backlight {
                 compatible = "pwm-backlight";
-
-                /* BKL1_PWM */
-                pwms = <&pwm 3 5000000>;
+                pwms = <&pwm 3 5000000>; /* BKL1_PWM */
                 brightness-levels = <255 231 223 207 191 159 127 0>;
                 default-brightness-level = <6>;
                 /* BKL1_ON */
@@ -276,3 +273,13 @@
                 vin-supply = <&reg_5v0>;
         };
 };
+
+&gpio {
+        /* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
+        pex_perst_n {
+                gpio-hog;
+                gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "PEX_PERST_N";
+        };
+};
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
new file mode 100644
index 000000000000..8a8d5fa0ecd1
--- /dev/null
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -0,0 +1,250 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2016-2018 Toradex AG
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include "tegra124-apalis-v1.2.dtsi"
+
+/ {
+        model = "Toradex Apalis TK1 on Apalis Evaluation Board";
+        compatible = "toradex,apalis-tk1-v1.2-eval", "toradex,apalis-tk1-eval",
+                     "toradex,apalis-tk1", "nvidia,tegra124";
+
+        aliases {
+                rtc0 = "/i2c@7000c000/rtc@68";
+                rtc1 = "/i2c@7000d000/pmic@40";
+                rtc2 = "/rtc@7000e000";
+                serial0 = &uarta;
+                serial1 = &uartb;
+                serial2 = &uartc;
+                serial3 = &uartd;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        pcie@1003000 {
+                pci@1,0 {
+                        status = "okay";
+                };
+        };
+
+        host1x@50000000 {
+                hdmi@54280000 {
+                        status = "okay";
+                };
+        };
+
+        /* Apalis UART1 */
+        serial@70006000 {
+                status = "okay";
+        };
+
+        /* Apalis UART2 */
+        serial@70006040 {
+                status = "okay";
+        };
+
+        /* Apalis UART3 */
+        serial@70006200 {
+                status = "okay";
+        };
+
+        /* Apalis UART4 */
+        serial@70006300 {
+                status = "okay";
+        };
+
+        pwm@7000a000 {
+                status = "okay";
+        };
+
+        /*
+         * GEN1_I2C: I2C1_SDA/SCL on MXM3 pin 209/211 (e.g. RTC on carrier
+         * board)
+         */
+        i2c@7000c000 {
+                status = "okay";
+                clock-frequency = <400000>;
+
+                pcie-switch@58 {
+                        compatible = "plx,pex8605";
+                        reg = <0x58>;
+                };
+
+                /* M41T0M6 real time clock on carrier board */
+                rtc@68 {
+                        compatible = "st,m41t0";
+                        reg = <0x68>;
+                };
+        };
+
+        /* GEN2_I2C: unused */
+
+        /*
+         * CAM_I2C: I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor
+         * on carrier board)
+         */
+        i2c@7000c500 {
+                status = "okay";
+                clock-frequency = <400000>;
+        };
+
+        /*
+         * I2C4 (DDC): I2C4_SDA/SCL (DDC) on MXM3 pin 205/207
+         * (e.g. display EDID)
+         */
+        hdmi_ddc: i2c@7000c700 {
+                status = "okay";
+        };
+
+        /* SPI1: Apalis SPI1 */
+        spi@7000d400 {
+                status = "okay";
+                spi-max-frequency = <50000000>;
+
+                spidev0: spidev@0 {
+                        compatible = "spidev";
+                        reg = <0>;
+                        spi-max-frequency = <50000000>;
+                };
+        };
+
+        /* SPI4: Apalis SPI2 */
+        spi@7000da00 {
+                status = "okay";
+                spi-max-frequency = <50000000>;
+
+                spidev1: spidev@0 {
+                        compatible = "spidev";
+                        reg = <0>;
+                        spi-max-frequency = <50000000>;
+                };
+        };
+
+        /* Apalis Serial ATA */
+        sata@70020000 {
+                status = "okay";
+        };
+
+        hda@70030000 {
+                status = "okay";
+        };
+
+        usb@70090000 {
+                status = "okay";
+        };
+
+        /* Apalis MMC1 */
+        sdhci@700b0000 {
+                status = "okay";
+                /* MMC1_CD# */
+                cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
+                bus-width = <4>;
+                vqmmc-supply = <&vddio_sdmmc1>;
+        };
+
+        /* Apalis SD1 */
+        sdhci@700b0400 {
+                status = "okay";
+                /* SD1_CD# */
+                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
+                bus-width = <4>;
+                vqmmc-supply = <&vddio_sdmmc3>;
+        };
+
+        /* EHCI instance 0: USB1_DP/N -> USBO1_DP/N */
+        usb@7d000000 {
+                status = "okay";
+                dr_mode = "otg";
+        };
+
+        usb-phy@7d000000 {
+                status = "okay";
+                vbus-supply = <&reg_usbo1_vbus>;
+        };
+
+        /* EHCI instance 1: USB2_DP/N -> USBH2_DP/N */
+        usb@7d004000 {
+                status = "okay";
+        };
+
+        usb-phy@7d004000 {
+                status = "okay";
+                vbus-supply = <&reg_usbh_vbus>;
+        };
+
+        /* EHCI instance 2: USB3_DP/N -> USBH4_DP/N */
+        usb@7d008000 {
+                status = "okay";
+        };
+
+        usb-phy@7d008000 {
+                status = "okay";
+                vbus-supply = <&reg_usbh_vbus>;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm 3 5000000>; /* BKL1_PWM */
+                brightness-levels = <255 231 223 207 191 159 127 0>;
+                default-brightness-level = <6>;
+                /* BKL1_ON */
+                enable-gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                wakeup {
+                        label = "WAKE1_MICO";
+                        gpios = <&gpio TEGRA_GPIO(DD, 3) GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_WAKEUP>;
+                        debounce-interval = <10>;
+                        wakeup-source;
+                };
+        };
+
+        reg_5v0: regulator-5v0 {
+                compatible = "regulator-fixed";
+                regulator-name = "5V_SW";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+        };
+
+        /* USBO1_EN */
+        reg_usbo1_vbus: regulator-usbo1-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "VCC_USBO1";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio TEGRA_GPIO(T, 5) GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                vin-supply = <&reg_5v0>;
+        };
+
+        /* USBH_EN */
+        reg_usbh_vbus: regulator-usbh-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "VCC_USBH(2A|2C|2D|3|4)";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                gpio = <&gpio TEGRA_GPIO(T, 6) GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                vin-supply = <&reg_5v0>;
+        };
+};
+
+&gpio {
+        /* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
+        pex_perst_n {
+                gpio-hog;
+                gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "PEX_PERST_N";
+        };
+};
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
new file mode 100644
index 000000000000..bb67edb016c5
--- /dev/null
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -0,0 +1,2052 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2016-2018 Toradex AG
+ */
+
+#include "tegra124.dtsi"
+#include "tegra124-apalis-emc.dtsi"
+
+/*
+ * Toradex Apalis TK1 Module Device Tree
+ * Compatible for Revisions 2GB: V1.2A
+ */
+/ {
+        model = "Toradex Apalis TK1";
+        compatible = "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",
+                     "nvidia,tegra124";
+
+        memory {
+                reg = <0x0 0x80000000 0x0 0x80000000>;
+        };
+
+        pcie@1003000 {
+                status = "okay";
+                avddio-pex-supply = <&vdd_1v05>;
+                avdd-pex-pll-supply = <&vdd_1v05>;
+                avdd-pll-erefe-supply = <&avdd_1v05>;
+                dvddio-pex-supply = <&vdd_1v05>;
+                hvdd-pex-pll-e-supply = <&reg_3v3>;
+                hvdd-pex-supply = <&reg_3v3>;
+                vddio-pex-ctl-supply = <&reg_3v3>;
+
+                /* Apalis PCIe (additional lane Apalis type specific) */
+                pci@1,0 {
+                        /* PCIE1_RX/TX and TS_DIFF1/2 */
+                        phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-4}>,
+                               <&{/padctl@7009f000/pads/pcie/lanes/pcie-3}>;
+                        phy-names = "pcie-0", "pcie-1";
+                };
+
+                /* I210 Gigabit Ethernet Controller (On-module) */
+                pci@2,0 {
+                        phys = <&{/padctl@7009f000/pads/pcie/lanes/pcie-2}>;
+                        phy-names = "pcie-0";
+                        status = "okay";
+                };
+        };
+
+        host1x@50000000 {
+                hdmi@54280000 {
+                        pll-supply = <&reg_1v05_avdd_hdmi_pll>;
+                        vdd-supply = <&reg_3v3_avdd_hdmi>;
+                        nvidia,ddc-i2c-bus = <&hdmi_ddc>;
+                        nvidia,hpd-gpio =
+                                <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
+                };
+        };
+
+        gpu@0,57000000 {
+                /*
+                 * Node left disabled on purpose - the bootloader will enable
+                 * it after having set the VPR up
+                 */
+                vdd-supply = <&vdd_gpu>;
+        };
+
+        pinmux: pinmux@70000868 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&state_default>;
+
+                state_default: pinmux {
+                        /* Analogue Audio (On-module) */
+                        dap3_fs_pp0 {
+                                nvidia,pins = "dap3_fs_pp0";
+                                nvidia,function = "i2s2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap3_din_pp1 {
+                                nvidia,pins = "dap3_din_pp1";
+                                nvidia,function = "i2s2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        dap3_dout_pp2 {
+                                nvidia,pins = "dap3_dout_pp2";
+                                nvidia,function = "i2s2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap3_sclk_pp3 {
+                                nvidia,pins = "dap3_sclk_pp3";
+                                nvidia,function = "i2s2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap_mclk1_pw4 {
+                                nvidia,pins = "dap_mclk1_pw4";
+                                nvidia,function = "extperiph1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis BKL1_ON */
+                        pbb5 {
+                                nvidia,pins = "pbb5";
+                                nvidia,function = "vgp5";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis BKL1_PWM */
+                        pu6 {
+                                nvidia,pins = "pu6";
+                                nvidia,function = "pwm3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis CAM1_MCLK */
+                        cam_mclk_pcc0 {
+                                nvidia,pins = "cam_mclk_pcc0";
+                                nvidia,function = "vi_alt3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis Digital Audio */
+                        dap2_fs_pa2 {
+                                nvidia,pins = "dap2_fs_pa2";
+                                nvidia,function = "hda";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        dap2_sclk_pa3 {
+                                nvidia,pins = "dap2_sclk_pa3";
+                                nvidia,function = "hda";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        dap2_din_pa4 {
+                                nvidia,pins = "dap2_din_pa4";
+                                nvidia,function = "hda";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        dap2_dout_pa5 {
+                                nvidia,pins = "dap2_dout_pa5";
+                                nvidia,function = "hda";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pbb3 { /* DAP1_RESET */
+                                nvidia,pins = "pbb3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        clk3_out_pee0 {
+                                nvidia,pins = "clk3_out_pee0";
+                                nvidia,function = "extperiph3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis GPIO */
+                        usb_vbus_en0_pn4 {
+                                nvidia,pins = "usb_vbus_en0_pn4";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+                        };
+                        usb_vbus_en1_pn5 {
+                                nvidia,pins = "usb_vbus_en1_pn5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+                        };
+                        pex_l0_rst_n_pdd1 {
+                                nvidia,pins = "pex_l0_rst_n_pdd1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        pex_l0_clkreq_n_pdd2 {
+                                nvidia,pins = "pex_l0_clkreq_n_pdd2";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        pex_l1_rst_n_pdd5 {
+                                nvidia,pins = "pex_l1_rst_n_pdd5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        pex_l1_clkreq_n_pdd6 {
+                                nvidia,pins = "pex_l1_clkreq_n_pdd6";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        dp_hpd_pff0 {
+                                nvidia,pins = "dp_hpd_pff0";
+                                nvidia,function = "dp";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        pff2 {
+                                nvidia,pins = "pff2";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        owr { /* PEX_L1_CLKREQ_N multiplexed GPIO6 */
+                                nvidia,pins = "owr";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                                nvidia,rcv-sel = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis HDMI1_CEC */
+                        hdmi_cec_pee3 {
+                                nvidia,pins = "hdmi_cec_pee3";
+                                nvidia,function = "cec";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis HDMI1_HPD */
+                        hdmi_int_pn7 {
+                                nvidia,pins = "hdmi_int_pn7";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,rcv-sel = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis I2C1 */
+                        gen1_i2c_scl_pc4 {
+                                nvidia,pins = "gen1_i2c_scl_pc4";
+                                nvidia,function = "i2c1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                        };
+                        gen1_i2c_sda_pc5 {
+                                nvidia,pins = "gen1_i2c_sda_pc5";
+                                nvidia,function = "i2c1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis I2C3 (CAM) */
+                        cam_i2c_scl_pbb1 {
+                                nvidia,pins = "cam_i2c_scl_pbb1";
+                                nvidia,function = "i2c3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                        };
+                        cam_i2c_sda_pbb2 {
+                                nvidia,pins = "cam_i2c_sda_pbb2";
+                                nvidia,function = "i2c3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis I2C4 (DDC) */
+                        ddc_scl_pv4 {
+                                nvidia,pins = "ddc_scl_pv4";
+                                nvidia,function = "i2c4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,rcv-sel = <TEGRA_PIN_ENABLE>;
+                        };
+                        ddc_sda_pv5 {
+                                nvidia,pins = "ddc_sda_pv5";
+                                nvidia,function = "i2c4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,rcv-sel = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis MMC1 */
+                        sdmmc1_cd_n_pv3 { /* CD# GPIO */
+                                nvidia,pins = "sdmmc1_wp_n_pv3";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        clk2_out_pw5 { /* D5 GPIO */
+                                nvidia,pins = "clk2_out_pw5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc1_dat3_py4 {
+                                nvidia,pins = "sdmmc1_dat3_py4";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc1_dat2_py5 {
+                                nvidia,pins = "sdmmc1_dat2_py5";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc1_dat1_py6 {
+                                nvidia,pins = "sdmmc1_dat1_py6";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc1_dat0_py7 {
+                                nvidia,pins = "sdmmc1_dat0_py7";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc1_clk_pz0 {
+                                nvidia,pins = "sdmmc1_clk_pz0";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc1_cmd_pz1 {
+                                nvidia,pins = "sdmmc1_cmd_pz1";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        clk2_req_pcc5 { /* D4 GPIO */
+                                nvidia,pins = "clk2_req_pcc5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc3_clk_lb_in_pee5 { /* D6 GPIO */
+                                nvidia,pins = "sdmmc3_clk_lb_in_pee5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        usb_vbus_en2_pff1 { /* D7 GPIO */
+                                nvidia,pins = "usb_vbus_en2_pff1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis PWM */
+                        ph0 {
+                                nvidia,pins = "ph0";
+                                nvidia,function = "pwm0";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ph1 {
+                                nvidia,pins = "ph1";
+                                nvidia,function = "pwm1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ph2 {
+                                nvidia,pins = "ph2";
+                                nvidia,function = "pwm2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        /* PWM3 active on pu6 being Apalis BKL1_PWM as well */
+                        ph3 {
+                                nvidia,pins = "ph3";
+                                nvidia,function = "pwm3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis SATA1_ACT# */
+                        dap1_dout_pn2 {
+                                nvidia,pins = "dap1_dout_pn2";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis SD1 */
+                        sdmmc3_clk_pa6 {
+                                nvidia,pins = "sdmmc3_clk_pa6";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc3_cmd_pa7 {
+                                nvidia,pins = "sdmmc3_cmd_pa7";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc3_dat3_pb4 {
+                                nvidia,pins = "sdmmc3_dat3_pb4";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc3_dat2_pb5 {
+                                nvidia,pins = "sdmmc3_dat2_pb5";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc3_dat1_pb6 {
+                                nvidia,pins = "sdmmc3_dat1_pb6";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc3_dat0_pb7 {
+                                nvidia,pins = "sdmmc3_dat0_pb7";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc3_cd_n_pv2 { /* CD# GPIO */
+                                nvidia,pins = "sdmmc3_cd_n_pv2";
+                                nvidia,function = "rsvd3";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis SPDIF */
+                        spdif_out_pk5 {
+                                nvidia,pins = "spdif_out_pk5";
+                                nvidia,function = "spdif";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        spdif_in_pk6 {
+                                nvidia,pins = "spdif_in_pk6";
+                                nvidia,function = "spdif";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis SPI1 */
+                        ulpi_clk_py0 {
+                                nvidia,pins = "ulpi_clk_py0";
+                                nvidia,function = "spi1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ulpi_dir_py1 {
+                                nvidia,pins = "ulpi_dir_py1";
+                                nvidia,function = "spi1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        ulpi_nxt_py2 {
+                                nvidia,pins = "ulpi_nxt_py2";
+                                nvidia,function = "spi1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ulpi_stp_py3 {
+                                nvidia,pins = "ulpi_stp_py3";
+                                nvidia,function = "spi1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis SPI2 */
+                        pg5 {
+                                nvidia,pins = "pg5";
+                                nvidia,function = "spi4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pg6 {
+                                nvidia,pins = "pg6";
+                                nvidia,function = "spi4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pg7 {
+                                nvidia,pins = "pg7";
+                                nvidia,function = "spi4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        pi3 {
+                                nvidia,pins = "pi3";
+                                nvidia,function = "spi4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis UART1 */
+                        pb1 { /* DCD GPIO */
+                                nvidia,pins = "pb1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        pk7 { /* RI GPIO */
+                                nvidia,pins = "pk7";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        uart1_txd_pu0 {
+                                nvidia,pins = "pu0";
+                                nvidia,function = "uarta";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        uart1_rxd_pu1 {
+                                nvidia,pins = "pu1";
+                                nvidia,function = "uarta";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        uart1_cts_n_pu2 {
+                                nvidia,pins = "pu2";
+                                nvidia,function = "uarta";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        uart1_rts_n_pu3 {
+                                nvidia,pins = "pu3";
+                                nvidia,function = "uarta";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        uart3_cts_n_pa1 { /* DSR GPIO */
+                                nvidia,pins = "uart3_cts_n_pa1";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        uart3_rts_n_pc0 { /* DTR GPIO */
+                                nvidia,pins = "uart3_rts_n_pc0";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis UART2 */
+                        uart2_txd_pc2 {
+                                nvidia,pins = "uart2_txd_pc2";
+                                nvidia,function = "irda";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        uart2_rxd_pc3 {
+                                nvidia,pins = "uart2_rxd_pc3";
+                                nvidia,function = "irda";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        uart2_cts_n_pj5 {
+                                nvidia,pins = "uart2_cts_n_pj5";
+                                nvidia,function = "uartb";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        uart2_rts_n_pj6 {
+                                nvidia,pins = "uart2_rts_n_pj6";
+                                nvidia,function = "uartb";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis UART3 */
+                        uart3_txd_pw6 {
+                                nvidia,pins = "uart3_txd_pw6";
+                                nvidia,function = "uartc";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        uart3_rxd_pw7 {
+                                nvidia,pins = "uart3_rxd_pw7";
+                                nvidia,function = "uartc";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis UART4 */
+                        uart4_rxd_pb0 {
+                                nvidia,pins = "pb0";
+                                nvidia,function = "uartd";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        uart4_txd_pj7 {
+                                nvidia,pins = "pj7";
+                                nvidia,function = "uartd";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis USBH_EN */
+                        gen2_i2c_sda_pt6 {
+                                nvidia,pins = "gen2_i2c_sda_pt6";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis USBH_OC# */
+                        pbb0 {
+                                nvidia,pins = "pbb0";
+                                nvidia,function = "vgp6";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis USBO1_EN */
+                        gen2_i2c_scl_pt5 {
+                                nvidia,pins = "gen2_i2c_scl_pt5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis USBO1_OC# */
+                        pbb4 {
+                                nvidia,pins = "pbb4";
+                                nvidia,function = "vgp4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis WAKE1_MICO */
+                        pex_wake_n_pdd3 {
+                                nvidia,pins = "pex_wake_n_pdd3";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* CORE_PWR_REQ */
+                        core_pwr_req {
+                                nvidia,pins = "core_pwr_req";
+                                nvidia,function = "pwron";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* CPU_PWR_REQ */
+                        cpu_pwr_req {
+                                nvidia,pins = "cpu_pwr_req";
+                                nvidia,function = "cpu";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* DVFS */
+                        dvfs_pwm_px0 {
+                                nvidia,pins = "dvfs_pwm_px0";
+                                nvidia,function = "cldvfs";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dvfs_clk_px2 {
+                                nvidia,pins = "dvfs_clk_px2";
+                                nvidia,function = "cldvfs";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* eMMC */
+                        sdmmc4_dat0_paa0 {
+                                nvidia,pins = "sdmmc4_dat0_paa0";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_dat1_paa1 {
+                                nvidia,pins = "sdmmc4_dat1_paa1";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_dat2_paa2 {
+                                nvidia,pins = "sdmmc4_dat2_paa2";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_dat3_paa3 {
+                                nvidia,pins = "sdmmc4_dat3_paa3";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_dat4_paa4 {
+                                nvidia,pins = "sdmmc4_dat4_paa4";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_dat5_paa5 {
+                                nvidia,pins = "sdmmc4_dat5_paa5";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_dat6_paa6 {
+                                nvidia,pins = "sdmmc4_dat6_paa6";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_dat7_paa7 {
+                                nvidia,pins = "sdmmc4_dat7_paa7";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_clk_pcc4 {
+                                nvidia,pins = "sdmmc4_clk_pcc4";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        sdmmc4_cmd_pt7 {
+                                nvidia,pins = "sdmmc4_cmd_pt7";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* JTAG_RTCK */
+                        jtag_rtck {
+                                nvidia,pins = "jtag_rtck";
+                                nvidia,function = "rtck";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* LAN_DEV_OFF# */
+                        ulpi_data5_po6 {
+                                nvidia,pins = "ulpi_data5_po6";
+                                nvidia,function = "ulpi";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* LAN_RESET# */
+                        kb_row10_ps2 {
+                                nvidia,pins = "kb_row10_ps2";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* LAN_WAKE# */
+                        ulpi_data4_po5 {
+                                nvidia,pins = "ulpi_data4_po5";
+                                nvidia,function = "ulpi";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* MCU_INT1# */
+                        pk2 {
+                                nvidia,pins = "pk2";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* MCU_INT2# */
+                        pj2 {
+                                nvidia,pins = "pj2";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* MCU_INT3# */
+                        pi5 {
+                                nvidia,pins = "pi5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* MCU_INT4# */
+                        pj0 {
+                                nvidia,pins = "pj0";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* MCU_RESET */
+                        pbb6 {
+                                nvidia,pins = "pbb6";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* MCU SPI */
+                        gpio_x4_aud_px4 {
+                                nvidia,pins = "gpio_x4_aud_px4";
+                                nvidia,function = "spi2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        gpio_x5_aud_px5 {
+                                nvidia,pins = "gpio_x5_aud_px5";
+                                nvidia,function = "spi2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        gpio_x6_aud_px6 { /* MCU_CS */
+                                nvidia,pins = "gpio_x6_aud_px6";
+                                nvidia,function = "spi2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        gpio_x7_aud_px7 {
+                                nvidia,pins = "gpio_x7_aud_px7";
+                                nvidia,function = "spi2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                        gpio_w2_aud_pw2 { /* MCU_CSEZP */
+                                nvidia,pins = "gpio_w2_aud_pw2";
+                                nvidia,function = "spi2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* PMIC_CLK_32K */
+                        clk_32k_in {
+                                nvidia,pins = "clk_32k_in";
+                                nvidia,function = "clk";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* PMIC_CPU_OC_INT */
+                        clk_32k_out_pa0 {
+                                nvidia,pins = "clk_32k_out_pa0";
+                                nvidia,function = "soc";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* PWR_I2C */
+                        pwr_i2c_scl_pz6 {
+                                nvidia,pins = "pwr_i2c_scl_pz6";
+                                nvidia,function = "i2cpwr";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                        };
+                        pwr_i2c_sda_pz7 {
+                                nvidia,pins = "pwr_i2c_sda_pz7";
+                                nvidia,function = "i2cpwr";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* PWR_INT_N */
+                        pwr_int_n {
+                                nvidia,pins = "pwr_int_n";
+                                nvidia,function = "pmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* RESET_MOCI_CTRL */
+                        pu4 {
+                                nvidia,pins = "pu4";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* RESET_OUT_N */
+                        reset_out_n {
+                                nvidia,pins = "reset_out_n";
+                                nvidia,function = "reset_out_n";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* SHIFT_CTRL_DIR_IN */
+                        kb_row0_pr0 {
+                                nvidia,pins = "kb_row0_pr0";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row1_pr1 {
+                                nvidia,pins = "kb_row1_pr1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Configure level-shifter as output for HDA */
+                        kb_row11_ps3 {
+                                nvidia,pins = "kb_row11_ps3";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* SHIFT_CTRL_DIR_OUT */
+                        kb_col5_pq5 {
+                                nvidia,pins = "kb_col5_pq5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_col6_pq6 {
+                                nvidia,pins = "kb_col6_pq6";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_col7_pq7 {
+                                nvidia,pins = "kb_col7_pq7";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* SHIFT_CTRL_OE */
+                        kb_col0_pq0 {
+                                nvidia,pins = "kb_col0_pq0";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_col1_pq1 {
+                                nvidia,pins = "kb_col1_pq1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_col2_pq2 {
+                                nvidia,pins = "kb_col2_pq2";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_col4_pq4 {
+                                nvidia,pins = "kb_col4_pq4";
+                                nvidia,function = "kbc";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row2_pr2 {
+                                nvidia,pins = "kb_row2_pr2";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* GPIO_PI6 aka TMP451 ALERT#/THERM2# */
+                        pi6 {
+                                nvidia,pins = "pi6";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* TOUCH_INT */
+                        gpio_w3_aud_pw3 {
+                                nvidia,pins = "gpio_w3_aud_pw3";
+                                nvidia,function = "spi6";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        pc7 { /* NC */
+                                nvidia,pins = "pc7";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pg0 { /* NC */
+                                nvidia,pins = "pg0";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pg1 { /* NC */
+                                nvidia,pins = "pg1";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pg2 { /* NC */
+                                nvidia,pins = "pg2";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pg3 { /* NC */
+                                nvidia,pins = "pg3";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pg4 { /* NC */
+                                nvidia,pins = "pg4";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ph4 { /* NC */
+                                nvidia,pins = "ph4";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ph5 { /* NC */
+                                nvidia,pins = "ph5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ph6 { /* NC */
+                                nvidia,pins = "ph6";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ph7 { /* NC */
+                                nvidia,pins = "ph7";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pi0 { /* NC */
+                                nvidia,pins = "pi0";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pi1 { /* NC */
+                                nvidia,pins = "pi1";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pi2 { /* NC */
+                                nvidia,pins = "pi2";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pi4 { /* NC */
+                                nvidia,pins = "pi4";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pi7 { /* NC */
+                                nvidia,pins = "pi7";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pk0 { /* NC */
+                                nvidia,pins = "pk0";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pk1 { /* NC */
+                                nvidia,pins = "pk1";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pk3 { /* NC */
+                                nvidia,pins = "pk3";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pk4 { /* NC */
+                                nvidia,pins = "pk4";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap1_fs_pn0 { /* NC */
+                                nvidia,pins = "dap1_fs_pn0";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap1_din_pn1 { /* NC */
+                                nvidia,pins = "dap1_din_pn1";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap1_sclk_pn3 { /* NC */
+                                nvidia,pins = "dap1_sclk_pn3";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ulpi_data7_po0 { /* NC */
+                                nvidia,pins = "ulpi_data7_po0";
+                                nvidia,function = "ulpi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ulpi_data0_po1 { /* NC */
+                                nvidia,pins = "ulpi_data0_po1";
+                                nvidia,function = "ulpi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ulpi_data1_po2 { /* NC */
+                                nvidia,pins = "ulpi_data1_po2";
+                                nvidia,function = "ulpi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ulpi_data2_po3 { /* NC */
+                                nvidia,pins = "ulpi_data2_po3";
+                                nvidia,function = "ulpi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ulpi_data3_po4 { /* NC */
+                                nvidia,pins = "ulpi_data3_po4";
+                                nvidia,function = "ulpi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        ulpi_data6_po7 { /* NC */
+                                nvidia,pins = "ulpi_data6_po7";
+                                nvidia,function = "ulpi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap4_fs_pp4 { /* NC */
+                                nvidia,pins = "dap4_fs_pp4";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap4_din_pp5 { /* NC */
+                                nvidia,pins = "dap4_din_pp5";
+                                nvidia,function = "rsvd3";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap4_dout_pp6 { /* NC */
+                                nvidia,pins = "dap4_dout_pp6";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap4_sclk_pp7 { /* NC */
+                                nvidia,pins = "dap4_sclk_pp7";
+                                nvidia,function = "rsvd3";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_col3_pq3 { /* NC */
+                                nvidia,pins = "kb_col3_pq3";
+                                nvidia,function = "kbc";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row3_pr3 { /* NC */
+                                nvidia,pins = "kb_row3_pr3";
+                                nvidia,function = "kbc";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row4_pr4 { /* NC */
+                                nvidia,pins = "kb_row4_pr4";
+                                nvidia,function = "rsvd3";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row5_pr5 { /* NC */
+                                nvidia,pins = "kb_row5_pr5";
+                                nvidia,function = "rsvd3";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row6_pr6 { /* NC */
+                                nvidia,pins = "kb_row6_pr6";
+                                nvidia,function = "kbc";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row7_pr7 { /* NC */
+                                nvidia,pins = "kb_row7_pr7";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row8_ps0 { /* NC */
+                                nvidia,pins = "kb_row8_ps0";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row9_ps1 { /* NC */
+                                nvidia,pins = "kb_row9_ps1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row12_ps4 { /* NC */
+                                nvidia,pins = "kb_row12_ps4";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row13_ps5 { /* NC */
+                                nvidia,pins = "kb_row13_ps5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row14_ps6 { /* NC */
+                                nvidia,pins = "kb_row14_ps6";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row15_ps7 { /* NC */
+                                nvidia,pins = "kb_row15_ps7";
+                                nvidia,function = "rsvd3";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row16_pt0 { /* NC */
+                                nvidia,pins = "kb_row16_pt0";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        kb_row17_pt1 { /* NC */
+                                nvidia,pins = "kb_row17_pt1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pu5 { /* NC */
+                                nvidia,pins = "pu5";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        /*
+                         * PCB Version Indication: V1.2 and later have GPIO_PV0
+                         * wired to GND, was NC before
+                         */
+                        pv0 {
+                                nvidia,pins = "pv0";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pv1 { /* NC */
+                                nvidia,pins = "pv1";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        gpio_x1_aud_px1 { /* NC */
+                                nvidia,pins = "gpio_x1_aud_px1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        gpio_x3_aud_px3 { /* NC */
+                                nvidia,pins = "gpio_x3_aud_px3";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pbb7 { /* NC */
+                                nvidia,pins = "pbb7";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pcc1 { /* NC */
+                                nvidia,pins = "pcc1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        pcc2 { /* NC */
+                                nvidia,pins = "pcc2";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        clk3_req_pee1 { /* NC */
+                                nvidia,pins = "clk3_req_pee1";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        dap_mclk1_req_pee2 { /* NC */
+                                nvidia,pins = "dap_mclk1_req_pee2";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
+                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                        };
+                        /*
+                         * Leave SDMMC3_CLK_LB_OUT muxed as SDMMC3 with output
+                         * driver enabled aka not tristated and input driver
+                         * enabled as well as it features some magic properties
+                         * even though the external loopback is disabled and the
+                         * internal loopback used as per
+                         * SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1
+                         * bits being set to 0xfffd according to the TRM!
+                         */
+                        sdmmc3_clk_lb_out_pee4 { /* NC */
+                                nvidia,pins = "sdmmc3_clk_lb_out_pee4";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                };
+        };
+
+        serial@70006040 {
+                compatible = "nvidia,tegra124-hsuart";
+        };
+
+        serial@70006200 {
+                compatible = "nvidia,tegra124-hsuart";
+        };
+
+        serial@70006300 {
+                compatible = "nvidia,tegra124-hsuart";
+        };
+
+        hdmi_ddc: i2c@7000c700 {
+                clock-frequency = <10000>;
+        };
+
+        /* PWR_I2C: power I2C to audio codec, PMIC and temperature sensor */
+        i2c@7000d000 {
+                status = "okay";
+                clock-frequency = <400000>;
+
+                /* SGTL5000 audio codec */
+                sgtl5000: codec@a {
+                        compatible = "fsl,sgtl5000";
+                        reg = <0x0a>;
+                        VDDA-supply = <&reg_3v3>;
+                        VDDIO-supply = <&vddio_1v8>;
+                        clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
+                };
+
+                pmic: pmic@40 {
+                        compatible = "ams,as3722";
+                        reg = <0x40>;
+                        interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
+                        ams,system-power-controller;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&as3722_default>;
+
+                        as3722_default: pinmux {
+                                gpio2_7 {
+                                        pins = "gpio2", /* PWR_EN_+V3.3 */
+                                               "gpio7"; /* +V1.6_LPO */
+                                        function = "gpio";
+                                        bias-pull-up;
+                                };
+
+                                gpio0_1_3_4_5_6 {
+                                        pins = "gpio0", "gpio1", "gpio3",
+                                               "gpio4", "gpio5", "gpio6";
+                                        bias-high-impedance;
+                                };
+                        };
+
+                        regulators {
+                                vsup-sd2-supply = <&reg_3v3>;
+                                vsup-sd3-supply = <&reg_3v3>;
+                                vsup-sd4-supply = <&reg_3v3>;
+                                vsup-sd5-supply = <&reg_3v3>;
+                                vin-ldo0-supply = <&vddio_ddr_1v35>;
+                                vin-ldo1-6-supply = <&reg_3v3>;
+                                vin-ldo2-5-7-supply = <&vddio_1v8>;
+                                vin-ldo3-4-supply = <&reg_3v3>;
+                                vin-ldo9-10-supply = <&reg_3v3>;
+                                vin-ldo11-supply = <&reg_3v3>;
+
+                                vdd_cpu: sd0 {
+                                        regulator-name = "+VDD_CPU_AP";
+                                        regulator-min-microvolt = <700000>;
+                                        regulator-max-microvolt = <1400000>;
+                                        regulator-min-microamp = <3500000>;
+                                        regulator-max-microamp = <3500000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                        ams,ext-control = <2>;
+                                };
+
+                                sd1 {
+                                        regulator-name = "+VDD_CORE";
+                                        regulator-min-microvolt = <700000>;
+                                        regulator-max-microvolt = <1350000>;
+                                        regulator-min-microamp = <2500000>;
+                                        regulator-max-microamp = <4000000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                        ams,ext-control = <1>;
+                                };
+
+                                vddio_ddr_1v35: sd2 {
+                                        regulator-name =
+                                                "+V1.35_VDDIO_DDR(sd2)";
+                                        regulator-min-microvolt = <1350000>;
+                                        regulator-max-microvolt = <1350000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                sd3 {
+                                        regulator-name =
+                                                "+V1.35_VDDIO_DDR(sd3)";
+                                        regulator-min-microvolt = <1350000>;
+                                        regulator-max-microvolt = <1350000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                vdd_1v05: sd4 {
+                                        regulator-name = "+V1.05";
+                                        regulator-min-microvolt = <1050000>;
+                                        regulator-max-microvolt = <1050000>;
+                                };
+
+                                vddio_1v8: sd5 {
+                                        regulator-name = "+V1.8";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-boot-on;
+                                        regulator-always-on;
+                                };
+
+                                vdd_gpu: sd6 {
+                                        regulator-name = "+VDD_GPU_AP";
+                                        regulator-min-microvolt = <650000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-min-microamp = <3500000>;
+                                        regulator-max-microamp = <3500000>;
+                                        regulator-boot-on;
+                                        regulator-always-on;
+                                };
+
+                                avdd_1v05: ldo0 {
+                                        regulator-name = "+V1.05_AVDD";
+                                        regulator-min-microvolt = <1050000>;
+                                        regulator-max-microvolt = <1050000>;
+                                        regulator-boot-on;
+                                        regulator-always-on;
+                                        ams,ext-control = <1>;
+                                };
+
+                                vddio_sdmmc1: ldo1 {
+                                        regulator-name = "VDDIO_SDMMC1";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                ldo2 {
+                                        regulator-name = "+V1.2";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-boot-on;
+                                        regulator-always-on;
+                                };
+
+                                ldo3 {
+                                        regulator-name = "+V1.05_RTC";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-boot-on;
+                                        regulator-always-on;
+                                        ams,enable-tracking;
+                                };
+
+                                /* 1.8V for LVDS, 3.3V for eDP */
+                                ldo4 {
+                                        regulator-name = "AVDD_LVDS0_PLL";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                /* LDO5 not used */
+
+                                vddio_sdmmc3: ldo6 {
+                                        regulator-name = "VDDIO_SDMMC3";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                /* LDO7 not used */
+
+                                ldo9 {
+                                        regulator-name = "+V3.3_ETH(ldo9)";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo10 {
+                                        regulator-name = "+V3.3_ETH(ldo10)";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo11 {
+                                        regulator-name = "+V1.8_VPP_FUSE";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+                        };
+                };
+
+                /*
+                 * TMP451 temperature sensor
+                 * Note: THERM_N directly connected to AS3722 PMIC THERM
+                 */
+                temperature-sensor@4c {
+                        compatible = "ti,tmp451";
+                        reg = <0x4c>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <TEGRA_GPIO(I, 6) IRQ_TYPE_LEVEL_LOW>;
+                        #thermal-sensor-cells = <1>;
+                };
+        };
+
+        /* SPI2: MCU SPI */
+        spi@7000d600 {
+                status = "okay";
+                spi-max-frequency = <25000000>;
+        };
+
+        pmc@7000e400 {
+                nvidia,invert-interrupt;
+                nvidia,suspend-mode = <1>;
+                nvidia,cpu-pwr-good-time = <500>;
+                nvidia,cpu-pwr-off-time = <300>;
+                nvidia,core-pwr-good-time = <641 3845>;
+                nvidia,core-pwr-off-time = <61036>;
+                nvidia,core-power-req-active-high;
+                nvidia,sys-clock-req-active-high;
+
+                /* Set power_off bit in ResetControl register of AS3722 PMIC */
+                i2c-thermtrip {
+                        nvidia,i2c-controller-id = <4>;
+                        nvidia,bus-addr = <0x40>;
+                        nvidia,reg-addr = <0x36>;
+                        nvidia,reg-data = <0x2>;
+                };
+        };
+
+        sata@70020000 {
+                phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
+                phy-names = "sata-0";
+                avdd-supply = <&vdd_1v05>;
+                hvdd-supply = <&reg_3v3>;
+                vddio-supply = <&vdd_1v05>;
+        };
+
+        usb@70090000 {
+                /* USBO1, USBO1 (SS), USBH2, USBH4 and USBH4 (SS) */
+                phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>,
+                       <&{/padctl@7009f000/pads/pcie/lanes/pcie-1}>,
+                       <&{/padctl@7009f000/pads/usb2/lanes/usb2-1}>,
+                       <&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>,
+                       <&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>;
+                phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0";
+                avddio-pex-supply = <&vdd_1v05>;
+                avdd-pll-erefe-supply = <&avdd_1v05>;
+                avdd-pll-utmip-supply = <&vddio_1v8>;
+                avdd-usb-ss-pll-supply = <&vdd_1v05>;
+                avdd-usb-supply = <&reg_3v3>;
+                dvddio-pex-supply = <&vdd_1v05>;
+                hvdd-usb-ss-pll-e-supply = <&reg_3v3>;
+                hvdd-usb-ss-supply = <&reg_3v3>;
+        };
+
+        padctl@7009f000 {
+                pads {
+                        usb2 {
+                                status = "okay";
+
+                                lanes {
+                                        usb2-0 {
+                                                nvidia,function = "xusb";
+                                                status = "okay";
+                                        };
+
+                                        usb2-1 {
+                                                nvidia,function = "xusb";
+                                                status = "okay";
+                                        };
+
+                                        usb2-2 {
+                                                nvidia,function = "xusb";
+                                                status = "okay";
+                                        };
+                                };
+                        };
+
+                        pcie {
+                                status = "okay";
+
+                                lanes {
+                                        pcie-0 {
+                                                nvidia,function = "usb3-ss";
+                                                status = "okay";
+                                        };
+
+                                        pcie-1 {
+                                                nvidia,function = "usb3-ss";
+                                                status = "okay";
+                                        };
+
+                                        pcie-2 {
+                                                nvidia,function = "pcie";
+                                                status = "okay";
+                                        };
+
+                                        pcie-3 {
+                                                nvidia,function = "pcie";
+                                                status = "okay";
+                                        };
+
+                                        pcie-4 {
+                                                nvidia,function = "pcie";
+                                                status = "okay";
+                                        };
+                                };
+                        };
+
+                        sata {
+                                status = "okay";
+
+                                lanes {
+                                        sata-0 {
+                                                nvidia,function = "sata";
+                                                status = "okay";
+                                        };
+                                };
+                        };
+                };
+
+                ports {
+                        /* USBO1 */
+                        usb2-0 {
+                                status = "okay";
+                                mode = "otg";
+
+                                vbus-supply = <&reg_usbo1_vbus>;
+                        };
+
+                        /* USBH2 */
+                        usb2-1 {
+                                status = "okay";
+                                mode = "host";
+
+                                vbus-supply = <&reg_usbh_vbus>;
+                        };
+
+                        /* USBH4 */
+                        usb2-2 {
+                                status = "okay";
+                                mode = "host";
+
+                                vbus-supply = <&reg_usbh_vbus>;
+                        };
+
+                        usb3-0 {
+                                nvidia,usb2-companion = <2>;
+                                status = "okay";
+                        };
+
+                        usb3-1 {
+                                nvidia,usb2-companion = <0>;
+                                status = "okay";
+                        };
+                };
+        };
+
+        /* eMMC */
+        sdhci@700b0600 {
+                status = "okay";
+                bus-width = <8>;
+                non-removable;
+        };
+
+        /* CPU DFLL clock */
+        clock@70110000 {
+                status = "okay";
+                vdd-cpu-supply = <&vdd_cpu>;
+                nvidia,i2c-fs-rate = <400000>;
+        };
+
+        ahub@70300000 {
+                i2s@70301200 {
+                        status = "okay";
+                };
+        };
+
+        clocks {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                clk32k_in: clock@0 {
+                        compatible = "fixed-clock";
+                        reg = <0>;
+                        #clock-cells = <0>;
+                        clock-frequency = <32768>;
+                };
+        };
+
+        cpus {
+                cpu@0 {
+                        vdd-cpu-supply = <&vdd_cpu>;
+                };
+        };
+
+        reg_1v05_avdd_hdmi_pll: regulator-1v05-avdd-hdmi-pll {
+                compatible = "regulator-fixed";
+                regulator-name = "+V1.05_AVDD_HDMI_PLL";
+                regulator-min-microvolt = <1050000>;
+                regulator-max-microvolt = <1050000>;
+                gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
+                vin-supply = <&vdd_1v05>;
+        };
+
+        reg_3v3_mxm: regulator-3v3-mxm {
+                compatible = "regulator-fixed";
+                regulator-name = "+V3.3_MXM";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        reg_3v3: regulator-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "+V3.3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+                regulator-boot-on;
+                /* PWR_EN_+V3.3 */
+                gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                vin-supply = <&reg_3v3_mxm>;
+        };
+
+        reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi {
+                compatible = "regulator-fixed";
+                regulator-name = "+V3.3_AVDD_HDMI";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                vin-supply = <&vdd_1v05>;
+        };
+
+        sound {
+                compatible = "toradex,tegra-audio-sgtl5000-apalis_tk1",
+                             "nvidia,tegra-audio-sgtl5000";
+                nvidia,model = "Toradex Apalis TK1";
+                nvidia,audio-routing =
+                        "Headphone Jack", "HP_OUT",
+                        "LINE_IN", "Line In Jack",
+                        "MIC_IN", "Mic Jack";
+                nvidia,i2s-controller = <&tegra_i2s2>;
+                nvidia,audio-codec = <&sgtl5000>;
+                clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
+                         <&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
+                         <&tegra_car TEGRA124_CLK_EXTERN1>;
+                clock-names = "pll_a", "pll_a_out0", "mclk";
+        };
+
+        thermal-zones {
+                cpu {
+                        trips {
+                                cpu-shutdown-trip {
+                                        temperature = <101000>;
+                                        hysteresis = <0>;
+                                        type = "critical";
+                                };
+                        };
+                };
+
+                mem {
+                        trips {
+                                mem-shutdown-trip {
+                                        temperature = <101000>;
+                                        hysteresis = <0>;
+                                        type = "critical";
+                                };
+                        };
+                };
+
+                gpu {
+                        trips {
+                                gpu-shutdown-trip {
+                                        temperature = <101000>;
+                                        hysteresis = <0>;
+                                        type = "critical";
+                                };
+                        };
+                };
+        };
+};
+
+&gpio {
+        /* I210 Gigabit Ethernet Controller Reset */
+        lan_reset_n {
+                gpio-hog;
+                gpios = <TEGRA_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "LAN_RESET_N";
+        };
+
+        /* Control MXM3 pin 26 Reset Module Output Carrier Input */
+        reset_moci_ctrl {
+                gpio-hog;
+                gpios = <TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "RESET_MOCI_CTRL";
+        };
+};
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 5d9b18ef5af6..65a2161b9b8e 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Toradex AG
+ * Copyright 2016-2018 Toradex AG
  *
  * 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
@@ -56,7 +56,6 @@
 
         pcie@1003000 {
                 status = "okay";
-
                 avddio-pex-supply = <&vdd_1v05>;
                 avdd-pex-pll-supply = <&vdd_1v05>;
                 avdd-pll-erefe-supply = <&avdd_1v05>;
@@ -85,7 +84,6 @@
                 hdmi@54280000 {
                         pll-supply = <&reg_1v05_avdd_hdmi_pll>;
                         vdd-supply = <&reg_3v3_avdd_hdmi>;
-
                         nvidia,ddc-i2c-bus = <&hdmi_ddc>;
                         nvidia,hpd-gpio =
                                 <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
@@ -453,12 +451,12 @@
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_DISABLE>;
                         };
-                        /* PWM3 active on pu6 being Apalis BKL1_PWM */
+                        /* PWM3 active on pu6 being Apalis BKL1_PWM as well */
                         ph3 {
                                 nvidia,pins = "ph3";
-                                nvidia,function = "gmi";
-                                nvidia,pull = <TEGRA_PIN_PULL_DOWN>;
-                                nvidia,tristate = <TEGRA_PIN_ENABLE>;
+                                nvidia,function = "pwm3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_DISABLE>;
                         };
 
@@ -1579,7 +1577,7 @@
         };
 
         hdmi_ddc: i2c@7000c400 {
-                clock-frequency = <100000>;
+                clock-frequency = <10000>;
         };
 
         /* PWR_I2C: power I2C to audio codec, PMIC and temperature sensor */
@@ -1600,15 +1598,11 @@
                         compatible = "ams,as3722";
                         reg = <0x40>;
                         interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
-
                         ams,system-power-controller;
-
                         #interrupt-cells = <2>;
                         interrupt-controller;
-
                         gpio-controller;
                         #gpio-cells = <2>;
-
                         pinctrl-names = "default";
                         pinctrl-0 = <&as3722_default>;
 
@@ -1620,9 +1614,9 @@
                                         bias-pull-up;
                                 };
 
-                                gpio1_3_4_5_6 {
-                                        pins = "gpio1", "gpio3", "gpio4",
-                                               "gpio5", "gpio6";
+                                gpio0_1_3_4_5_6 {
+                                        pins = "gpio0", "gpio1", "gpio3",
+                                               "gpio4", "gpio5", "gpio6";
                                         bias-high-impedance;
                                 };
                         };
@@ -1783,7 +1777,6 @@
                         reg = <0x4c>;
                         interrupt-parent = <&gpio>;
                         interrupts = <TEGRA_GPIO(I, 6) IRQ_TYPE_LEVEL_LOW>;
-
                         #thermal-sensor-cells = <1>;
                 };
         };
@@ -1816,7 +1809,6 @@
         sata@70020000 {
                 phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
                 phy-names = "sata-0";
-
                 avdd-supply = <&vdd_1v05>;
                 hvdd-supply = <&reg_3v3>;
                 vddio-supply = <&vdd_1v05>;
@@ -1830,7 +1822,6 @@
                        <&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>,
                        <&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>;
                 phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0";
-
                 avddio-pex-supply = <&vdd_1v05>;
                 avdd-pll-erefe-supply = <&avdd_1v05>;
                 avdd-pll-utmip-supply = <&vddio_1v8>;
@@ -2041,53 +2032,50 @@
         thermal-zones {
                 cpu {
                         trips {
-                                trip@0 {
+                                cpu-shutdown-trip {
                                         temperature = <101000>;
                                         hysteresis = <0>;
                                         type = "critical";
                                 };
                         };
-
-                        cooling-maps {
-                                /*
-                                 * There are currently no cooling maps because
-                                 * there are no cooling devices
-                                 */
-                        };
                 };
 
                 mem {
                         trips {
-                                trip@0 {
+                                mem-shutdown-trip {
                                         temperature = <101000>;
                                         hysteresis = <0>;
                                         type = "critical";
                                 };
                         };
-
-                        cooling-maps {
-                                /*
-                                 * There are currently no cooling maps because
-                                 * there are no cooling devices
-                                 */
-                        };
                 };
 
                 gpu {
                         trips {
-                                trip@0 {
+                                gpu-shutdown-trip {
                                         temperature = <101000>;
                                         hysteresis = <0>;
                                         type = "critical";
                                 };
                         };
-
-                        cooling-maps {
-                                /*
-                                 * There are currently no cooling maps because
-                                 * there are no cooling devices
-                                 */
-                        };
                 };
         };
 };
+
+&gpio {
+        /* I210 Gigabit Ethernet Controller Reset */
+        lan_reset_n {
+                gpio-hog;
+                gpios = <TEGRA_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "LAN_RESET_N";
+        };
+
+        /* Control MXM3 pin 26 Reset Module Output Carrier Input */
+        reset_moci_ctrl {
+                gpio-hog;
+                gpios = <TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
+                output-high;
+                line-name = "RESET_MOCI_CTRL";
+        };
+};
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index d112f85e66ed..6dbcf84dafbc 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1418,7 +1418,7 @@
                         compatible = "realtek,rt5639";
                         reg = <0x1c>;
                         interrupt-parent = <&gpio>;
-                        interrupts = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
+                        interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>;
                         realtek,ldo1-en-gpios =
                                 <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_HIGH>;
                 };
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 32d9079f025b..89bcc178994d 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -613,7 +613,7 @@
                         compatible = "maxim,max98090";
                         reg = <0x10>;
                         interrupt-parent = <&gpio>;
-                        interrupts = <TEGRA_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
+                        interrupts = <TEGRA_GPIO(H, 4) IRQ_TYPE_EDGE_FALLING>;
                 };
         };
 
@@ -859,7 +859,7 @@
                                         reg = <0x9>;
                                         interrupt-parent = <&gpio>;
                                         interrupts = <TEGRA_GPIO(J, 0)
-                                                        GPIO_ACTIVE_HIGH>;
+                                                        IRQ_TYPE_EDGE_BOTH>;
                                         ti,ac-detect-gpios = <&gpio
                                                         TEGRA_GPIO(J, 0)
                                                         GPIO_ACTIVE_HIGH>;
@@ -956,11 +956,6 @@
                                                 nvidia,function = "usb3-ss";
                                                 status = "okay";
                                         };
-
-                                        pcie-1 {
-                                                nvidia,function = "usb3-ss";
-                                                status = "okay";
-                                        };
                                 };
                         };
                 };
diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index 813ae34edd6a..5c202b3e3bb1 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -213,21 +213,27 @@
                         GPIO_ACTIVE_HIGH>;
         };
 
+        /*
+         * GEN1_I2C: I2C_SDA/SCL on SODIMM pin 194/196 (e.g. RTC on carrier
+         * board)
+         */
         i2c@7000c000 {
                 clock-frequency = <400000>;
         };
 
+        /* DDC_SCL/SDA on X3 pin 15/16 (e.g. display EDID) */
         i2c_ddc: i2c@7000c400 {
-                clock-frequency = <100000>;
+                clock-frequency = <10000>;
         };
 
-        i2c@7000c500 {
-                clock-frequency = <400000>;
-        };
+        /* GEN2_I2C: unused */
 
+        /* CAM/GEN3_I2C: used as EXT_IO1/2 GPIOs on SODIMM pin 133/127 */
+
+        /* PWR_I2C: power I2C to PMIC and temperature sensor (On-module) */
         i2c@7000d000 {
                 status = "okay";
-                clock-frequency = <400000>;
+                clock-frequency = <100000>;
 
                 pmic: tps6586x@34 {
                         compatible = "ti,tps6586x";
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 864a95872b8d..0a7136462a1a 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -17,7 +17,7 @@
                 #size-cells = <1>;
                 ranges = <0 0x40000000 0x40000>;
 
-                vde_pool: vde {
+                vde_pool: vde@400 {
                         reg = <0x400 0x3fc00>;
                         pool;
                 };
@@ -741,7 +741,7 @@
                 phy_type = "ulpi";
                 clocks = <&tegra_car TEGRA20_CLK_USB2>,
                          <&tegra_car TEGRA20_CLK_PLL_U>,
-                         <&tegra_car TEGRA20_CLK_CDEV2>;
+                         <&tegra_car TEGRA20_CLK_PLL_P_OUT4>;
                 clock-names = "reg", "pll_u", "ulpi-link";
                 resets = <&tegra_car 58>, <&tegra_car 22>;
                 reset-names = "usb", "utmi-pads";
diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
index 07b945b0391a..0dc85a20bd45 100644
--- a/arch/arm/boot/dts/tegra30-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -79,7 +79,7 @@
          */
         i2c@7000c000 {
                 status = "okay";
-                clock-frequency = <100000>;
+                clock-frequency = <400000>;
 
                 pcie-switch@58 {
                         compatible = "plx,pex8605";
@@ -88,7 +88,7 @@
 
                 /* M41T0M6 real time clock on carrier board */
                 rtc@68 {
-                        compatible = "st,m41t00";
+                        compatible = "st,m41t0";
                         reg = <0x68>;
                 };
         };
diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index faa8cd2914e8..d1d21ec2a844 100644
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -437,7 +437,7 @@
         };
 
         hdmiddc: i2c@7000c700 {
-                clock-frequency = <100000>;
+                clock-frequency = <10000>;
         };
 
         /*
@@ -597,7 +597,6 @@
 
                         stmpe_touchscreen@0 {
                                 compatible = "st,stmpe-ts";
-                                reg = <0>;
                                 /* 3.25 MHz ADC clock speed */
                                 st,adc-freq = <1>;
                                 /* 8 sample average control */
@@ -657,7 +656,7 @@
                         reg = <1>;
                         clocks = <&clk16m>;
                         interrupt-parent = <&gpio>;
-                        interrupts = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_LOW>;
+                        interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_RISING>;
                         spi-max-frequency = <10000000>;
                 };
         };
@@ -672,7 +671,7 @@
                         reg = <0>;
                         clocks = <&clk16m>;
                         interrupt-parent = <&gpio>;
-                        interrupts = <TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
+                        interrupts = <TEGRA_GPIO(W, 2) IRQ_TYPE_EDGE_RISING>;
                         spi-max-frequency = <10000000>;
                 };
         };
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 5331a8f7dcf8..ae52a5039506 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -260,14 +260,14 @@
                         };
                         sdmmc3_dat6_pd3 {
                                 nvidia,pins = "sdmmc3_dat6_pd3";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "spdif";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                         };
                         sdmmc3_dat7_pd4 {
                                 nvidia,pins = "sdmmc3_dat7_pd4";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "spdif";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -281,14 +281,14 @@
                         };
                         vi_vsync_pd6 {
                                 nvidia,pins = "vi_vsync_pd6";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "ddr";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                         };
                         vi_hsync_pd7 {
                                 nvidia,pins = "vi_hsync_pd7";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "ddr";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -806,7 +806,7 @@
                         };
                         hdmi_int_pn7 {
                                 nvidia,pins = "hdmi_int_pn7";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "hdmi";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_ENABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -841,7 +841,7 @@
                         };
                         ulpi_data3_po4 {
                                 nvidia,pins = "ulpi_data3_po4";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "uarta";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1107,21 +1107,21 @@
                         };
                         vi_d10_pt2 {
                                 nvidia,pins = "vi_d10_pt2";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "ddr";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                         };
                         vi_d11_pt3 {
                                 nvidia,pins = "vi_d11_pt3";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "ddr";
                                 nvidia,pull = <TEGRA_PIN_PULL_UP>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                         };
                         vi_d0_pt4 {
                                 nvidia,pins = "vi_d0_pt4";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "ddr";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1151,7 +1151,7 @@
                         };
                         pu0 {
                                 nvidia,pins = "pu0";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "owr";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1172,7 +1172,7 @@
                         };
                         pu3 {
                                 nvidia,pins = "pu3";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "pwm0";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1193,7 +1193,7 @@
                         };
                         pu6 {
                                 nvidia,pins = "pu6";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "pwm3";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1221,7 +1221,7 @@
                         };
                         pv3 {
                                 nvidia,pins = "pv3";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "clk_12m_out";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_DISABLE>;
@@ -1510,7 +1510,7 @@
                         };
                         pbb0 {
                                 nvidia,pins = "pbb0";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "i2s4";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1575,7 +1575,7 @@
                         };
                         pcc1 {
                                 nvidia,pins = "pcc1";
-                                nvidia,function = "rsvd1";
+                                nvidia,function = "i2s4";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
                                 nvidia,enable-input = <TEGRA_PIN_ENABLE>;
@@ -1762,7 +1762,7 @@
                         compatible = "realtek,rt5640";
                         reg = <0x1c>;
                         interrupt-parent = <&gpio>;
-                        interrupts = <TEGRA_GPIO(X, 3) GPIO_ACTIVE_HIGH>;
+                        interrupts = <TEGRA_GPIO(X, 3) IRQ_TYPE_EDGE_FALLING>;
                         realtek,ldo1-en-gpios =
                                 <&gpio TEGRA_GPIO(X, 2) GPIO_ACTIVE_HIGH>;
                 };
diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index 3c5fb2430212..16e1f387aa6d 100644
--- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -56,11 +56,11 @@
          */
         i2c@7000c000 {
                 status = "okay";
-                clock-frequency = <100000>;
+                clock-frequency = <400000>;
 
                 /* M41T0M6 real time clock on carrier board */
                 rtc@68 {
-                        compatible = "st,m41t00";
+                        compatible = "st,m41t0";
                         reg = <0x68>;
                 };
         };
@@ -79,7 +79,7 @@
                         reg = <0>;
                         clocks = <&clk16m>;
                         interrupt-parent = <&gpio>;
-                        interrupts = <TEGRA_GPIO(S, 0) GPIO_ACTIVE_LOW>;
+                        interrupts = <TEGRA_GPIO(S, 0) IRQ_TYPE_EDGE_RISING>;
                         spi-max-frequency = <10000000>;
                 };
                 spidev0: spi@1 {
diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index 139bfa028b04..c44d8c40c410 100644
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -215,7 +215,7 @@
         };
 
         hdmiddc: i2c@7000c700 {
-                clock-frequency = <100000>;
+                clock-frequency = <10000>;
         };
 
         /*
@@ -363,7 +363,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/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index c3e9f1e847db..a110cf84d85f 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -91,6 +91,19 @@
                 };
         };
 
+        iram@40000000 {
+                compatible = "mmio-sram";
+                reg = <0x40000000 0x40000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0x40000000 0x40000>;
+
+                vde_pool: vde@400 {
+                        reg = <0x400 0x3fc00>;
+                        pool;
+                };
+        };
+
         host1x@50000000 {
                 compatible = "nvidia,tegra30-host1x", "simple-bus";
                 reg = <0x50000000 0x00024000>;
@@ -358,6 +371,28 @@
                 */
         };
 
+        vde@6001a000 {
+                compatible = "nvidia,tegra30-vde", "nvidia,tegra20-vde";
+                reg = <0x6001a000 0x1000   /* Syntax Engine */
+                       0x6001b000 0x1000   /* Video Bitstream Engine */
+                       0x6001c000  0x100   /* Macroblock Engine */
+                       0x6001c200  0x100   /* Post-processing Engine */
+                       0x6001c400  0x100   /* Motion Compensation Engine */
+                       0x6001c600  0x100   /* Transform Engine */
+                       0x6001c800  0x100   /* Pixel prediction block */
+                       0x6001ca00  0x100   /* Video DMA */
+                       0x6001d800  0x400>; /* Video frame controls */
+                reg-names = "sxe", "bsev", "mbe", "ppe", "mce",
+                            "tfe", "ppb", "vdma", "frameid";
+                iram = <&vde_pool>; /* IRAM region */
+                interrupts = <GIC_SPI  9 IRQ_TYPE_LEVEL_HIGH>, /* Sync token interrupt */
+                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>, /* BSE-V interrupt */
+                             <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; /* SXE interrupt */
+                interrupt-names = "sync-token", "bsev", "sxe";
+                clocks = <&tegra_car TEGRA30_CLK_VDE>;
+                resets = <&tegra_car 61>;
+        };
+
         apbmisc@70000800 {
                 compatible = "nvidia,tegra30-apbmisc", "nvidia,tegra20-apbmisc";
                 reg = <0x70000800 0x64   /* Chip revision */
diff --git a/arch/arm/boot/dts/uniphier-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ld4-ref.dts
index a3afd0cda42f..21407e159bf7 100644
--- a/arch/arm/boot/dts/uniphier-ld4-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ld4-ref.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD4 Reference Board
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD4 Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-ld4.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index 0459e84d4d8e..37950ad2de7c 100644
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD4 SoC
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD4 SoC
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 #include <dt-bindings/gpio/uniphier-gpio.h>
 
diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
index 811b999800ed..a0a44a422e12 100644
--- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD6b Reference Board
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD6b Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-ld6b.dtsi"
@@ -67,6 +65,17 @@
         status = "okay";
 };
 
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@0 {
+                reg = <0>;
+        };
+};
+
 &nand {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/uniphier-ld6b.dtsi b/arch/arm/boot/dts/uniphier-ld6b.dtsi
index 9a7b25cc8233..4d07a94c6b34 100644
--- a/arch/arm/boot/dts/uniphier-ld6b.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld6b.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD6b SoC
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD6b SoC
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /*
  * LD6b consists of two silicon dies: D-chip and A-chip.
diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
index de481c372467..51f0e69f49fd 100644
--- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier SoCs default pinctrl settings
- *
- * Copyright (C) 2015-2017 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier SoCs default pinctrl settings
+//
+// Copyright (C) 2015-2017 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 &pinctrl {
         pinctrl_aout: aout {
@@ -13,6 +11,46 @@
                 function = "aout";
         };
 
+        pinctrl_ain1: ain1 {
+                groups = "ain1";
+                function = "ain1";
+        };
+
+        pinctrl_ain2: ain2 {
+                groups = "ain2";
+                function = "ain2";
+        };
+
+        pinctrl_ainiec1: ainiec1 {
+                groups = "ainiec1";
+                function = "ainiec1";
+        };
+
+        pinctrl_aout1: aout1 {
+                groups = "aout1";
+                function = "aout1";
+        };
+
+        pinctrl_aout2: aout2 {
+                groups = "aout2";
+                function = "aout2";
+        };
+
+        pinctrl_aout3: aout3 {
+                groups = "aout3";
+                function = "aout3";
+        };
+
+        pinctrl_aoutiec1: aoutiec1 {
+                groups = "aoutiec1";
+                function = "aoutiec1";
+        };
+
+        pinctrl_aoutiec2: aoutiec2 {
+                groups = "aoutiec2";
+                function = "aoutiec2";
+        };
+
         pinctrl_emmc: emmc {
                 groups = "emmc", "emmc_dat8";
                 function = "emmc";
@@ -33,6 +71,16 @@
                 function = "ether_rmii";
         };
 
+        pinctrl_ether1_rgmii: ether1-rgmii {
+                groups = "ether1_rgmii";
+                function = "ether1_rgmii";
+        };
+
+        pinctrl_ether1_rmii: ether1-rmii {
+                groups = "ether1_rmii";
+                function = "ether1_rmii";
+        };
+
         pinctrl_i2c0: i2c0 {
                 groups = "i2c0";
                 function = "i2c0";
diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts
index 089419cee273..db1b08935ae5 100644
--- a/arch/arm/boot/dts/uniphier-pro4-ace.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier Pro4 Ace Board
- *
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier Pro4 Ace Board
+//
+// Copyright (C) 2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-pro4.dtsi"
@@ -77,3 +75,14 @@
 &usb3 {
         status = "okay";
 };
+
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@1 {
+                reg = <1>;
+        };
+};
diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts
index 6a004e5cf786..efb084983b82 100644
--- a/arch/arm/boot/dts/uniphier-pro4-ref.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier Pro4 Reference Board
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier Pro4 Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-pro4.dtsi"
@@ -75,6 +73,17 @@
         status = "okay";
 };
 
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@0 {
+                reg = <0>;
+        };
+};
+
 &nand {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts
index adef212b45b2..dac4d6679a32 100644
--- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier Pro4 Sanji Board
- *
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier Pro4 Sanji Board
+//
+// Copyright (C) 2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-pro4.dtsi"
@@ -72,3 +70,14 @@
 &usb3 {
         status = "okay";
 };
+
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@1 {
+                reg = <1>;
+        };
+};
diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index 1a29a8619856..844124bc9c9c 100644
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier Pro4 SoC
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier Pro4 SoC
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 #include <dt-bindings/gpio/uniphier-gpio.h>
 
@@ -366,6 +364,24 @@
                         };
                 };
 
+                eth: ethernet@65000000 {
+                        compatible = "socionext,uniphier-pro4-ave4";
+                        status = "disabled";
+                        reg = <0x65000000 0x8500>;
+                        interrupts = <0 66 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ether_rgmii>;
+                        clocks = <&sys_clk 6>;
+                        resets = <&sys_rst 6>;
+                        phy-mode = "rgmii";
+                        local-mac-address = [00 00 00 00 00 00];
+
+                        mdio: mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
                 nand: nand@68000000 {
                         compatible = "socionext,uniphier-denali-nand-v5a";
                         status = "disabled";
diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
index f291dd63de9c..06c2cef91ec7 100644
--- a/arch/arm/boot/dts/uniphier-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier Pro5 SoC
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier Pro5 SoC
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 / {
         compatible = "socionext,uniphier-pro5";
diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
index 7dfae2667f50..bed26b8ed9a3 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier PXs2 Gentil Board
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier PXs2 Gentil Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-pxs2.dtsi"
@@ -34,6 +32,12 @@
                 device_type = "memory";
                 reg = <0x80000000 0x80000000>;
         };
+
+        sound {
+                compatible = "audio-graph-card";
+                label = "UniPhier PXs2";
+                dais = <&i2s_port2>;
+        };
 };
 
 &serial2 {
@@ -50,6 +54,35 @@
         };
 };
 
+&i2s_aux {
+        dai-format = "i2s";
+        remote-endpoint = <&wm_speaker>;
+};
+
 &i2c2 {
         status = "okay";
+
+        wm8960@1a {
+                compatible = "wlf,wm8960";
+                reg = <0x1a>;
+                #sound-dai-cells = <0>;
+
+                port@0 {
+                        wm_speaker: endpoint {
+                                dai-format = "i2s";
+                                remote-endpoint = <&i2s_aux>;
+                        };
+                };
+        };
+};
+
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@1 {
+                reg = <1>;
+        };
 };
diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
index 0cf615463a82..b13d2d16ddad 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier PXs2 Vodka Board
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier PXs2 Vodka Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-pxs2.dtsi"
@@ -32,12 +30,60 @@
                 device_type = "memory";
                 reg = <0x80000000 0x80000000>;
         };
+
+        sound {
+                compatible = "audio-graph-card";
+                label = "UniPhier PXs2";
+                dais = <&spdif_port0
+                        &comp_spdif_port0>;
+        };
+
+        spdif-out {
+                compatible = "linux,spdif-dit";
+                #sound-dai-cells = <0>;
+
+                port@0 {
+                        spdif_tx: endpoint {
+                                remote-endpoint = <&spdif_hiecout1>;
+                        };
+                };
+        };
+
+        comp-spdif-out {
+                compatible = "linux,spdif-dit";
+                #sound-dai-cells = <0>;
+
+                port@0 {
+                        comp_spdif_tx: endpoint {
+                                remote-endpoint = <&comp_spdif_hiecout1>;
+                        };
+                };
+        };
 };
 
 &serial2 {
         status = "okay";
 };
 
+&spdif_hiecout1 {
+        remote-endpoint = <&spdif_tx>;
+};
+
+&comp_spdif_hiecout1 {
+        remote-endpoint = <&comp_spdif_tx>;
+};
+
 &i2c0 {
         status = "okay";
 };
+
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@1 {
+                reg = <1>;
+        };
+};
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index c083468c17db..debcbd15c24b 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier PXs2 SoC
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier PXs2 SoC
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 #include <dt-bindings/gpio/uniphier-gpio.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -227,6 +225,61 @@
                                                      <21 217 3>;
                 };
 
+                audio@56000000 {
+                        compatible = "socionext,uniphier-pxs2-aio";
+                        reg = <0x56000000 0x80000>;
+                        interrupts = <0 144 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ain1>,
+                                    <&pinctrl_ain2>,
+                                    <&pinctrl_ainiec1>,
+                                    <&pinctrl_aout2>,
+                                    <&pinctrl_aout3>,
+                                    <&pinctrl_aoutiec1>,
+                                    <&pinctrl_aoutiec2>;
+                        clock-names = "aio";
+                        clocks = <&sys_clk 40>;
+                        reset-names = "aio";
+                        resets = <&sys_rst 40>;
+                        #sound-dai-cells = <1>;
+                        socionext,syscon = <&soc_glue>;
+
+                        i2s_port0: port@0 {
+                                i2s_hdmi: endpoint {
+                                };
+                        };
+
+                        i2s_port1: port@1 {
+                                i2s_line: endpoint {
+                                };
+                        };
+
+                        i2s_port2: port@2 {
+                                i2s_aux: endpoint {
+                                };
+                        };
+
+                        spdif_port0: port@3 {
+                                spdif_hiecout1: endpoint {
+                                };
+                        };
+
+                        spdif_port1: port@4 {
+                                spdif_iecout1: endpoint {
+                                };
+                        };
+
+                        comp_spdif_port0: port@5 {
+                                comp_spdif_hiecout1: endpoint {
+                                };
+                        };
+
+                        comp_spdif_port1: port@6 {
+                                comp_spdif_iecout1: endpoint {
+                                };
+                        };
+                };
+
                 i2c0: i2c@58780000 {
                         compatible = "socionext,uniphier-fi2c";
                         status = "disabled";
@@ -366,7 +419,7 @@
                         };
                 };
 
-                soc-glue@5f800000 {
+                soc_glue: soc-glue@5f800000 {
                         compatible = "socionext,uniphier-pxs2-soc-glue",
                                      "simple-mfd", "syscon";
                         reg = <0x5f800000 0x2000>;
@@ -446,6 +499,24 @@
                         };
                 };
 
+                eth: ethernet@65000000 {
+                        compatible = "socionext,uniphier-pxs2-ave4";
+                        status = "disabled";
+                        reg = <0x65000000 0x8500>;
+                        interrupts = <0 66 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ether_rgmii>;
+                        clocks = <&sys_clk 6>;
+                        resets = <&sys_rst 6>;
+                        phy-mode = "rgmii";
+                        local-mac-address = [00 00 00 00 00 00];
+
+                        mdio: mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
                 nand: nand@68000000 {
                         compatible = "socionext,uniphier-denali-nand-v5b";
                         status = "disabled";
diff --git a/arch/arm/boot/dts/uniphier-ref-daughter.dtsi b/arch/arm/boot/dts/uniphier-ref-daughter.dtsi
index 7a1c29b558d5..04e60c295319 100644
--- a/arch/arm/boot/dts/uniphier-ref-daughter.dtsi
+++ b/arch/arm/boot/dts/uniphier-ref-daughter.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier Reference Daughter Board
- *
- * Copyright (C) 2015-2017 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier Reference Daughter Board
+//
+// Copyright (C) 2015-2017 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 &i2c0 {
         eeprom@50 {
diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts
index e052ea3b4020..fe386fa2ea4b 100644
--- a/arch/arm/boot/dts/uniphier-sld8-ref.dts
+++ b/arch/arm/boot/dts/uniphier-sld8-ref.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier sLD8 Reference Board
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier sLD8 Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-sld8.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index bc8c24078faa..e9b9b4f3c558 100644
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier sLD8 SoC
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier sLD8 SoC
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 #include <dt-bindings/gpio/uniphier-gpio.h>
 
diff --git a/arch/arm/boot/dts/uniphier-support-card.dtsi b/arch/arm/boot/dts/uniphier-support-card.dtsi
index e4e7e1bb9172..bf441c2eff79 100644
--- a/arch/arm/boot/dts/uniphier-support-card.dtsi
+++ b/arch/arm/boot/dts/uniphier-support-card.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier Support Card (Expansion Board)
- *
- * Copyright (C) 2015-2017 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier Support Card (Expansion Board)
+//
+// Copyright (C) 2015-2017 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 &system_bus {
         status = "okay";
diff --git a/arch/arm/boot/dts/versatile-ab-ib2.dts b/arch/arm/boot/dts/versatile-ab-ib2.dts
new file mode 100644
index 000000000000..5890cb974f78
--- /dev/null
+++ b/arch/arm/boot/dts/versatile-ab-ib2.dts
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * The Versatile AB with the IB2 expansion board mounted.
+ * This works as a superset of the Versatile AB.
+ */
+
+#include "versatile-ab.dts"
+
+/ {
+        model = "ARM Versatile AB + IB2 board";
+
+        /* Special IB2 control register */
+        ib2_syscon@27000000 {
+                compatible = "arm,versatile-ib2-syscon", "syscon", "simple-mfd";
+                reg = <0x27000000 0x4>;
+
+                led@00.4 {
+                        compatible = "register-bit-led";
+                        offset = <0x00>;
+                        mask = <0x10>;
+                        label = "versatile-ib2:0";
+                        linux,default-trigger = "heartbeat";
+                        default-state = "on";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index 4a51612996bc..5f61d3609027 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -30,6 +30,43 @@
                 clock-frequency = <24000000>;
         };
 
+        bridge {
+                compatible = "ti,ths8134b", "ti,ths8134";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
+                                vga_bridge_in: endpoint {
+                                        remote-endpoint = <&clcd_pads_vga_dac>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                vga_bridge_out: endpoint {
+                                        remote-endpoint = <&vga_con_in>;
+                                };
+                        };
+                };
+        };
+
+        vga {
+                compatible = "vga-connector";
+
+                port {
+                        vga_con_in: endpoint {
+                                remote-endpoint = <&vga_bridge_out>;
+                        };
+                };
+        };
+
         core-module@10000000 {
                 compatible = "arm,core-module-versatile", "syscon", "simple-mfd";
                 reg = <0x10000000 0x200>;
@@ -230,7 +267,39 @@
                         reg = <0x10120000 0x1000>;
                         interrupts = <16>;
                         clocks = <&osc1>, <&pclk>;
-                        clock-names = "clcd", "apb_pclk";
+                        clock-names = "clcdclk", "apb_pclk";
+                        /* 800x600 16bpp @ 36MHz works fine */
+                        max-memory-bandwidth = <54000000>;
+
+                        /*
+                         * This port is routed through a PLD (Programmable
+                         * Logic Device) that routes the output from the CLCD
+                         * (after transformations) to the VGA DAC and also an
+                         * external panel connector. The PLD is essential for
+                         * supporting RGB565/BGR565.
+                         *
+                         * The signals from the port thus reaches two endpoints.
+                         * The PLD is managed through a few special bits in the
+                         * FPGA "sysreg".
+                         *
+                         * This arrangement can be clearly seen in
+                         * ARM DUI 0225D, page 3-41, figure 3-19.
+                         */
+                        port@0 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                clcd_pads_panel: endpoint@0 {
+                                        reg = <0>;
+                                        remote-endpoint = <&panel_in>;
+                                        arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
+                                };
+                                clcd_pads_vga_dac: endpoint@1 {
+                                        reg = <1>;
+                                        remote-endpoint = <&vga_bridge_in>;
+                                        arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
+                                };
+                        };
                 };
 
                 sctl@101e0000 {
@@ -319,8 +388,18 @@
                         ranges = <0 0x10000000 0x10000>;
 
                         sysreg@0 {
-                                compatible = "arm,versatile-sysreg", "syscon";
+                                compatible = "arm,versatile-sysreg", "syscon", "simple-mfd";
                                 reg = <0x00000 0x1000>;
+
+                                panel: display@0 {
+                                        compatible = "arm,versatile-tft-panel";
+
+                                        port {
+                                                panel_in: endpoint {
+                                                        remote-endpoint = <&clcd_pads_panel>;
+                                                };
+                                        };
+                                };
                         };
 
                         aaci@4000 {
diff --git a/arch/arm/boot/dts/vf500-colibri.dtsi b/arch/arm/boot/dts/vf500-colibri.dtsi
index 515c4d2f28b0..2e7e3cebba1c 100644
--- a/arch/arm/boot/dts/vf500-colibri.dtsi
+++ b/arch/arm/boot/dts/vf500-colibri.dtsi
@@ -46,7 +46,7 @@
         model = "Toradex Colibri VF50 COM";
         compatible = "toradex,vf610-colibri_vf50", "fsl,vf500";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x8000000>;
         };
 
diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi
index 348bcd30c0f7..bbff0115e2fb 100644
--- a/arch/arm/boot/dts/vf500.dtsi
+++ b/arch/arm/boot/dts/vf500.dtsi
@@ -39,11 +39,16 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include "vfxxx.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        chosen { };
+        aliases { };
+        memory { device_type = "memory"; };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi
index 395812c52933..aeaf99f1f0fc 100644
--- a/arch/arm/boot/dts/vf610-colibri.dtsi
+++ b/arch/arm/boot/dts/vf610-colibri.dtsi
@@ -46,7 +46,7 @@
         model = "Toradex Colibri VF61 COM";
         compatible = "toradex,vf610-colibri_vf61", "fsl,vf610";
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x10000000>;
         };
 };
diff --git a/arch/arm/boot/dts/vf610-cosmic.dts b/arch/arm/boot/dts/vf610-cosmic.dts
index 5447f2594659..a3014e8d97a9 100644
--- a/arch/arm/boot/dts/vf610-cosmic.dts
+++ b/arch/arm/boot/dts/vf610-cosmic.dts
@@ -19,7 +19,7 @@
                 bootargs = "console=ttyLP1,115200";
         };
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x10000000>;
         };
 
diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index 6f787e67bd2e..6be7a828ae64 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -50,7 +50,7 @@
                 bootargs = "console=ttyLP1,115200";
         };
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x8000000>;
         };
 
diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi
index aadd36db0092..4890b8a5aa44 100644
--- a/arch/arm/boot/dts/vf610-zii-dev.dtsi
+++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi
@@ -49,7 +49,7 @@
                 stdout-path = "serial0:115200n8";
         };
 
-        memory {
+        memory@80000000 {
                 reg = <0x80000000 0x20000000>;
         };
 
diff --git a/arch/arm/boot/dts/vf610m4-colibri.dts b/arch/arm/boot/dts/vf610m4-colibri.dts
index 7198e8cceb0d..41ec66a96990 100644
--- a/arch/arm/boot/dts/vf610m4-colibri.dts
+++ b/arch/arm/boot/dts/vf610m4-colibri.dts
@@ -51,10 +51,10 @@
 
         chosen {
                 bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw";
-                linux,stdout-path = "&uart2";
+                stdout-path = "&uart2";
         };
 
-        memory {
+        memory@8c000000 {
                 reg = <0x8c000000 0x3000000>;
         };
 };
diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi
index 1474bd34d0f1..8293276b55a6 100644
--- a/arch/arm/boot/dts/vf610m4.dtsi
+++ b/arch/arm/boot/dts/vf610m4.dtsi
@@ -42,10 +42,17 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include "armv7-m.dtsi"
 #include "vfxxx.dtsi"
 
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        chosen { };
+        aliases { };
+        memory { device_type = "memory"; };
+};
+
 &mscm_ir {
         interrupt-parent = <&nvic>;
 };
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 0f79fe1ccd9d..e22507e23303 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
- *  Copyright (C) 2011 - 2014 Xilinx
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program 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.
+ * Copyright (C) 2011 - 2014 Xilinx
  */
 
 / {
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
new file mode 100644
index 000000000000..1a0f631c1d8d
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx CC108 board DTS
+ *
+ * (C) Copyright 2007-2018 Xilinx, Inc.
+ * (C) Copyright 2007-2013 Michal Simek
+ * (C) Copyright 2007-2012 PetaLogix Qld Pty Ltd
+ *
+ * Michal SIMEK <monstr@monstr.eu>
+ */
+/dts-v1/;
+/include/ "zynq-7000.dtsi"
+
+/ {
+        compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
+        model = "Xilinx Zynq";
+
+        aliases {
+                ethernet0 = &gem0;
+                serial0 = &uart0;
+        };
+
+        chosen {
+                bootargs = "";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x20000000>;
+        };
+
+        usb_phy0: phy0 {
+                compatible = "usb-nop-xceiv";
+                #phy-cells = <0>;
+        };
+
+        usb_phy1: phy1 {
+                compatible = "usb-nop-xceiv";
+                #phy-cells = <0>;
+        };
+};
+
+&gem0 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy>;
+
+        ethernet_phy: ethernet-phy@1 {
+                reg = <1>;
+                device_type = "ethernet-phy";
+        };
+};
+
+&sdhci1 {
+        status = "okay";
+        broken-cd ;
+        wp-inverted ;
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&usb0 {
+        status = "okay";
+        dr_mode = "host";
+        usb-phy = <&usb_phy0>;
+};
+
+&usb1 {
+        status = "okay";
+        dr_mode = "host";
+        usb-phy = <&usb_phy1>;
+};
diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
index b9376a4904b4..aa4a0b6defb8 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -1,15 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2011 - 2014 Xilinx
  * Copyright (C) 2016 Jagan Teki <jteki@openedev.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program 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.
  */
 /dts-v1/;
 /include/ "zynq-7000.dtsi"
@@ -23,7 +15,7 @@
                 serial0 = &uart1;
         };
 
-        memory {
+        memory@0 {
                 device_type = "memory";
                 reg = <0x0 0x40000000>;
         };
diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
index 0144acfa9793..c05f4b67d4c1 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014 SUSE LINUX Products GmbH
  *
@@ -6,15 +7,6 @@
  *  Copyright (C) 2011 Xilinx
  *  Copyright (C) 2012 National Instruments Corp.
  *  Copyright (C) 2013 Xilinx
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program 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.
  */
 /dts-v1/;
 /include/ "zynq-7000.dtsi"
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 70a5de76b7db..f2330b0cb63d 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -1,15 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2011 - 2014 Xilinx
  *  Copyright (C) 2012 National Instruments Corp.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program 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.
  */
 /dts-v1/;
 #include "zynq-7000.dtsi"
@@ -112,7 +104,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_i2c0_default>;
 
-        i2cswitch@74 {
+        i2c-mux@74 {
                 compatible = "nxp,pca9548";
                 #address-cells = <1>;
                 #size-cells = <0>;
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index cdc326ec3335..3ad1260ff2a1 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -1,15 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2011 - 2014 Xilinx
  *  Copyright (C) 2012 National Instruments Corp.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program 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.
  */
 /dts-v1/;
 #include "zynq-7000.dtsi"
@@ -68,7 +60,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_i2c0_default>;
 
-        i2cswitch@74 {
+        i2c-mux@74 {
                 compatible = "nxp,pca9548";
                 #address-cells = <1>;
                 #size-cells = <0>;
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
new file mode 100644
index 000000000000..6884f1ad66b7
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx ZC770 XM010 board DTS
+ *
+ * Copyright (C) 2013-2018 Xilinx, Inc.
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+        compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
+        model = "Xilinx Zynq";
+
+        aliases {
+                ethernet0 = &gem0;
+                i2c0 = &i2c0;
+                serial0 = &uart1;
+                spi1 = &spi1;
+        };
+
+        chosen {
+                bootargs = "";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x40000000>;
+        };
+
+        usb_phy0: phy0 {
+                compatible = "usb-nop-xceiv";
+                #phy-cells = <0>;
+        };
+};
+
+&can0 {
+        status = "okay";
+};
+
+&gem0 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy>;
+
+        ethernet_phy: ethernet-phy@7 {
+                reg = <7>;
+                device_type = "ethernet-phy";
+        };
+};
+
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        eeprom: eeprom@52 {
+                compatible = "atmel,24c02";
+                reg = <0x52>;
+        };
+
+};
+
+&sdhci0 {
+        status = "okay";
+};
+
+&spi1 {
+        status = "okay";
+        num-cs = <4>;
+        is-decoded-cs = <0>;
+        flash@0 {
+                compatible = "sst25wf080", "jedec,spi-nor";
+                reg = <1>;
+                spi-max-frequency = <1000000>;
+                partitions {
+                        compatible = "fixed-partitions";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        partition@0 {
+                                label = "data";
+                                reg = <0x0 0x100000>;
+                        };
+                };
+        };
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&usb0 {
+        status = "okay";
+        dr_mode = "host";
+        usb-phy = <&usb_phy0>;
+};
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
new file mode 100644
index 000000000000..b78883cee96a
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx ZC770 XM013 board DTS
+ *
+ * Copyright (C) 2013-2018 Xilinx, Inc.
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+        compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
+        model = "Xilinx Zynq";
+
+        aliases {
+                i2c0 = &i2c1;
+                serial0 = &uart1;
+                spi0 = &spi0;
+        };
+
+        chosen {
+                bootargs = "";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x40000000>;
+        };
+
+        usb_phy1: phy1 {
+                compatible = "usb-nop-xceiv";
+                #phy-cells = <0>;
+        };
+};
+
+&can0 {
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        eeprom: eeprom@52 {
+                compatible = "atmel,24c02";
+                reg = <0x52>;
+        };
+};
+
+&spi0 {
+        status = "okay";
+        num-cs = <4>;
+        is-decoded-cs = <0>;
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&usb1 {
+        status = "okay";
+        dr_mode = "host";
+        usb-phy = <&usb_phy1>;
+};
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
new file mode 100644
index 000000000000..c3169d63600d
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx ZC770 XM012 board DTS
+ *
+ * Copyright (C) 2013-2018 Xilinx, Inc.
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+        compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
+        model = "Xilinx Zynq";
+
+        aliases {
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                serial0 = &uart1;
+                spi0 = &spi1;
+        };
+
+        chosen {
+                bootargs = "";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x40000000>;
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        eeprom0: eeprom@52 {
+                compatible = "atmel,24c02";
+                reg = <0x52>;
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        eeprom1: eeprom@52 {
+                compatible = "atmel,24c02";
+                reg = <0x52>;
+        };
+};
+
+&spi1 {
+        status = "okay";
+        num-cs = <4>;
+        is-decoded-cs = <0>;
+};
+
+&uart1 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
new file mode 100644
index 000000000000..8bb66859d774
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Xilinx ZC770 XM013 board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+        compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";
+        model = "Xilinx Zynq";
+
+        aliases {
+                ethernet0 = &gem1;
+                i2c0 = &i2c1;
+                serial0 = &uart0;
+                spi1 = &spi0;
+        };
+
+        chosen {
+                bootargs = "";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x40000000>;
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&gem1 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy>;
+
+        ethernet_phy: ethernet-phy@7 {
+                reg = <7>;
+                device_type = "ethernet-phy";
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        si570: clock-generator@55 {
+                #clock-cells = <0>;
+                compatible = "silabs,si570";
+                temperature-stability = <50>;
+                reg = <0x55>;
+                factory-fout = <156250000>;
+                clock-frequency = <148500000>;
+        };
+};
+
+&spi0 {
+        status = "okay";
+        num-cs = <4>;
+        is-decoded-cs = <0>;
+        eeprom: eeprom@0 {
+                at25,byte-len = <8192>;
+                at25,addr-mode = <2>;
+                at25,page-size = <32>;
+
+                compatible = "atmel,at25";
+                reg = <2>;
+                spi-max-frequency = <1000000>;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 5e44dc12fd60..53c6883ce1f6 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -1,15 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2011 - 2014 Xilinx
  *  Copyright (C) 2012 National Instruments Corp.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program 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.
  */
 /dts-v1/;
 #include "zynq-7000.dtsi"
diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts
new file mode 100644
index 000000000000..1e713dc98920
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-zybo-z7.dts
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: GPL-2.0+
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+        model = "Zynq ZYBO Z7 Development Board";
+        compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000";
+
+        aliases {
+                ethernet0 = &gem0;
+                serial0 = &uart1;
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x20000000>;
+        };
+
+        chosen {
+                bootargs = "";
+                stdout-path = "serial0:115200n8";
+        };
+
+        usb_phy0: phy0 {
+                #phy-cells = <0>;
+                compatible = "usb-nop-xceiv";
+                reset-gpios = <&gpio0 46 1>;
+        };
+};
+
+&clkc {
+        ps-clk-frequency = <33333333>;
+};
+
+&gem0 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy>;
+
+        ethernet_phy: ethernet-phy@0 {
+                reg = <0>;
+                device_type = "ethernet-phy";
+        };
+};
+
+&sdhci0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&usb0 {
+        status = "okay";
+        dr_mode = "host";
+        usb-phy = <&usb_phy0>;
+};
diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts
index e40cafc5ee5b..a6c00e7fa767 100644
--- a/arch/arm/boot/dts/zynq-zybo.dts
+++ b/arch/arm/boot/dts/zynq-zybo.dts
@@ -1,15 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2011 - 2014 Xilinx
  *  Copyright (C) 2012 National Instruments Corp.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program 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.
  */
 /dts-v1/;
 #include "zynq-7000.dtsi"
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index da7387689b88..28f1d714e5b9 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -751,6 +751,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SH_MMCIF=y
 CONFIG_MMC_SUNXI=y
 CONFIG_MMC_BCM2835=y
+CONFIG_MMC_SDHCI_OMAP=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 92674f247a12..bce7e5abcc05 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -431,8 +431,11 @@ CONFIG_USB_ZERO=m
 CONFIG_USB_G_NOKIA=m
 CONFIG_MMC=y
 CONFIG_SDIO_UART=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_SDHCI_OMAP=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_CPCAP=m
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index fbedbd8f619a..2b1535cdeb7c 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -190,12 +190,24 @@ config ARCH_R8A7796
         help
           This enables support for the Renesas R-Car M3-W SoC.
 
+config ARCH_R8A77965
+        bool "Renesas R-Car M3-N SoC Platform"
+        depends on ARCH_RENESAS
+        help
+          This enables support for the Renesas R-Car M3-N SoC.
+
 config ARCH_R8A77970
         bool "Renesas R-Car V3M SoC Platform"
         depends on ARCH_RENESAS
         help
           This enables support for the Renesas R-Car V3M SoC.
 
+config ARCH_R8A77980
+        bool "Renesas R-Car V3H SoC Platform"
+        depends on ARCH_RENESAS
+        help
+          This enables support for the Renesas R-Car V3H SoC.
+
 config ARCH_R8A77995
         bool "Renesas R-Car D3 SoC Platform"
         depends on ARCH_RENESAS
diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index f505227b0250..8bebe7da5ed9 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -5,8 +5,11 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepi-win.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index a6975670cd1c..2250dec9974c 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -120,8 +120,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
         disable-wp;
         bus-width = <4>;
         status = "okay";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
index 2beef9e6cb88..e2dce48fa29a 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
@@ -82,8 +82,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
         disable-wp;
         bus-width = <4>;
         status = "okay";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
index 8807664f363a..3b3081b10ecb 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts
@@ -68,8 +68,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
         disable-wp;
         bus-width = <4>;
         status = "okay";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
index 240d35731d10..bf42690a3361 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
@@ -67,8 +67,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index 604cdaedac38..a75825798a71 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -103,8 +103,7 @@
         pinctrl-names = "default";
         pinctrl-0 = <&mmc0_pins>;
         vmmc-supply = <&reg_dcdc1>;
-        cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
-        cd-inverted;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
         disable-wp;
         bus-width = <4>;
         status = "okay";
@@ -230,6 +229,11 @@
         regulator-name = "vcc-rtc";
 };
 
+/* On Euler connector */
+&spdif {
+        status = "disabled";
+};
+
 /* On Exp and Euler connectors */
 &uart0 {
         pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
new file mode 100644
index 000000000000..d9baab3dc96b
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) Harald Geyer <harald@ccbib.org>
+ * based on sun50i-a64-olinuxino.dts by Jagan Teki <jteki@openedev.com>
+ *
+ * SPDX-License-Identifier: (GPL-2.0 OR MIT)
+ */
+
+/dts-v1/;
+
+#include "sun50i-a64.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/pwm/pwm.h>
+
+/ {
+        model = "Olimex A64 Teres-I";
+        compatible = "olimex,a64-teres-i", "allwinner,sun50i-a64";
+
+        aliases {
+                serial0 = &uart0;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+
+                framebuffer-lcd {
+                        eDP25-supply = <&reg_dldo2>;
+                        eDP12-supply = <&reg_dldo3>;
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                lid-switch {
+                        label = "Lid Switch";
+                        gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */
+                        linux,input-type = <EV_SW>;
+                        linux,code = <SW_LID>;
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                capslock {
+                        label = "teres-i:green:capslock";
+                        gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7 */
+                };
+
+                numlock {
+                        label = "teres-i:green:numlock";
+                        gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */
+                };
+        };
+
+        reg_usb1_vbus: usb1-vbus {
+                compatible = "regulator-fixed";
+                regulator-name = "usb1-vbus";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
+                status = "okay";
+        };
+
+        wifi_pwrseq: wifi_pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
+        };
+};
+
+&ehci1 {
+        status = "okay";
+};
+
+
+/* The ANX6345 eDP-bridge is on i2c0. There is no linux (mainline)
+ * driver for this chip at the moment, the bootloader initializes it.
+ * However it can be accessed with the i2c-dev driver from user space.
+ */
+&i2c0 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_pins>;
+        status = "okay";
+};
+
+&mmc0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc0_pins>;
+        vmmc-supply = <&reg_dcdc1>;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+        disable-wp;
+        bus-width = <4>;
+        status = "okay";
+};
+
+&mmc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc1_pins>;
+        vmmc-supply = <&reg_aldo2>;
+        vqmmc-supply = <&reg_dldo4>;
+        mmc-pwrseq = <&wifi_pwrseq>;
+        bus-width = <4>;
+        non-removable;
+        status = "okay";
+
+        rtl8723bs: wifi@1 {
+                reg = <1>;
+                interrupt-parent = <&r_pio>;
+                interrupts = <0 3 IRQ_TYPE_LEVEL_LOW>; /* PL3 */
+                interrupt-names = "host-wake";
+        };
+};
+
+&mmc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc2_pins>;
+        vmmc-supply = <&reg_dcdc1>;
+        vqmmc-supply = <&reg_dcdc1>;
+        bus-width = <8>;
+        non-removable;
+        cap-mmc-hw-reset;
+        status = "okay";
+};
+
+&ohci1 {
+        status = "okay";
+};
+
+&r_rsb {
+        status = "okay";
+
+        axp803: pmic@3a3 {
+                compatible = "x-powers,axp803";
+                reg = <0x3a3>;
+                interrupt-parent = <&r_intc>;
+                interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+                wakeup-source;
+        };
+};
+
+#include "axp803.dtsi"
+
+&reg_aldo1 {
+        regulator-always-on;
+        regulator-min-microvolt = <2800000>;
+        regulator-max-microvolt = <2800000>;
+        regulator-name = "vcc-pe";
+};
+
+&reg_aldo2 {
+        regulator-always-on;
+        regulator-min-microvolt = <3300000>;
+        regulator-max-microvolt = <3300000>;
+        regulator-name = "vcc-pl";
+};
+
+&reg_aldo3 {
+        regulator-always-on;
+        regulator-min-microvolt = <3000000>;
+        regulator-max-microvolt = <3000000>;
+        regulator-name = "vcc-pll-avcc";
+};
+
+&reg_dcdc1 {
+        regulator-always-on;
+        regulator-min-microvolt = <3300000>;
+        regulator-max-microvolt = <3300000>;
+        regulator-name = "vcc-3v3";
+};
+
+&reg_dcdc2 {
+        regulator-always-on;
+        regulator-min-microvolt = <1040000>;
+        regulator-max-microvolt = <1300000>;
+        regulator-name = "vdd-cpux";
+};
+
+/* DCDC3 is polyphased with DCDC2 */
+
+&reg_dcdc5 {
+        regulator-always-on;
+        regulator-min-microvolt = <1500000>;
+        regulator-max-microvolt = <1500000>;
+        regulator-name = "vcc-ddr3";
+};
+
+&reg_dcdc6 {
+        regulator-always-on;
+        regulator-min-microvolt = <1100000>;
+        regulator-max-microvolt = <1100000>;
+        regulator-name = "vdd-sys";
+};
+
+&reg_dldo1 {
+        regulator-min-microvolt = <3300000>;
+        regulator-max-microvolt = <3300000>;
+        regulator-name = "vcc-hdmi";
+};
+
+&reg_dldo2 {
+        regulator-min-microvolt = <2500000>;
+        regulator-max-microvolt = <2500000>;
+        regulator-name = "vcc-pd";
+};
+
+&reg_dldo3 {
+        regulator-min-microvolt = <1200000>;
+        regulator-max-microvolt = <1200000>;
+        regulator-name = "eDP12";
+};
+
+&reg_dldo4 {
+        regulator-min-microvolt = <3300000>;
+        regulator-max-microvolt = <3300000>;
+        regulator-name = "vcc-wifi-io";
+};
+
+&reg_eldo1 {
+        regulator-min-microvolt = <1800000>;
+        regulator-max-microvolt = <1800000>;
+        regulator-name = "cpvdd";
+};
+
+&reg_eldo2 {
+        regulator-min-microvolt = <1800000>;
+        regulator-max-microvolt = <1800000>;
+        regulator-name = "vcc-dvdd-csi";
+};
+
+&reg_fldo1 {
+        regulator-min-microvolt = <1200000>;
+        regulator-max-microvolt = <1200000>;
+        regulator-name = "vcc-1v2-hsic";
+};
+
+/*
+ * The A64 chip cannot work without this regulator off, although
+ * it seems to be only driving the AR100 core.
+ * Maybe we don't still know well about CPUs domain.
+ */
+&reg_fldo2 {
+        regulator-always-on;
+        regulator-min-microvolt = <1100000>;
+        regulator-max-microvolt = <1100000>;
+        regulator-name = "vdd-cpus";
+};
+
+&reg_rtc_ldo {
+        regulator-name = "vcc-rtc";
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_pins_a>;
+        status = "okay";
+};
+
+&usbphy {
+        usb1_vbus-supply = <&reg_usb1_vbus>;
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index d783d164b9c3..1b2ef28c42bd 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -52,6 +52,26 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        chosen {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+/*
+ * The pipeline mixer0-lcd0 depends on clock CLK_MIXER0 from DE2 CCU.
+ * However there is no support for this clock on A64 yet, so we depend
+ * on the upstream clocks here to keep them (and thus CLK_MIXER0) up.
+ */
+                simplefb_lcd: framebuffer-lcd {
+                        compatible = "allwinner,simple-framebuffer",
+                                     "simple-framebuffer";
+                        allwinner,pipeline = "mixer0-lcd0";
+                        clocks = <&ccu CLK_TCON0>,
+                                 <&ccu CLK_DE>, <&ccu CLK_BUS_DE>;
+                        status = "disabled";
+                };
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -112,6 +132,24 @@
                 method = "smc";
         };
 
+        sound_spdif {
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "On-board SPDIF";
+
+                simple-audio-card,cpu {
+                        sound-dai = <&spdif>;
+                };
+
+                simple-audio-card,codec {
+                        sound-dai = <&spdif_out>;
+                };
+        };
+
+        spdif_out: spdif-out {
+                #sound-dai-cells = <0>;
+                compatible = "linux,spdif-dit";
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupts = <GIC_PPI 13
@@ -291,6 +329,11 @@
                         interrupt-controller;
                         #interrupt-cells = <3>;
 
+                        i2c0_pins: i2c0_pins {
+                                pins = "PH0", "PH1";
+                                function = "i2c0";
+                        };
+
                         i2c1_pins: i2c1_pins {
                                 pins = "PH2", "PH3";
                                 function = "i2c1";
@@ -336,6 +379,11 @@
                                 drive-strength = <40>;
                         };
 
+                        spdif_tx_pin: spdif {
+                                pins = "PH8";
+                                function = "spdif";
+                        };
+
                         spi0_pins: spi0 {
                                 pins = "PC0", "PC1", "PC2", "PC3";
                                 function = "spi0";
@@ -382,6 +430,50 @@
                         };
                 };
 
+                spdif: spdif@1c21000 {
+                        #sound-dai-cells = <0>;
+                        compatible = "allwinner,sun50i-a64-spdif",
+                                     "allwinner,sun8i-h3-spdif";
+                        reg = <0x01c21000 0x400>;
+                        interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>;
+                        resets = <&ccu RST_BUS_SPDIF>;
+                        clock-names = "apb", "spdif";
+                        dmas = <&dma 2>;
+                        dma-names = "tx";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&spdif_tx_pin>;
+                        status = "disabled";
+                };
+
+                i2s0: i2s@1c22000 {
+                        #sound-dai-cells = <0>;
+                        compatible = "allwinner,sun50i-a64-i2s",
+                                     "allwinner,sun8i-h3-i2s";
+                        reg = <0x01c22000 0x400>;
+                        interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_I2S0>, <&ccu CLK_I2S0>;
+                        clock-names = "apb", "mod";
+                        resets = <&ccu RST_BUS_I2S0>;
+                        dma-names = "rx", "tx";
+                        dmas = <&dma 3>, <&dma 3>;
+                        status = "disabled";
+                };
+
+                i2s1: i2s@1c22400 {
+                        #sound-dai-cells = <0>;
+                        compatible = "allwinner,sun50i-a64-i2s",
+                                     "allwinner,sun8i-h3-i2s";
+                        reg = <0x01c22400 0x400>;
+                        interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>;
+                        clock-names = "apb", "mod";
+                        resets = <&ccu RST_BUS_I2S1>;
+                        dma-names = "rx", "tx";
+                        dmas = <&dma 4>, <&dma 4>;
+                        status = "disabled";
+                };
+
                 uart0: serial@1c28000 {
                         compatible = "snps,dw-apb-uart";
                         reg = <0x01c28000 0x400>;
@@ -593,5 +685,12 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                 };
+
+                wdt0: watchdog@1c20ca0 {
+                        compatible = "allwinner,sun50i-a64-wdt",
+                                     "allwinner,sun6i-a31-wdt";
+                        reg = <0x01c20ca0 0x20>;
+                        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                };
         };
 };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
index 1ed9f219deaf..506e25ba028a 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
@@ -151,8 +151,6 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
@@ -160,8 +158,6 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         vqmmc-supply = <&reg_vcc3v3>;
         mmc-pwrseq = <&wifi_pwrseq>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
index f1447003ea3c..cc268a69786c 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
@@ -126,8 +126,6 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
index 9e51d3a5f4e6..98862c7c7258 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
@@ -67,6 +67,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
 
@@ -121,6 +132,10 @@
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -153,6 +168,16 @@
         };
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -160,8 +185,6 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
index 0f25c4a6f15d..b75ca4d7d001 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
@@ -62,6 +62,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         leds {
                 compatible = "gpio-leds";
 
@@ -128,6 +139,10 @@
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -160,6 +175,16 @@
         };
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &ir {
         pinctrl-names = "default";
         pinctrl-0 = <&ir_pins_a>;
@@ -167,8 +192,6 @@
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
@@ -176,8 +199,6 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         mmc-pwrseq = <&wifi_pwrseq>;
         bus-width = <4>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
new file mode 100644
index 000000000000..1238de25a969
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2016 ARM Ltd.
+ * Copyright (C) 2018 Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR X11)
+ */
+
+/dts-v1/;
+#include "sun50i-h5.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/pinctrl/sun4i-a10.h>
+
+/ {
+        model = "Xunlong Orange Pi Zero Plus";
+        compatible = "xunlong,orangepi-zero-plus", "allwinner,sun50i-h5";
+
+        reg_vcc3v3: vcc3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        aliases {
+                ethernet0 = &emac;
+                ethernet1 = &rtl8189ftv;
+                serial0 = &uart0;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                pwr {
+                        label = "orangepi:green:pwr";
+                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
+                        default-state = "on";
+                };
+
+                status {
+                        label = "orangepi:red:status";
+                        gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */
+                };
+        };
+
+        reg_gmac_3v3: gmac-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "gmac-3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                startup-delay-us = <100000>;
+                enable-active-high;
+                gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
+        };
+};
+
+&ehci0 {
+        status = "okay";
+};
+
+&ehci1 {
+        status = "okay";
+};
+
+&emac {
+        pinctrl-names = "default";
+        pinctrl-0 = <&emac_rgmii_pins>;
+        phy-supply = <&reg_gmac_3v3>;
+        phy-handle = <&ext_rgmii_phy>;
+        phy-mode = "rgmii";
+        status = "okay";
+};
+
+&external_mdio {
+        ext_rgmii_phy: ethernet-phy@1 {
+                compatible = "ethernet-phy-ieee802.3-c22";
+                reg = <1>;
+        };
+};
+
+&mmc0 {
+        vmmc-supply = <&reg_vcc3v3>;
+        bus-width = <4>;
+        cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+        status = "okay";
+};
+
+&mmc1 {
+        vmmc-supply = <&reg_vcc3v3>;
+        bus-width = <4>;
+        non-removable;
+        status = "okay";
+
+        /*
+         * Explicitly define the sdio device, so that we can add an ethernet
+         * alias for it (which e.g. makes u-boot set a mac-address).
+         */
+        rtl8189ftv: sdio_wifi@1 {
+                reg = <1>;
+        };
+};
+
+&spi0  {
+        status = "okay";
+
+        flash@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "mxicy,mx25l1606e", "winbond,w25q128";
+                reg = <0>;
+                spi-max-frequency = <40000000>;
+        };
+};
+
+&ohci0 {
+        status = "okay";
+};
+
+&ohci1 {
+        status = "okay";
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_pins_a>;
+        status = "okay";
+};
+
+&usb_otg {
+        dr_mode = "peripheral";
+        status = "okay";
+};
+
+&usbphy {
+        /* USB Type-A ports' VBUS is always on */
+        usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
index af43533c7134..53c8c11620e0 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
@@ -58,6 +58,17 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
+
         reg_vcc3v3: vcc3v3 {
                 compatible = "regulator-fixed";
                 regulator-name = "vcc3v3";
@@ -73,9 +84,21 @@
         };
 };
 
+&de {
+        status = "okay";
+};
+
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
@@ -83,8 +106,6 @@
 };
 
 &mmc1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc1_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         vqmmc-supply = <&reg_vcc3v3>;
         mmc-pwrseq = <&wifi_pwrseq>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
new file mode 100644
index 000000000000..d36de5eb81f3
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.io>
+ */
+
+/dts-v1/;
+
+#include "sun50i-h6.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "Pine H64";
+        compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
+
+        aliases {
+                serial0 = &uart0;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_ph_pins>;
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
new file mode 100644
index 000000000000..56563150d61a
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -0,0 +1,175 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io>
+ */
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+        interrupt-parent = <&gic>;
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu0: cpu@0 {
+                        compatible = "arm,cortex-a53", "arm,armv8";
+                        device_type = "cpu";
+                        reg = <0>;
+                        enable-method = "psci";
+                };
+
+                cpu1: cpu@1 {
+                        compatible = "arm,cortex-a53", "arm,armv8";
+                        device_type = "cpu";
+                        reg = <1>;
+                        enable-method = "psci";
+                };
+
+                cpu2: cpu@2 {
+                        compatible = "arm,cortex-a53", "arm,armv8";
+                        device_type = "cpu";
+                        reg = <2>;
+                        enable-method = "psci";
+                };
+
+                cpu3: cpu@3 {
+                        compatible = "arm,cortex-a53", "arm,armv8";
+                        device_type = "cpu";
+                        reg = <3>;
+                        enable-method = "psci";
+                };
+        };
+
+        iosc: internal-osc-clk {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <16000000>;
+                clock-accuracy = <300000000>;
+                clock-output-names = "iosc";
+        };
+
+        osc24M: osc24M_clk {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <24000000>;
+                clock-output-names = "osc24M";
+        };
+
+        osc32k: osc32k_clk {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <32768>;
+                clock-output-names = "osc32k";
+        };
+
+        psci {
+                compatible = "arm,psci-0.2";
+                method = "smc";
+        };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                interrupts = <GIC_PPI 13
+                        (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+                             <GIC_PPI 14
+                        (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+                             <GIC_PPI 11
+                        (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+                             <GIC_PPI 10
+                        (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+        };
+
+        soc {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                ccu: clock@3001000 {
+                        compatible = "allwinner,sun50i-h6-ccu";
+                        reg = <0x03001000 0x1000>;
+                        clocks = <&osc24M>, <&osc32k>, <&iosc>;
+                        clock-names = "hosc", "losc", "iosc";
+                        #clock-cells = <1>;
+                        #reset-cells = <1>;
+                };
+
+                gic: interrupt-controller@3021000 {
+                        compatible = "arm,gic-400";
+                        reg = <0x03021000 0x1000>,
+                              <0x03022000 0x2000>,
+                              <0x03024000 0x2000>,
+                              <0x03026000 0x2000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                };
+
+                pio: pinctrl@300b000 {
+                        compatible = "allwinner,sun50i-h6-pinctrl";
+                        reg = <0x0300b000 0x400>;
+                        interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ccu 26>, <&osc24M>, <&osc32k>;
+                        clock-names = "apb", "hosc", "losc";
+                        gpio-controller;
+                        #gpio-cells = <3>;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+
+                        uart0_ph_pins: uart0-ph {
+                                pins = "PH0", "PH1";
+                                function = "uart0";
+                        };
+                };
+
+                uart0: serial@5000000 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x05000000 0x400>;
+                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&ccu 70>;
+                        resets = <&ccu 21>;
+                        status = "disabled";
+                };
+
+                uart1: serial@5000400 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x05000400 0x400>;
+                        interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&ccu 71>;
+                        resets = <&ccu 22>;
+                        status = "disabled";
+                };
+
+                uart2: serial@5000800 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x05000800 0x400>;
+                        interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&ccu 72>;
+                        resets = <&ccu 23>;
+                        status = "disabled";
+                };
+
+                uart3: serial@5000c00 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x05000c00 0x400>;
+                        interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&ccu 73>;
+                        resets = <&ccu 24>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
index 51ce5832ee1d..eaf13fe29287 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
@@ -99,4 +99,9 @@
 
 &usb0 {
         status = "okay";
+        disable-over-current;
+};
+
+&watchdog0 {
+        status = "okay";
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index 447b98d30921..57eedced5a51 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 Amlogic, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
@@ -14,6 +13,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                serial1 = &uart_A;
         };
 };
 
@@ -24,8 +24,16 @@
         pinctrl-names = "default";
 };
 
+&uart_A {
+        status = "okay";
+        pinctrl-0 = <&uart_a_pins>;
+        pinctrl-names = "default";
+};
+
 &uart_AO {
         status = "okay";
+        pinctrl-0 = <&uart_ao_a_pins>;
+        pinctrl-names = "default";
 };
 
 &ir {
@@ -33,3 +41,9 @@
         pinctrl-0 = <&remote_input_ao_pins>;
         pinctrl-names = "default";
 };
+
+&i2c1 {
+        status = "okay";
+        pinctrl-0 = <&i2c1_z_pins>;
+        pinctrl-names = "default";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index 70c776ef7aa7..b58808eb3cc8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 Amlogic, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 #include <dt-bindings/gpio/gpio.h>
@@ -163,18 +162,70 @@
                                 status = "disabled";
                         };
 
+                        i2c0: i2c@1f000 {
+                                compatible = "amlogic,meson-axg-i2c";
+                                status = "disabled";
+                                reg = <0x0 0x1f000 0x0 0x20>;
+                                interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
+                                        <GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                clocks = <&clkc CLKID_I2C>;
+                                clock-names = "clk_i2c";
+                        };
+
+                        i2c1: i2c@1e000 {
+                                compatible = "amlogic,meson-axg-i2c";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <0x0 0x1e000 0x0 0x20>;
+                                status = "disabled";
+                                interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>,
+                                        <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
+                                clocks = <&clkc CLKID_I2C>;
+                                clock-names = "clk_i2c";
+                        };
+
+                        i2c2: i2c@1d000 {
+                                compatible = "amlogic,meson-axg-i2c";
+                                status = "disabled";
+                                reg = <0x0 0x1d000 0x0 0x20>;
+                                interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>,
+                                        <GIC_SPI 49 IRQ_TYPE_EDGE_RISING>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                clocks = <&clkc CLKID_I2C>;
+                                clock-names = "clk_i2c";
+                        };
+
+                        i2c3: i2c@1c000 {
+                                compatible = "amlogic,meson-axg-i2c";
+                                status = "disabled";
+                                reg = <0x0 0x1c000 0x0 0x20>;
+                                interrupts = <GIC_SPI 39 IRQ_TYPE_EDGE_RISING>,
+                                        <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                clocks = <&clkc CLKID_I2C>;
+                                clock-names = "clk_i2c";
+                        };
+
                         uart_A: serial@24000 {
-                                compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
+                                compatible = "amlogic,meson-gx-uart";
                                 reg = <0x0 0x24000 0x0 0x18>;
                                 interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
                                 status = "disabled";
+                                clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
+                                clock-names = "xtal", "pclk", "baud";
                         };
 
                         uart_B: serial@23000 {
-                                compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
+                                compatible = "amlogic,meson-gx-uart";
                                 reg = <0x0 0x23000 0x0 0x18>;
                                 interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
                                 status = "disabled";
+                                clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
+                                clock-names = "xtal", "pclk", "baud";
                         };
                 };
 
@@ -234,6 +285,13 @@
                         #size-cells = <2>;
                         ranges = <0x0 0x0 0x0 0xff634000 0x0 0x2000>;
 
+                        hwrng: rng {
+                                compatible = "amlogic,meson-rng";
+                                reg = <0x0 0x18 0x0 0x4>;
+                                clocks = <&clkc CLKID_RNG0>;
+                                clock-names = "core";
+                        };
+
                         pinctrl_periphs: pinctrl@480 {
                                 compatible = "amlogic,meson-axg-periphs-pinctrl";
                                 #address-cells = <2>;
@@ -251,6 +309,36 @@
                                         gpio-ranges = <&pinctrl_periphs 0 0 86>;
                                 };
 
+                                eth_rmii_x_pins: eth-x-rmii {
+                                        mux {
+                                                groups = "eth_mdio_x",
+                                                       "eth_mdc_x",
+                                                       "eth_rgmii_rx_clk_x",
+                                                       "eth_rx_dv_x",
+                                                       "eth_rxd0_x",
+                                                       "eth_rxd1_x",
+                                                       "eth_txen_x",
+                                                       "eth_txd0_x",
+                                                       "eth_txd1_x";
+                                                function = "eth";
+                                        };
+                                };
+
+                                eth_rmii_y_pins: eth-y-rmii {
+                                        mux {
+                                                groups = "eth_mdio_y",
+                                                       "eth_mdc_y",
+                                                       "eth_rgmii_rx_clk_y",
+                                                       "eth_rx_dv_y",
+                                                       "eth_rxd0_y",
+                                                       "eth_rxd1_y",
+                                                       "eth_txen_y",
+                                                       "eth_txd0_y",
+                                                       "eth_txd1_y";
+                                                function = "eth";
+                                        };
+                                };
+
                                 eth_rgmii_x_pins: eth-x-rgmii {
                                         mux {
                                                 groups = "eth_mdio_x",
@@ -444,6 +532,134 @@
                                                 function = "spi1";
                                         };
                                 };
+
+                                i2c0_pins: i2c0 {
+                                        mux {
+                                                groups = "i2c0_sck",
+                                                        "i2c0_sda";
+                                                function = "i2c0";
+                                        };
+                                };
+
+                                i2c1_z_pins: i2c1_z {
+                                        mux {
+                                                groups = "i2c1_sck_z",
+                                                        "i2c1_sda_z";
+                                                function = "i2c1";
+                                        };
+                                };
+
+                                i2c1_x_pins: i2c1_x {
+                                        mux {
+                                                groups = "i2c1_sck_x",
+                                                        "i2c1_sda_x";
+                                                function = "i2c1";
+                                        };
+                                };
+
+                                i2c2_x_pins: i2c2_x {
+                                        mux {
+                                                groups = "i2c2_sck_x",
+                                                        "i2c2_sda_x";
+                                                function = "i2c2";
+                                        };
+                                };
+
+                                i2c2_a_pins: i2c2_a {
+                                        mux {
+                                                groups = "i2c2_sck_a",
+                                                        "i2c2_sda_a";
+                                                function = "i2c2";
+                                        };
+                                };
+
+                                i2c3_a6_pins: i2c3_a6 {
+                                        mux {
+                                                groups = "i2c3_sda_a6",
+                                                        "i2c3_sck_a7";
+                                                function = "i2c3";
+                                        };
+                                };
+
+                                i2c3_a12_pins: i2c3_a12 {
+                                        mux {
+                                                groups = "i2c3_sda_a12",
+                                                        "i2c3_sck_a13";
+                                                function = "i2c3";
+                                        };
+                                };
+
+                                i2c3_a19_pins: i2c3_a19 {
+                                        mux {
+                                                groups = "i2c3_sda_a19",
+                                                        "i2c3_sck_a20";
+                                                function = "i2c3";
+                                        };
+                                };
+
+                                uart_a_pins: uart_a {
+                                        mux {
+                                                groups = "uart_tx_a",
+                                                        "uart_rx_a";
+                                                function = "uart_a";
+                                        };
+                                };
+
+                                uart_a_cts_rts_pins: uart_a_cts_rts {
+                                        mux {
+                                                groups = "uart_cts_a",
+                                                        "uart_rts_a";
+                                                function = "uart_a";
+                                        };
+                                };
+
+                                uart_b_x_pins: uart_b_x {
+                                        mux {
+                                                groups = "uart_tx_b_x",
+                                                        "uart_rx_b_x";
+                                                function = "uart_b";
+                                        };
+                                };
+
+                                uart_b_x_cts_rts_pins: uart_b_x_cts_rts {
+                                        mux {
+                                                groups = "uart_cts_b_x",
+                                                        "uart_rts_b_x";
+                                                function = "uart_b";
+                                        };
+                                };
+
+                                uart_b_z_pins: uart_b_z {
+                                        mux {
+                                                groups = "uart_tx_b_z",
+                                                        "uart_rx_b_z";
+                                                function = "uart_b";
+                                        };
+                                };
+
+                                uart_b_z_cts_rts_pins: uart_b_z_cts_rts {
+                                        mux {
+                                                groups = "uart_cts_b_z",
+                                                        "uart_rts_b_z";
+                                                function = "uart_b";
+                                        };
+                                };
+
+                                uart_ao_b_z_pins: uart_ao_b_z {
+                                        mux {
+                                                groups = "uart_ao_tx_b_z",
+                                                        "uart_ao_rx_b_z";
+                                                function = "uart_ao_b_z";
+                                        };
+                                };
+
+                                uart_ao_b_z_cts_rts_pins: uart_ao_b_z_cts_rts {
+                                        mux {
+                                                groups = "uart_ao_cts_b_z",
+                                                        "uart_ao_rts_b_z";
+                                                function = "uart_ao_b_z";
+                                        };
+                                };
                         };
                 };
 
@@ -494,6 +710,44 @@
                                                 function = "remote_input_ao";
                                         };
                                 };
+
+                                uart_ao_a_pins: uart_ao_a {
+                                        mux {
+                                                groups = "uart_ao_tx_a",
+                                                        "uart_ao_rx_a";
+                                                function = "uart_ao_a";
+                                        };
+                                };
+
+                                uart_ao_a_cts_rts_pins: uart_ao_a_cts_rts {
+                                        mux {
+                                                groups = "uart_ao_cts_a",
+                                                        "uart_ao_rts_a";
+                                                function = "uart_ao_a";
+                                        };
+                                };
+
+                                uart_ao_b_pins: uart_ao_b {
+                                        mux {
+                                                groups = "uart_ao_tx_b",
+                                                        "uart_ao_rx_b";
+                                                function = "uart_ao_b";
+                                        };
+                                };
+
+                                uart_ao_b_cts_rts_pins: uart_ao_b_cts_rts {
+                                        mux {
+                                                groups = "uart_ao_cts_b",
+                                                        "uart_ao_rts_b";
+                                                function = "uart_ao_b";
+                                        };
+                                };
+                        };
+
+                        sec_AO: ao-secure@140 {
+                                compatible = "amlogic,meson-gx-ao-secure", "syscon";
+                                reg = <0x0 0x140 0x0 0x140>;
+                                amlogic,has-chip-id;
                         };
 
                         pwm_AO_ab: pwm@7000 {
@@ -504,12 +758,23 @@
                         };
 
                         pwm_AO_cd: pwm@2000 {
-                                compatible = "amlogic,axg-ao-pwm";
+                                compatible = "amlogic,meson-axg-ao-pwm";
                                 reg = <0x0 0x02000  0x0 0x20>;
                                 #pwm-cells = <3>;
                                 status = "disabled";
                         };
 
+                        i2c_AO: i2c@5000 {
+                                compatible = "amlogic,meson-axg-i2c";
+                                status = "disabled";
+                                reg = <0x0 0x05000 0x0 0x20>;
+                                interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                clocks = <&clkc CLKID_I2C>;
+                                clock-names = "clk_i2c";
+                        };
+
                         uart_AO: serial@3000 {
                                 compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";
                                 reg = <0x0 0x3000 0x0 0x18>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
index aeb6d21a3bec..4eef36b22538 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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.
  */
 
 /* Common DTSI for same Amlogic Q200/Q201 and P230/P231 boards using either
@@ -48,6 +11,7 @@
 / {
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 4ee2e7951482..3c31e21cbed7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
  *
@@ -6,44 +7,6 @@
  *
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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>
@@ -169,6 +132,7 @@
                 compatible = "amlogic,meson-gx-efuse", "amlogic,meson-gxbb-efuse";
                 #address-cells = <1>;
                 #size-cells = <1>;
+                read-only;
 
                 sn: sn@14 {
                         reg = <0x14 0x10>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
index 011e8e08e429..7d5709c37e95 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
@@ -1,45 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 Andreas Färber
- *
- * 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 library 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 library 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.
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
@@ -52,6 +13,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
index 818954b1d57f..4cf7f6e80c6a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Neil Armstrong <narmstrong@kernel.org>
- *
- * 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 library 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 library 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/;
@@ -54,6 +17,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index ee4ada61c59c..54954b314a45 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Kevin Hilman <khilman@kernel.org>
- *
- * 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 library 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 library 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/;
@@ -53,6 +16,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
@@ -310,7 +274,7 @@
         pinctrl-names = "default", "clk-gate";
 
         bus-width = <8>;
-        max-frequency = <200000000>;
+        max-frequency = <100000000>;
         non-removable;
         disable-wp;
         cap-mmc-highspeed;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index 09f34f7ef084..9d2406a7c4fa 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Kevin Hilman <khilman@kernel.org>
- *
- * 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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
index ae3194663d64..56e0dd1ff55c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Kevin Hilman <khilman@kernel.org>
- *
- * 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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index 932158a778ef..ce862266b9aa 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Kevin Hilman <khilman@kernel.org>
- *
- * 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 library 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 library 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 "meson-gxbb.dtsi"
@@ -47,6 +10,7 @@
 / {
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts
index 62fb4968d680..c928adf85388 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
- *
- * 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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts
index 9a9663abdf5c..e81e1d68b5fa 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
- *
- * 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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts
index 2fe167b2609d..a8fca0c6903f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
- *
- * 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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 1fe8e24cf675..93a4acf2c46c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
- *
- * 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 library 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 library 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 "meson-gxbb.dtsi"
@@ -47,6 +10,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
index 1878ac2b2b83..2bfe69902552 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
@@ -1,92 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Neil Armstrong <narmstrong@baylibre.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 library 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 library 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 "meson-gxbb-p20x.dtsi"
+#include "meson-gxbb-wetek.dtsi"
 
 / {
         compatible = "wetek,hub", "amlogic,meson-gxbb";
         model = "WeTek Hub";
-
-        leds {
-                compatible = "gpio-leds";
-
-                system {
-                        label = "wetek-play:system-status";
-                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
-                        default-state = "on";
-                        panic-indicator;
-                };
-        };
-};
-
-&cvbs_connector {
-        status = "disabled";
-};
-
-&ethmac {
-        status = "okay";
-        pinctrl-0 = <&eth_rgmii_pins>;
-        pinctrl-names = "default";
-
-        phy-handle = <&eth_phy0>;
-        phy-mode = "rgmii";
-
-        amlogic,tx-delay-ns = <2>;
-
-        snps,reset-gpio = <&gpio GPIOZ_14 0>;
-        snps,reset-delays-us = <0 10000 1000000>;
-        snps,reset-active-low;
-
-        mdio {
-                compatible = "snps,dwmac-mdio";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                eth_phy0: ethernet-phy@0 {
-                        /* Realtek RTL8211F (0x001cc916) */
-                        reg = <0>;
-                };
-        };
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
index f7144fd5e03f..0038522315de 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts
@@ -1,49 +1,12 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Neil Armstrong <narmstrong@baylibre.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 library 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 library 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 "meson-gxbb-p20x.dtsi"
+#include "meson-gxbb-wetek.dtsi"
 #include <dt-bindings/input/input.h>
 
 / {
@@ -51,15 +14,6 @@
         model = "WeTek Play 2";
 
         leds {
-                compatible = "gpio-leds";
-
-                system {
-                        label = "wetek-play:system-status";
-                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
-                        default-state = "on";
-                        panic-indicator;
-                };
-
                 wifi {
                         label = "wetek-play:wifi-status";
                         gpios = <&gpio GPIODV_26 GPIO_ACTIVE_HIGH>;
@@ -85,82 +39,18 @@
                         gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;
                 };
         };
-
-        cvbs-connector {
-                compatible = "composite-video-connector";
-
-                port {
-                        cvbs_connector_in: endpoint {
-                                remote-endpoint = <&cvbs_vdac_out>;
-                        };
-                };
-        };
-
-        hdmi-connector {
-                compatible = "hdmi-connector";
-                type = "a";
-
-                port {
-                        hdmi_connector_in: endpoint {
-                                remote-endpoint = <&hdmi_tx_tmds_out>;
-                        };
-                };
-        };
-};
-
-&cec_AO {
-        status = "okay";
-        pinctrl-0 = <&ao_cec_pins>;
-        pinctrl-names = "default";
-        hdmi-phandle = <&hdmi_tx>;
-};
-
-&cvbs_vdac_port {
-        cvbs_vdac_out: endpoint {
-                remote-endpoint = <&cvbs_connector_in>;
-        };
 };
 
-&ethmac {
+&i2c_A {
         status = "okay";
-        pinctrl-0 = <&eth_rgmii_pins>;
+        pinctrl-0 = <&i2c_a_pins>;
         pinctrl-names = "default";
-
-        phy-handle = <&eth_phy0>;
-        phy-mode = "rgmii";
-
-        amlogic,tx-delay-ns = <2>;
-
-        snps,reset-gpio = <&gpio GPIOZ_14 0>;
-        snps,reset-delays-us = <0 10000 1000000>;
-        snps,reset-active-low;
-
-        mdio {
-                compatible = "snps,dwmac-mdio";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                eth_phy0: ethernet-phy@0 {
-                        /* Realtek RTL8211F (0x001cc916) */
-                        reg = <0>;
-                };
-        };
 };
 
-&hdmi_tx {
+&usb1_phy {
         status = "okay";
-        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
-        pinctrl-names = "default";
 };
 
-&hdmi_tx_tmds_port {
-        hdmi_tx_tmds_out: endpoint {
-                remote-endpoint = <&hdmi_connector_in>;
-        };
-};
-
-&i2c_A {
+&usb1 {
         status = "okay";
-        pinctrl-0 = <&i2c_a_pins>;
-        pinctrl-names = "default";
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
new file mode 100644
index 000000000000..70325b273bd2
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi
@@ -0,0 +1,256 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2016 Andreas Färber
+ * Copyright (c) 2016 BayLibre, Inc.
+ * Author: Kevin Hilman <khilman@kernel.org>
+ */
+
+#include "meson-gxbb.dtsi"
+
+/ {
+        aliases {
+                serial0 = &uart_AO;
+                ethernet0 = &ethmac;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x40000000>;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                system {
+                        label = "wetek-play:system-status";
+                        gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                        panic-indicator;
+                };
+        };
+
+        usb_pwr: regulator-usb-pwrs {
+                compatible = "regulator-fixed";
+
+                regulator-name = "USB_PWR";
+
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+
+                gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        vddio_boot: regulator-vddio_boot {
+                compatible = "regulator-fixed";
+                regulator-name = "VDDIO_BOOT";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+        };
+
+        vddao_3v3: regulator-vddao_3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "VDDAO_3V3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        vcc_3v3: regulator-vcc_3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "VCC_3V3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        emmc_pwrseq: emmc-pwrseq {
+                compatible = "mmc-pwrseq-emmc";
+                reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
+        };
+
+        wifi32k: wifi32k {
+                compatible = "pwm-clock";
+                #clock-cells = <0>;
+                clock-frequency = <32768>;
+                pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
+        };
+
+        sdio_pwrseq: sdio-pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;
+                clocks = <&wifi32k>;
+                clock-names = "ext_clock";
+        };
+
+        cvbs-connector {
+                compatible = "composite-video-connector";
+
+                port {
+                        cvbs_connector_in: endpoint {
+                                remote-endpoint = <&cvbs_vdac_out>;
+                        };
+                };
+        };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_connector_in: endpoint {
+                                remote-endpoint = <&hdmi_tx_tmds_out>;
+                        };
+                };
+        };
+};
+
+&cec_AO {
+        status = "okay";
+        pinctrl-0 = <&ao_cec_pins>;
+        pinctrl-names = "default";
+        hdmi-phandle = <&hdmi_tx>;
+};
+
+&cvbs_vdac_port {
+        cvbs_vdac_out: endpoint {
+                remote-endpoint = <&cvbs_connector_in>;
+        };
+};
+
+&ethmac {
+        status = "okay";
+        pinctrl-0 = <&eth_rgmii_pins>;
+        pinctrl-names = "default";
+
+        phy-handle = <&eth_phy0>;
+        phy-mode = "rgmii";
+
+        amlogic,tx-delay-ns = <2>;
+
+        snps,reset-gpio = <&gpio GPIOZ_14 0>;
+        snps,reset-delays-us = <0 10000 1000000>;
+        snps,reset-active-low;
+
+        mdio {
+                compatible = "snps,dwmac-mdio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                eth_phy0: ethernet-phy@0 {
+                        /* Realtek RTL8211F (0x001cc916) */
+                        reg = <0>;
+                        eee-broken-1000t;
+                };
+        };
+};
+
+&hdmi_tx {
+        status = "okay";
+        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+        pinctrl-names = "default";
+};
+
+&hdmi_tx_tmds_port {
+        hdmi_tx_tmds_out: endpoint {
+                remote-endpoint = <&hdmi_connector_in>;
+        };
+};
+
+&ir {
+        status = "okay";
+        pinctrl-0 = <&remote_input_ao_pins>;
+        pinctrl-names = "default";
+};
+
+&pwm_ef {
+        status = "okay";
+        pinctrl-0 = <&pwm_e_pins>;
+        pinctrl-names = "default";
+        clocks = <&clkc CLKID_FCLK_DIV4>;
+        clock-names = "clkin0";
+};
+
+/* Wireless SDIO Module */
+&sd_emmc_a {
+        status = "okay";
+        pinctrl-0 = <&sdio_pins>;
+        pinctrl-1 = <&sdio_clk_gate_pins>;
+        pinctrl-names = "default", "clk-gate";
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        bus-width = <4>;
+        cap-sd-highspeed;
+        max-frequency = <100000000>;
+
+        non-removable;
+        disable-wp;
+
+        mmc-pwrseq = <&sdio_pwrseq>;
+
+        vmmc-supply = <&vddao_3v3>;
+        vqmmc-supply = <&vddio_boot>;
+
+        brcmf: wifi@1 {
+                reg = <1>;
+                compatible = "brcm,bcm4329-fmac";
+        };
+};
+
+/* SD card */
+&sd_emmc_b {
+        status = "okay";
+        pinctrl-0 = <&sdcard_pins>;
+        pinctrl-1 = <&sdcard_clk_gate_pins>;
+        pinctrl-names = "default", "clk-gate";
+
+        bus-width = <4>;
+        cap-sd-highspeed;
+        max-frequency = <100000000>;
+        disable-wp;
+
+        cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
+        cd-inverted;
+
+        vmmc-supply = <&vddao_3v3>;
+        vqmmc-supply = <&vcc_3v3>;
+};
+
+/* eMMC */
+&sd_emmc_c {
+        status = "okay";
+        pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
+        pinctrl-1 = <&emmc_clk_gate_pins>;
+        pinctrl-names = "default", "clk-gate";
+
+        bus-width = <8>;
+        cap-mmc-highspeed;
+        max-frequency = <200000000>;
+        non-removable;
+        disable-wp;
+        mmc-ddr-1_8v;
+        mmc-hs200-1_8v;
+
+        mmc-pwrseq = <&emmc_pwrseq>;
+        vmmc-supply = <&vcc_3v3>;
+        vqmmc-supply = <&vddio_boot>;
+};
+
+/* This UART is brought out to the DB9 connector */
+&uart_AO {
+        status = "okay";
+        pinctrl-0 = <&uart_ao_a_pins>;
+        pinctrl-names = "default";
+};
+
+&usb0_phy {
+        status = "okay";
+        phy-supply = <&usb_pwr>;
+};
+
+&usb0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 3290a4dc3522..562c26a0ba33 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
- *
- * 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 library 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 library 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 "meson-gx.dtsi"
@@ -284,14 +247,17 @@
                  * MALI_0 and MALI_1 muxed to a single clock by a glitch
                  * free mux to safely change frequency while running.
                  */
-                assigned-clocks = <&clkc CLKID_MALI_0_SEL>,
+                assigned-clocks = <&clkc CLKID_GP0_PLL>,
+                                  <&clkc CLKID_MALI_0_SEL>,
                                   <&clkc CLKID_MALI_0>,
                                   <&clkc CLKID_MALI>; /* Glitch free mux */
-                assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>,
+                assigned-clock-parents = <0>, /* Do Nothing */
+                                         <&clkc CLKID_GP0_PLL>,
                                          <0>, /* Do Nothing */
                                          <&clkc CLKID_MALI_0>;
-                assigned-clock-rates = <0>, /* Do Nothing */
-                                       <666666666>,
+                assigned-clock-rates = <744000000>,
+                                       <0>, /* Do Nothing */
+                                       <744000000>,
                                        <0>; /* Do Nothing */
         };
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
index f06cc234693b..eb327664a4d8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 BayLibre SAS
  * Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 &apb {
@@ -30,14 +29,17 @@
                  * MALI_0 and MALI_1 muxed to a single clock by a glitch
                  * free mux to safely change frequency while running.
                  */
-                assigned-clocks = <&clkc CLKID_MALI_0_SEL>,
+                assigned-clocks = <&clkc CLKID_GP0_PLL>,
+                                  <&clkc CLKID_MALI_0_SEL>,
                                   <&clkc CLKID_MALI_0>,
                                   <&clkc CLKID_MALI>; /* Glitch free mux */
-                assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>,
+                assigned-clock-parents = <0>, /* Do Nothing */
+                                         <&clkc CLKID_GP0_PLL>,
                                          <0>, /* Do Nothing */
                                          <&clkc CLKID_MALI_0>;
-                assigned-clock-rates = <0>, /* Do Nothing */
-                                       <666666666>,
+                assigned-clock-rates = <744000000>,
+                                       <0>, /* Do Nothing */
+                                       <744000000>,
                                        <0>; /* Do Nothing */
         };
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
index 4f3f03fc31b0..a9f9bb90a877 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts
index 95992cf1fe61..80a231476b80 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi
index 5a90e30c1006..43321919547a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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 "meson-gxl.dtsi"
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
index e82582574160..f1c410e2da2b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 Carlo Caione
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Neil Armstrong <narmstrong@kernel.org>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
@@ -16,6 +15,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
index 71a6e1ce7ad5..d32cf3846370 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 Martin Blumenstingl <martin.blumenstingl@googlemail.com>.
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
@@ -29,6 +28,7 @@
 
         aliases {
                 serial2 = &uart_AO_B;
+                ethernet0 = &ethmac;
         };
 
         gpio-keys-polled {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index 9671f1e3c74a..22bf37404ff1 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 BayLibre, SAS.
  * Author: Neil Armstrong <narmstrong@baylibre.com>
  * Author: Jerome Brunet <jbrunet@baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
@@ -18,6 +17,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
index 271f14279180..69c721a70e44 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Andreas Färber
  * Copyright (c) 2016 BayLibre, Inc.
  * Author: Neil Armstrong <narmstrong@kernel.org>
- *
- * 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 library 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 library 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/;
@@ -52,6 +15,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
index 6e2bf858291c..5896e8a5d86b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
index 7005068346a0..0a0953fbc7d4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>.
  * Based on meson-gx-p23x-q20x.dtsi:
@@ -5,8 +6,6 @@
  *   Author: Carlo Caione <carlo@endlessm.com>
  * - Copyright (c) 2016 BayLibre, SAS.
  *   Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /* Common DTSI for devices which are based on the P212 reference board. */
@@ -17,6 +16,7 @@
         aliases {
                 serial0 = &uart_AO;
                 serial1 = &uart_A;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
index 3314a0b3dad9..40c19f69e9dc 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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 "meson-gxl.dtsi"
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index c8514110b9da..e1a39cbed8c9 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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 "meson-gx.dtsi"
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
index 1448c3dba08e..4fd46c1546a7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 Martin Blumenstingl <martin.blumenstingl@googlemail.com>.
  * Copyright (c) 2017 BayLibre, SAS
  * Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
@@ -59,8 +58,6 @@
                                       1 1
                                       2 2
                                       3 3>;
-                cooling-min-level = <0>;
-                cooling-max-level = <3>;
                 #cooling-cells = <2>;
         };
 
@@ -209,14 +206,10 @@
 };
 
 &cpu0 {
-        cooling-min-level = <0>;
-        cooling-max-level = <6>;
         #cooling-cells = <2>;
 };
 
 &cpu4 {
-        cooling-min-level = <0>;
-        cooling-max-level = <4>;
         #cooling-cells = <2>;
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
index e7a228f6cc7e..f7a1cffab4a8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
@@ -1,47 +1,10 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 BayLibre, SAS.
  * Author: Neil Armstrong <narmstrong@baylibre.com>
  *
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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/;
@@ -54,6 +17,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
index 388fac4f2d97..101417298a1d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts
index 95e11d7faab8..8d132b17514a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
index a5e9b955d5ed..7212dc4531e4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016-2017 Andreas Färber
  *
@@ -8,44 +9,6 @@
  *
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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/;
@@ -58,6 +21,7 @@
 
         aliases {
                 serial0 = &uart_AO;
+                ethernet0 = &ethmac;
         };
 
         chosen {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts
index dc37eecb9514..e2ea6753263b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-vega-s96.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 BayLibre, SAS.
  * Author: Neil Armstrong <narmstrong@baylibre.com>
  * Copyright (c) 2017 Oleg <balbes-150@yandex.ru>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
index 19a798d2ae2f..d076a7c425dd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
@@ -1,44 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Endless Computers, Inc.
  * Author: Carlo Caione <carlo@endlessm.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 library 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 library 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 "meson-gxl.dtsi"
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index f165f04db0c9..eb749c50a736 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -68,10 +68,29 @@
                 interrupt-controller;
                 interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_HIGH)>;
                 ranges = <0 0 0 0x2c1c0000 0 0x40000>;
+
                 v2m_0: v2m@0 {
                         compatible = "arm,gic-v2m-frame";
                         msi-controller;
-                        reg = <0 0 0 0x1000>;
+                        reg = <0 0 0 0x10000>;
+                };
+
+                v2m@10000 {
+                        compatible = "arm,gic-v2m-frame";
+                        msi-controller;
+                        reg = <0 0x10000 0 0x10000>;
+                };
+
+                v2m@20000 {
+                        compatible = "arm,gic-v2m-frame";
+                        msi-controller;
+                        reg = <0 0x20000 0 0x10000>;
+                };
+
+                v2m@30000 {
+                        compatible = "arm,gic-v2m-frame";
+                        msi-controller;
+                        reg = <0 0x30000 0 0x10000>;
                 };
         };
 
diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index a77462da4a36..a1e3194b7483 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -14,6 +14,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/sound/samsung-i2s.h>
 
 / {
         aliases {
@@ -112,8 +113,8 @@
 
         sound {
                 compatible = "samsung,tm2-audio";
-                audio-codec = <&wm5110>;
-                i2s-controller = <&i2s0>;
+                audio-codec = <&wm5110>, <&hdmi>;
+                i2s-controller = <&i2s0 0>, <&i2s1 0>;
                 audio-amplifier = <&max98504>;
                 mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>;
                 model = "wm5110";
@@ -217,8 +218,40 @@
 };
 
 &cmu_aud {
-        assigned-clocks = <&cmu_aud CLK_MOUT_AUD_PLL_USER>;
-        assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>;
+        assigned-clocks = <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
+                <&cmu_aud CLK_MOUT_SCLK_AUD_I2S>,
+                <&cmu_aud CLK_MOUT_SCLK_AUD_PCM>,
+                <&cmu_top CLK_MOUT_AUD_PLL>,
+                <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
+                <&cmu_top CLK_MOUT_SCLK_AUDIO0>,
+                <&cmu_top CLK_MOUT_SCLK_AUDIO1>,
+                <&cmu_top CLK_MOUT_SCLK_SPDIF>,
+
+                <&cmu_aud CLK_DIV_AUD_CA5>,
+                <&cmu_aud CLK_DIV_ACLK_AUD>,
+                <&cmu_aud CLK_DIV_PCLK_DBG_AUD>,
+                <&cmu_aud CLK_DIV_SCLK_AUD_I2S>,
+                <&cmu_aud CLK_DIV_SCLK_AUD_PCM>,
+                <&cmu_aud CLK_DIV_SCLK_AUD_SLIMBUS>,
+                <&cmu_aud CLK_DIV_SCLK_AUD_UART>,
+                <&cmu_top CLK_DIV_SCLK_AUDIO0>,
+                <&cmu_top CLK_DIV_SCLK_AUDIO1>,
+                <&cmu_top CLK_DIV_SCLK_PCM1>,
+                <&cmu_top CLK_DIV_SCLK_I2S1>;
+
+        assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>,
+                <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
+                <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
+                <&cmu_top CLK_FOUT_AUD_PLL>,
+                <&cmu_top CLK_MOUT_AUD_PLL>,
+                <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
+                <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
+                <&cmu_top CLK_SCLK_AUDIO0>;
+
+        assigned-clock-rates = <0>, <0>, <0>, <0>, <0>, <0>, <0>, <0>,
+                <196608001>, <65536001>, <32768001>, <49152001>,
+                <2048001>, <24576001>, <196608001>,
+                <24576001>, <98304001>, <2048001>, <49152001>;
 };
 
 &cmu_fsys {
@@ -267,6 +300,11 @@
                                  <&cmu_top CLK_MOUT_BUS_PLL_USER>;
 };
 
+&cmu_top {
+        assigned-clocks = <&cmu_top CLK_FOUT_AUD_PLL>;
+        assigned-clock-rates = <196608001>;
+};
+
 &cpu0 {
         cpu-supply = <&buck3_reg>;
 };
@@ -779,9 +817,22 @@
                 clocks = <&pmu_system_controller 0>;
                 clock-names = "xtal";
 
-                port {
-                        mhl_to_hdmi: endpoint {
-                                remote-endpoint = <&hdmi_to_mhl>;
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                mhl_to_hdmi: endpoint {
+                                        remote-endpoint = <&hdmi_to_mhl>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+                                mhl_to_musb_con: endpoint {
+                                        remote-endpoint = <&musb_con_to_mhl>;
+                                };
                         };
                 };
         };
@@ -798,6 +849,25 @@
 
                 muic: max77843-muic {
                         compatible = "maxim,max77843-muic";
+
+                        musb_con: musb_connector {
+                                compatible = "samsung,usb-connector-11pin",
+                                             "usb-b-connector";
+                                label = "micro-USB";
+                                type = "micro";
+
+                                ports {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        port@3 {
+                                                reg = <3>;
+                                                musb_con_to_mhl: endpoint {
+                                                        remote-endpoint = <&mhl_to_musb_con>;
+                                                };
+                                        };
+                                };
+                        };
                 };
 
                 regulators {
@@ -838,6 +908,12 @@
         status = "okay";
 };
 
+&i2s1 {
+        assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>;
+        assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>;
+        status = "okay";
+};
+
 &mshc_0 {
         status = "okay";
         mmc-hs200-1_8v;
diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index 62f276970174..c0231d077fa6 100644
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -969,6 +969,7 @@
                         ddc = <&hsi2c_11>;
                         samsung,syscon-phandle = <&pmu_system_controller>;
                         samsung,sysreg-phandle = <&syscon_disp>;
+                        #sound-dai-cells = <0>;
                         status = "disabled";
                 };
 
@@ -1311,6 +1312,25 @@
                         status = "disabled";
                 };
 
+                i2s1: i2s@14d60000 {
+                        compatible = "samsung,exynos7-i2s";
+                        reg = <0x14d60000 0x100>;
+                        dmas = <&pdma0 31 &pdma0 30>;
+                        dma-names = "tx", "rx";
+                        interrupts = <GIC_SPI 435 IRQ_TYPE_NONE>;
+                        clocks = <&cmu_peric CLK_PCLK_I2S1>,
+                                 <&cmu_peric CLK_PCLK_I2S1>,
+                                 <&cmu_peric CLK_SCLK_I2S1>;
+                        clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
+                        #clock-cells = <1>;
+                        samsung,supports-6ch;
+                        samsung,supports-rstclr;
+                        samsung,supports-tdm;
+                        samsung,supports-low-rfs;
+                        #sound-dai-cells = <1>;
+                        status = "disabled";
+                };
+
                 pwm: pwm@14dd0000 {
                         compatible = "samsung,exynos4210-pwm";
                         reg = <0x14dd0000 0x100>;
@@ -1639,7 +1659,7 @@
                                 power-domains = <&pd_aud>;
                         };
 
-                        i2s0: i2s0@11440000 {
+                        i2s0: i2s@11440000 {
                                 compatible = "samsung,exynos7-i2s";
                                 reg = <0x11440000 0x100>;
                                 dmas = <&adma 0 &adma 2>;
@@ -1651,9 +1671,11 @@
                                         <&cmu_aud CLK_SCLK_AUD_I2S>,
                                         <&cmu_aud CLK_SCLK_I2S_BCLK>;
                                 clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
+                                #clock-cells = <1>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&i2s0_bus>;
                                 power-domains = <&pd_aud>;
+                                #sound-dai-cells = <1>;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
index 22723527e626..00dd89b92b42 100644
--- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
@@ -23,7 +23,7 @@
         };
 
         chosen {
-                linux,stdout-path = &serial_2;
+                stdout-path = &serial_2;
         };
 
         memory@40000000 {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index 82b272fb41b9..bb788eddf9f4 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -70,6 +70,24 @@
                         reg = <0x0>;
                         clocks = <&clockgen 1 0>;
                         #cooling-cells = <2>;
+                        cpu-idle-states = <&CPU_PH20>;
+                };
+        };
+
+        idle-states {
+                /*
+                 * PSCI node is not added default, U-boot will add missing
+                 * parts if it determines to use PSCI.
+                 */
+                entry-method = "arm,psci";
+
+                CPU_PH20: cpu-ph20 {
+                        compatible = "arm,idle-state";
+                        idle-state-name = "PH20";
+                        arm,psci-suspend-param = <0x0>;
+                        entry-latency-us = <1000>;
+                        exit-latency-us = <1000>;
+                        min-residency-us = <3000>;
                 };
         };
 
@@ -118,6 +136,37 @@
                 mask = <0x02>;
         };
 
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <5000>;
+                        thermal-sensors = <&tmu 0>;
+
+                        trips {
+                                cpu_alert: cpu-alert {
+                                        temperature = <85000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+
+                                cpu_crit: cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu0 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+                        };
+                };
+        };
+
         soc {
                 compatible = "simple-bus";
                 #address-cells = <2>;
@@ -304,37 +353,6 @@
                         #thermal-sensor-cells = <1>;
                 };
 
-                thermal-zones {
-                        cpu_thermal: cpu-thermal {
-                                polling-delay-passive = <1000>;
-                                polling-delay = <5000>;
-                                thermal-sensors = <&tmu 0>;
-
-                                trips {
-                                        cpu_alert: cpu-alert {
-                                                temperature = <85000>;
-                                                hysteresis = <2000>;
-                                                type = "passive";
-                                        };
-
-                                        cpu_crit: cpu-crit {
-                                                temperature = <95000>;
-                                                hysteresis = <2000>;
-                                                type = "critical";
-                                        };
-                                };
-
-                                cooling-maps {
-                                        map0 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu0 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-                                };
-                        };
-                };
-
                 i2c0: i2c@2180000 {
                         compatible = "fsl,vf610-i2c";
                         #address-cells = <1>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index 380e7c713395..1109f22bda5e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -81,6 +81,7 @@
                         clocks = <&clockgen 1 0>;
                         next-level-cache = <&l2>;
                         #cooling-cells = <2>;
+                        cpu-idle-states = <&CPU_PH20>;
                 };
 
                 cpu1: cpu@1 {
@@ -89,6 +90,7 @@
                         reg = <0x1>;
                         clocks = <&clockgen 1 0>;
                         next-level-cache = <&l2>;
+                        cpu-idle-states = <&CPU_PH20>;
                 };
 
                 cpu2: cpu@2 {
@@ -97,6 +99,7 @@
                         reg = <0x2>;
                         clocks = <&clockgen 1 0>;
                         next-level-cache = <&l2>;
+                        cpu-idle-states = <&CPU_PH20>;
                 };
 
                 cpu3: cpu@3 {
@@ -105,6 +108,7 @@
                         reg = <0x3>;
                         clocks = <&clockgen 1 0>;
                         next-level-cache = <&l2>;
+                        cpu-idle-states = <&CPU_PH20>;
                 };
 
                 l2: l2-cache {
@@ -112,6 +116,23 @@
                 };
         };
 
+        idle-states {
+                /*
+                 * PSCI node is not added default, U-boot will add missing
+                 * parts if it determines to use PSCI.
+                 */
+                entry-method = "arm,psci";
+
+                CPU_PH20: cpu-ph20 {
+                        compatible = "arm,idle-state";
+                        idle-state-name = "PH20";
+                        arm,psci-suspend-param = <0x0>;
+                        entry-latency-us = <1000>;
+                        exit-latency-us = <1000>;
+                        min-residency-us = <3000>;
+                };
+        };
+
         memory@80000000 {
                 device_type = "memory";
                 reg = <0x0 0x80000000 0 0x80000000>;
@@ -159,6 +180,37 @@
                 mask = <0x02>;
         };
 
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <5000>;
+
+                        thermal-sensors = <&tmu 3>;
+
+                        trips {
+                                cpu_alert: cpu-alert {
+                                        temperature = <85000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+                                cpu_crit: cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu0 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+                        };
+                };
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupts = <1 13 0xf08>, /* Physical Secure PPI */
@@ -342,37 +394,6 @@
                         #thermal-sensor-cells = <1>;
                 };
 
-                thermal-zones {
-                        cpu_thermal: cpu-thermal {
-                                polling-delay-passive = <1000>;
-                                polling-delay = <5000>;
-
-                                thermal-sensors = <&tmu 3>;
-
-                                trips {
-                                        cpu_alert: cpu-alert {
-                                                temperature = <85000>;
-                                                hysteresis = <2000>;
-                                                type = "passive";
-                                        };
-                                        cpu_crit: cpu-crit {
-                                                temperature = <95000>;
-                                                hysteresis = <2000>;
-                                                type = "critical";
-                                        };
-                                };
-
-                                cooling-maps {
-                                        map0 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu0 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-                                };
-                        };
-                };
-
                 qman: qman@1880000 {
                         compatible = "fsl,qman";
                         reg = <0x0 0x1880000 0x0 0x10000>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 06b5e12d04d8..136ebfa9b333 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -122,7 +122,7 @@
                 CPU_PH20: cpu-ph20 {
                         compatible = "arm,idle-state";
                         idle-state-name = "PH20";
-                        arm,psci-suspend-param = <0x00010000>;
+                        arm,psci-suspend-param = <0x0>;
                         entry-latency-us = <1000>;
                         exit-latency-us = <1000>;
                         min-residency-us = <3000>;
@@ -131,6 +131,8 @@
 
         memory@80000000 {
                 device_type = "memory";
+                /* Real size will be filled by bootloader */
+                reg = <0x0 0x80000000 0x0 0x0>;
         };
 
         sysclk: sysclk {
@@ -147,6 +149,37 @@
                 mask = <0x02>;
         };
 
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <5000>;
+                        thermal-sensors = <&tmu 3>;
+
+                        trips {
+                                cpu_alert: cpu-alert {
+                                        temperature = <85000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+
+                                cpu_crit: cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu0 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+                        };
+                };
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xf) |
@@ -362,37 +395,6 @@
                         #thermal-sensor-cells = <1>;
                 };
 
-                thermal-zones {
-                        cpu_thermal: cpu-thermal {
-                                polling-delay-passive = <1000>;
-                                polling-delay = <5000>;
-                                thermal-sensors = <&tmu 3>;
-
-                                trips {
-                                        cpu_alert: cpu-alert {
-                                                temperature = <85000>;
-                                                hysteresis = <2000>;
-                                                type = "passive";
-                                        };
-
-                                        cpu_crit: cpu-crit {
-                                                temperature = <95000>;
-                                                hysteresis = <2000>;
-                                                type = "critical";
-                                        };
-                                };
-
-                                cooling-maps {
-                                        map0 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu0 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-                                };
-                        };
-                };
-
                 dspi: dspi@2100000 {
                         compatible = "fsl,ls1021a-v1.0-dspi";
                         #address-cells = <1>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index 4fc150cd4ca5..1c6556bcfddf 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -130,7 +130,7 @@
                 CPU_PH20: cpu-ph20 {
                         compatible = "arm,idle-state";
                         idle-state-name = "PH20";
-                        arm,psci-suspend-param = <0x00010000>;
+                        arm,psci-suspend-param = <0x0>;
                         entry-latency-us = <1000>;
                         exit-latency-us = <1000>;
                         min-residency-us = <3000>;
@@ -158,6 +158,44 @@
                 };
         };
 
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <5000>;
+                        thermal-sensors = <&tmu 0>;
+
+                        trips {
+                                cpu_alert: cpu-alert {
+                                        temperature = <85000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+
+                                cpu_crit: cpu-crit {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu0 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+
+                                map1 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu4 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+                        };
+                };
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupts = <1 13 IRQ_TYPE_LEVEL_LOW>,/* Physical Secure PPI */
@@ -315,44 +353,6 @@
                         #thermal-sensor-cells = <1>;
                 };
 
-                thermal-zones {
-                        cpu_thermal: cpu-thermal {
-                                polling-delay-passive = <1000>;
-                                polling-delay = <5000>;
-                                thermal-sensors = <&tmu 0>;
-
-                                trips {
-                                        cpu_alert: cpu-alert {
-                                                temperature = <85000>;
-                                                hysteresis = <2000>;
-                                                type = "passive";
-                                        };
-
-                                        cpu_crit: cpu-crit {
-                                                temperature = <95000>;
-                                                hysteresis = <2000>;
-                                                type = "critical";
-                                        };
-                                };
-
-                                cooling-maps {
-                                        map0 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu0 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-
-                                        map1 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu4 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-                                };
-                        };
-                };
-
                 duart0: serial@21c0500 {
                         compatible = "fsl,ns16550", "ns16550a";
                         reg = <0x0 0x21c0500 0x0 0x100>;
@@ -612,6 +612,62 @@
                                         <0000 0 0 3 &gic 0 0 0 121 IRQ_TYPE_LEVEL_HIGH>,
                                         <0000 0 0 4 &gic 0 0 0 122 IRQ_TYPE_LEVEL_HIGH>;
                 };
+
+                cluster1_core0_watchdog: wdt@c000000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xc000000 0x0 0x1000>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "apb_pclk", "wdog_clk";
+                };
+
+                cluster1_core1_watchdog: wdt@c010000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xc010000 0x0 0x1000>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "apb_pclk", "wdog_clk";
+                };
+
+                cluster1_core2_watchdog: wdt@c020000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xc020000 0x0 0x1000>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "apb_pclk", "wdog_clk";
+                };
+
+                cluster1_core3_watchdog: wdt@c030000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xc030000 0x0 0x1000>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "apb_pclk", "wdog_clk";
+                };
+
+                cluster2_core0_watchdog: wdt@c100000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xc100000 0x0 0x1000>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "apb_pclk", "wdog_clk";
+                };
+
+                cluster2_core1_watchdog: wdt@c110000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xc110000 0x0 0x1000>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "apb_pclk", "wdog_clk";
+                };
+
+                cluster2_core2_watchdog: wdt@c120000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xc120000 0x0 0x1000>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "apb_pclk", "wdog_clk";
+                };
+
+                cluster2_core3_watchdog: wdt@c130000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xc130000 0x0 0x1000>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "apb_pclk", "wdog_clk";
+                };
         };
 
         firmware {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
index aeaef01d375f..0884e1a77901 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi
@@ -143,7 +143,7 @@
         CPU_PW20: cpu-pw20 {
                 compatible = "arm,idle-state";
                 idle-state-name = "PW20";
-                arm,psci-suspend-param = <0x00010000>;
+                arm,psci-suspend-param = <0x0>;
                 entry-latency-us = <2000>;
                 exit-latency-us = <2000>;
                 min-residency-us = <6000>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
index b2374469a830..1de618801c73 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
@@ -140,21 +140,21 @@
 
 &dspi {
         status = "okay";
-        dflash0: n25q128a {
+        dflash0: n25q128a@0 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 compatible = "st,m25p80";
                 spi-max-frequency = <3000000>;
                 reg = <0>;
         };
-        dflash1: sst25wf040b {
+        dflash1: sst25wf040b@1 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 compatible = "st,m25p80";
                 spi-max-frequency = <3000000>;
                 reg = <1>;
         };
-        dflash2: en25s64 {
+        dflash2: en25s64@2 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 compatible = "st,m25p80";
@@ -177,7 +177,7 @@
                 #size-cells = <1>;
                 compatible = "st,m25p80";
                 spi-max-frequency = <20000000>;
-                reg = <0>;
+                reg = <2>;
         };
 };
 
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
index f3a40af33af8..137ef4dfc3e9 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -111,6 +111,55 @@
                 mask = <0x2>;
         };
 
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <5000>;
+
+                        thermal-sensors = <&tmu 4>;
+
+                        trips {
+                                cpu_alert: cpu-alert {
+                                        temperature = <75000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+                                cpu_crit: cpu-crit {
+                                        temperature = <85000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu0 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+                                map1 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu2 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+                                map2 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu4 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+                                map3 {
+                                        trip = <&cpu_alert>;
+                                        cooling-device =
+                                                <&cpu6 THERMAL_NO_LIMIT
+                                                THERMAL_NO_LIMIT>;
+                                };
+                        };
+                };
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupts = <1 13 4>, /* Physical Secure PPI, active-low */
@@ -194,55 +243,6 @@
                         #thermal-sensor-cells = <1>;
                 };
 
-                thermal-zones {
-                        cpu_thermal: cpu-thermal {
-                                polling-delay-passive = <1000>;
-                                polling-delay = <5000>;
-
-                                thermal-sensors = <&tmu 4>;
-
-                                trips {
-                                        cpu_alert: cpu-alert {
-                                                temperature = <75000>;
-                                                hysteresis = <2000>;
-                                                type = "passive";
-                                        };
-                                        cpu_crit: cpu-crit {
-                                                temperature = <85000>;
-                                                hysteresis = <2000>;
-                                                type = "critical";
-                                        };
-                                };
-
-                                cooling-maps {
-                                        map0 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu0 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-                                        map1 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu2 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-                                        map2 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu4 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-                                        map3 {
-                                                trip = <&cpu_alert>;
-                                                cooling-device =
-                                                        <&cpu6 THERMAL_NO_LIMIT
-                                                        THERMAL_NO_LIMIT>;
-                                        };
-                                };
-                        };
-                };
-
                 serial0: serial@21c0500 {
                         compatible = "fsl,ns16550", "ns16550a";
                         reg = <0x0 0x21c0500 0x0 0x100>;
diff --git a/arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi b/arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
index c3c2be4f5072..ae15307f6e8b 100644
--- a/arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
+++ b/arch/arm64/boot/dts/freescale/qoriq-bman-portals.dtsi
@@ -68,4 +68,10 @@
                 reg = <0x80000 0x4000>, <0x4080000 0x4000>;
                 interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
         };
+
+        bman-portal@90000 {
+                compatible = "fsl,bman-portal";
+                reg = <0x90000 0x4000>, <0x4090000 0x4000>;
+                interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
+        };
 };
diff --git a/arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi b/arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
index 2a9aa060efda..6a93a4a9be0e 100644
--- a/arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
+++ b/arch/arm64/boot/dts/freescale/qoriq-qman-portals.dtsi
@@ -77,4 +77,11 @@
                 interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
                 cell-index = <8>;
         };
+
+        qportal9: qman-portal@90000 {
+                compatible = "fsl,qman-portal";
+                reg = <0x90000 0x4000>, <0x4090000 0x4000>;
+                interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
+                cell-index = <9>;
+        };
 };
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index a7ecd9074ea2..ec3eb8e33a3a 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -100,11 +100,7 @@
                         reg = <0x0 0x100>;
                         enable-method = "psci";
                         next-level-cache = <&A73_L2>;
-                        cpu-idle-states = <
-                                        &CPU_NAP
-                                        &CPU_SLEEP
-                                        &CLUSTER_SLEEP_1
-                        >;
+                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
                         capacity-dmips-mhz = <1024>;
                 };
 
@@ -114,11 +110,7 @@
                         reg = <0x0 0x101>;
                         enable-method = "psci";
                         next-level-cache = <&A73_L2>;
-                        cpu-idle-states = <
-                                        &CPU_NAP
-                                        &CPU_SLEEP
-                                        &CLUSTER_SLEEP_1
-                        >;
+                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
                         capacity-dmips-mhz = <1024>;
                 };
 
@@ -128,11 +120,7 @@
                         reg = <0x0 0x102>;
                         enable-method = "psci";
                         next-level-cache = <&A73_L2>;
-                        cpu-idle-states = <
-                                        &CPU_NAP
-                                        &CPU_SLEEP
-                                        &CLUSTER_SLEEP_1
-                        >;
+                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
                         capacity-dmips-mhz = <1024>;
                 };
 
@@ -142,25 +130,13 @@
                         reg = <0x0 0x103>;
                         enable-method = "psci";
                         next-level-cache = <&A73_L2>;
-                        cpu-idle-states = <
-                                        &CPU_NAP
-                                        &CPU_SLEEP
-                                        &CLUSTER_SLEEP_1
-                        >;
+                        cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_1>;
                         capacity-dmips-mhz = <1024>;
                 };
 
                 idle-states {
                         entry-method = "psci";
 
-                        CPU_NAP: cpu-nap {
-                                compatible = "arm,idle-state";
-                                arm,psci-suspend-param = <0x0000001>;
-                                entry-latency-us = <7>;
-                                exit-latency-us = <2>;
-                                min-residency-us = <15>;
-                        };
-
                         CPU_SLEEP: cpu-sleep {
                                 compatible = "arm,idle-state";
                                 local-timer-stop;
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 047641fe294c..724a0d3b7683 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -299,7 +299,9 @@
                 /* GPIO blocks 16 thru 19 do not appear to be routed to pins */
 
                 dwmmc_0: dwmmc0@f723d000 {
+                        max-frequency = <150000000>;
                         cap-mmc-highspeed;
+                        mmc-hs200-1_8v;
                         non-removable;
                         bus-width = <0x8>;
                         vmmc-supply = <&ldo19>;
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 6a180d1926e8..586b281cd531 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -88,8 +88,6 @@
                         next-level-cache = <&CLUSTER0_L2>;
                         clocks = <&stub_clock 0>;
                         operating-points-v2 = <&cpu_opp_table>;
-                        cooling-min-level = <4>;
-                        cooling-max-level = <0>;
                         #cooling-cells = <2>; /* min followed by max */
                         cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>;
                         dynamic-power-coefficient = <311>;
@@ -817,6 +815,14 @@
                         pinctrl-1 = <&sdio_pmx_idle &sdio_clk_cfg_idle &sdio_cfg_idle>;
                 };
 
+                watchdog0: watchdog@f8005000 {
+                        compatible = "arm,sp805-wdt", "arm,primecell";
+                        reg = <0x0 0xf8005000 0x0 0x1000>;
+                        interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&ao_ctrl HI6220_WDT0_PCLK>;
+                        clock-names = "apb_pclk";
+                };
+
                 tsensor: tsensor@0,f7030700 {
                         compatible = "hisilicon,tsensor";
                         reg = <0x0 0xf7030700 0x0 0x1000>;
diff --git a/arch/arm64/boot/dts/hisilicon/hip06.dtsi b/arch/arm64/boot/dts/hisilicon/hip06.dtsi
index a049b64f2101..35202ebe62a7 100644
--- a/arch/arm64/boot/dts/hisilicon/hip06.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip06.dtsi
@@ -291,6 +291,13 @@
                         #interrupt-cells = <2>;
                         num-pins = <128>;
                 };
+
+                mbigen_pcie0: intc_pcie0 {
+                        msi-parent = <&its_dsa 0x40085>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        num-pins = <10>;
+                };
         };
 
         mbigen_dsa@c0080000 {
@@ -312,6 +319,31 @@
                 };
         };
 
+        /**
+         *  HiSilicon erratum 161010801: This describes the limitation
+         *  of HiSilicon platforms hip06/hip07 to support the SMMUv3
+         *  mappings for PCIe MSI transactions.
+         *  PCIe controller on these platforms has to differentiate the
+         *  MSI payload against other DMA payload and has to modify the
+         *  MSI payload. This makes it difficult for these platforms to
+         *  have a SMMU translation for MSI. In order to workaround this,
+         *  ARM SMMUv3 driver requires a quirk to treat the MSI regions
+         *  separately. Such a quirk is currently missing for DT based
+         *  systems. Hence please make sure that the smmu pcie node on
+         *  hip06 is disabled as this will break the PCIe functionality
+         *  when iommu-map entry is used along with the PCIe node.
+         *  Refer:https://www.spinics.net/lists/arm-kernel/msg602812.html
+         */
+        smmu0: smmu_pcie {
+                compatible = "arm,smmu-v3";
+                reg = <0x0 0xa0040000 0x0 0x20000>;
+                #iommu-cells = <1>;
+                dma-coherent;
+                smmu-cb-memtype = <0x0 0x1>;
+                hisilicon,broken-prefetch-cmd;
+                status = "disabled";
+        };
+
         soc {
                 compatible = "simple-bus";
                 #address-cells = <2>;
@@ -676,6 +708,30 @@
                                      <637 1>,<638 1>,<639 1>;
                         status = "disabled";
                 };
+
+                pcie0: pcie@a0090000 {
+                        compatible = "hisilicon,hip06-pcie-ecam";
+                        reg = <0 0xb0000000 0 0x2000000>,
+                              <0 0xa0090000 0 0x10000>;
+                        bus-range = <0  31>;
+                        msi-map = <0x0000 &its_dsa 0x0000 0x2000>;
+                        msi-map-mask = <0xffff>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        device_type = "pci";
+                        dma-coherent;
+                        ranges = <0x02000000 0 0xb2000000 0x0 0xb2000000 0
+                                 0x5ff0000 0x01000000 0 0 0 0xb7ff0000
+                                 0 0x10000>;
+                        #interrupt-cells = <1>;
+                        interrupt-map-mask = <0xf800 0 0 7>;
+                        interrupt-map = <0x0 0 0 1 &mbigen_pcie0 650 4
+                                        0x0 0 0 2 &mbigen_pcie0 650 4
+                                        0x0 0 0 3 &mbigen_pcie0 650 4
+                                        0x0 0 0 4 &mbigen_pcie0 650 4>;
+                        status = "disabled";
+                };
+
         };
 
 };
diff --git a/arch/arm64/boot/dts/hisilicon/hip07.dtsi b/arch/arm64/boot/dts/hisilicon/hip07.dtsi
index 2c01a21c3665..0600a6a84ab7 100644
--- a/arch/arm64/boot/dts/hisilicon/hip07.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip07.dtsi
@@ -1083,6 +1083,31 @@
                 };
         };
 
+        /**
+         *  HiSilicon erratum 161010801: This describes the limitation
+         *  of HiSilicon platforms hip06/hip07 to support the SMMUv3
+         *  mappings for PCIe MSI transactions.
+         *  PCIe controller on these platforms has to differentiate the
+         *  MSI payload against other DMA payload and has to modify the
+         *  MSI payload. This makes it difficult for these platforms to
+         *  have a SMMU translation for MSI. In order to workaround this,
+         *  ARM SMMUv3 driver requires a quirk to treat the MSI regions
+         *  separately. Such a quirk is currently missing for DT based
+         *  systems. Hence please make sure that the smmu pcie node on
+         *  hip07 is disabled as this will break the PCIe functionality
+         *  when iommu-map entry is used along with the PCIe node.
+         *  Refer:https://www.spinics.net/lists/arm-kernel/msg602812.html
+         */
+        smmu0: smmu_pcie {
+                compatible = "arm,smmu-v3";
+                reg = <0x0 0xa0040000 0x0 0x20000>;
+                #iommu-cells = <1>;
+                dma-coherent;
+                smmu-cb-memtype = <0x0 0x1>;
+                hisilicon,broken-prefetch-cmd;
+                status = "disabled";
+        };
+
         soc {
                 compatible = "simple-bus";
                 #address-cells = <2>;
@@ -1127,6 +1152,12 @@
                         reg = <0x0 0xc0000000 0x0 0x10000>;
                 };
 
+                dsa_cpld: dsa_cpld@78000010 {
+                        compatible = "syscon";
+                        reg = <0x0 0x78000010 0x0 0x100>;
+                        reg-io-width = <2>;
+                };
+
                 pcie_subctl: pcie_subctl@a0000000 {
                         compatible = "hisilicon,pcie-sas-subctrl", "syscon";
                         reg = <0x0 0xa0000000 0x0 0x10000>;
@@ -1258,6 +1289,7 @@
                         port@0 {
                                 reg = <0>;
                                 serdes-syscon = <&serdes_ctrl>;
+                                cpld-syscon = <&dsa_cpld 0x0>;
                                 port-rst-offset = <0>;
                                 port-mode-offset = <0>;
                                 mc-mac-mask = [ff f0 00 00 00 00];
@@ -1267,6 +1299,7 @@
                         port@1 {
                                 reg = <1>;
                                 serdes-syscon= <&serdes_ctrl>;
+                                cpld-syscon = <&dsa_cpld 0x4>;
                                 port-rst-offset = <1>;
                                 port-mode-offset = <1>;
                                 mc-mac-mask = [ff f0 00 00 00 00];
diff --git a/arch/arm64/boot/dts/marvell/armada-371x.dtsi b/arch/arm64/boot/dts/marvell/armada-371x.dtsi
index 11226f7b9ed9..dc1182ec9fa1 100644
--- a/arch/arm64/boot/dts/marvell/armada-371x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-371x.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 371x family of SoCs
  * (also named 88F3710)
@@ -6,43 +7,6 @@
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.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, 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 "armada-37xx.dtsi"
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 0f3468e777f7..f2cc00594d64 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Marvell Armada 3720 development board
  * (DB-88F3720-DDR3)
@@ -5,44 +6,6 @@
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.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, 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.
- *
  * This file is compatible with the version 1.4 and the version 2.0 of
  * the board, however the CON numbers are different between the 2
  * version
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
index bdfb5553ddb5..ef7fd2ca2515 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
@@ -1,46 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree file for Globalscale Marvell ESPRESSOBin Board
  * Copyright (C) 2016 Marvell
  *
  * Romain Perier <romain.perier@free-electrons.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, 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.
+ */
+/*
+ * Schematic available at http://espressobin.net/wp-content/uploads/2017/08/ESPRESSObin_V5_Schematics.pdf
  */
 
 /dts-v1/;
diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
index 2554e0baea6b..97558a64e276 100644
--- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 372x family of SoCs
  * (also named 88F3720)
@@ -6,43 +7,6 @@
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.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, 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 "armada-37xx.dtsi"
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 375026867342..97207a61bc79 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Include file for Marvell Armada 37xx family of SoCs.
  *
@@ -5,43 +6,6 @@
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.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, 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 <dt-bindings/interrupt-controller/arm-gic.h>
diff --git a/arch/arm64/boot/dts/marvell/armada-7020.dtsi b/arch/arm64/boot/dts/marvell/armada-7020.dtsi
index 4ab012991d9d..4e46326dd123 100644
--- a/arch/arm64/boot/dts/marvell/armada-7020.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-7020.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for the Armada 7020 SoC, made of an AP806 Dual and
  * one CP110.
  */
diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 3ae05eee2c9a..d6bec058a30a 100644
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada 7040 Development board platform
  */
 
@@ -162,36 +123,48 @@
         };
 };
 
-&cp0_nand {
+&cp0_nand_controller {
         /*
          * SPI on CPM and NAND have common pins on this board. We can
-         * use only one at a time. To enable the NAND (whihch will
+         * use only one at a time. To enable the NAND (which will
          * disable the SPI), the "status = "okay";" line have to be
          * added here.
          */
-        num-cs = <1>;
         pinctrl-0 = <&nand_pins>, <&nand_rb>;
         pinctrl-names = "default";
-        nand-ecc-strength = <4>;
-        nand-ecc-step-size = <512>;
-        marvell,nand-enable-arbiter;
-        nand-on-flash-bbt;
-
-        partition@0 {
-                label = "U-Boot";
-                reg = <0 0x200000>;
-        };
-        partition@200000 {
-                label = "Linux";
-                reg = <0x200000 0xe00000>;
-        };
-        partition@1000000 {
-                label = "Filesystem";
-                reg = <0x1000000 0x3f000000>;
+
+        nand@0 {
+                reg = <0>;
+                label = "pxa3xx_nand-0";
+                nand-rb = <0>;
+                nand-on-flash-bbt;
+                nand-ecc-strength = <4>;
+                nand-ecc-step-size = <512>;
+
+                partitions {
+                        compatible = "fixed-partitions";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+
+                        partition@0 {
+                                label = "U-Boot";
+                                reg = <0 0x200000>;
+                        };
+
+                        partition@200000 {
+                                label = "Linux";
+                                reg = <0x200000 0xe00000>;
+                        };
+
+                        partition@1000000 {
+                                label = "Filesystem";
+                                reg = <0x1000000 0x3f000000>;
+                        };
+
+                };
         };
 };
 
-
 &cp0_spi1 {
         status = "okay";
 
diff --git a/arch/arm64/boot/dts/marvell/armada-7040.dtsi b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
index cbe460b8fc00..47247215770d 100644
--- a/arch/arm64/boot/dts/marvell/armada-7040.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for the Armada 7040 SoC, made of an AP806 Quad and
  * one CP110.
  */
diff --git a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
index f63b4fbd642b..e5c6d7c25819 100644
--- a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for the Armada 70x0 SoC
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-8020.dtsi b/arch/arm64/boot/dts/marvell/armada-8020.dtsi
index 3318d6b0214b..ba1307c0fadb 100644
--- a/arch/arm64/boot/dts/marvell/armada-8020.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8020.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for the Armada 8020 SoC, made of an AP806 Dual and
  * two CP110.
  */
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index dba55baff20f..5689fb23bbab 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada 8040 Development board platform
  */
 
@@ -279,27 +240,35 @@
  * Proper NAND usage will require DPR-76 to be in position 1-2, which disables
  * MDIO signal of CP1.
  */
-&cp1_nand {
-        num-cs = <1>;
+&cp1_nand_controller {
         pinctrl-0 = <&nand_pins>, <&nand_rb>;
         pinctrl-names = "default";
-        nand-ecc-strength = <4>;
-        nand-ecc-step-size = <512>;
-        marvell,nand-enable-arbiter;
-        marvell,system-controller = <&cp1_syscon0>;
-        nand-on-flash-bbt;
-
-        partition@0 {
-                label = "U-Boot";
-                reg = <0 0x200000>;
-        };
-        partition@200000 {
-                label = "Linux";
-                reg = <0x200000 0xe00000>;
-        };
-        partition@1000000 {
-                label = "Filesystem";
-                reg = <0x1000000 0x3f000000>;
+
+        nand@0 {
+                reg = <0>;
+                nand-rb = <0>;
+                nand-on-flash-bbt;
+                nand-ecc-strength = <4>;
+                nand-ecc-step-size = <512>;
+
+                partitions {
+                        compatible = "fixed-partitions";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+
+                        partition@0 {
+                                label = "U-Boot";
+                                reg = <0 0x200000>;
+                        };
+                        partition@200000 {
+                                label = "Linux";
+                                reg = <0x200000 0xe00000>;
+                        };
+                        partition@1000000 {
+                                label = "Filesystem";
+                                reg = <0x1000000 0x3f000000>;
+                        };
+                };
         };
 };
 
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
index 626e9d0462c3..81de03ef860d 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for MACCHIATOBin Armada 8040 community board platform
  */
 
@@ -49,7 +10,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-        model = "Marvell 8040 MACHIATOBin";
+        model = "Marvell 8040 MACCHIATOBin";
         compatible = "marvell,armada8040-mcbin", "marvell,armada8040",
                         "marvell,armada-ap806-quad", "marvell,armada-ap806";
 
@@ -163,6 +124,13 @@
         };
 };
 
+/* J25 UART header */
+&cp0_uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&cp0_uart1_pins>;
+        status = "okay";
+};
+
 &cp0_mdio {
         pinctrl-names = "default";
         pinctrl-0 = <&cp0_ge_mdio_pins>;
@@ -195,6 +163,10 @@
                 marvell,pins = "mpp37", "mpp38";
                 marvell,function = "i2c0";
         };
+        cp0_uart1_pins: uart1-pins {
+                marvell,pins = "mpp40", "mpp41";
+                marvell,function = "uart1";
+        };
         cp0_xhci_vbus_pins: xhci0-vbus-pins {
                 marvell,pins = "mpp47";
                 marvell,function = "gpio";
@@ -290,6 +262,17 @@
                 marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", "mpp16";
                 marvell,function = "spi1";
         };
+        cp1_uart0_pins: uart0-pins {
+                marvell,pins = "mpp6", "mpp7";
+                marvell,function = "uart0";
+        };
+};
+
+/* J27 UART header */
+&cp1_uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&cp1_uart0_pins>;
+        status = "okay";
 };
 
 &cp1_sata0 {
diff --git a/arch/arm64/boot/dts/marvell/armada-8040.dtsi b/arch/arm64/boot/dts/marvell/armada-8040.dtsi
index 83d2b40e5981..7699b19224c2 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for the Armada 8040 SoC, made of an AP806 Quad and
  * two CP110.
  */
diff --git a/arch/arm64/boot/dts/marvell/armada-8080-db.dts b/arch/arm64/boot/dts/marvell/armada-8080-db.dts
index 85b58a19a9fb..4ba158f415ce 100644
--- a/arch/arm64/boot/dts/marvell/armada-8080-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8080-db.dts
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada-8080 Development board platform
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-8080.dtsi b/arch/arm64/boot/dts/marvell/armada-8080.dtsi
index d5535b716735..299e814d1ded 100644
--- a/arch/arm64/boot/dts/marvell/armada-8080.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8080.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada-8080 SoC, made of an AP810 OCTA.
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
index e9c84a1d3c4d..8129b40f12a4 100644
--- a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for the Armada 80x0 SoC family
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
index b98ea137371d..64b5e61a698e 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada AP806.
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
index 116164ff260f..746e792767f5 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada AP806.
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index f9b66b81f9fc..176e38d54872 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada AP806.
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi
index 7f0661e12f5e..7d00ae78fc79 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada AP810 OCTA cores.
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
index 7e6f039f0f80..8107d120a8a7 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi
@@ -1,46 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Marvell Technology Group Ltd.
  *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPLv2 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 library 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 library 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.
- */
-
-/*
  * Device Tree file for Marvell Armada AP810.
  */
 
diff --git a/arch/arm64/boot/dts/marvell/armada-common.dtsi b/arch/arm64/boot/dts/marvell/armada-common.dtsi
index c6dd1d81c68d..d5e8aedec188 100644
--- a/arch/arm64/boot/dts/marvell/armada-common.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-common.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR X11)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  */
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
index a8af4136dbe7..48cad7919efa 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
@@ -1,9 +1,7 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR X11)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2016 Marvell Technology Group Ltd.
- */
-
-/*
+ *
  * Device Tree file for Marvell Armada CP110.
  */
 
@@ -213,7 +211,9 @@
                         reg = <0x500000 0x4000>;
                         dma-coherent;
                         interrupts = <ICU_GRP_NSR 106 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&CP110_LABEL(clk) 1 22>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 22>,
+                                 <&CP110_LABEL(clk) 1 16>;
                         status = "disabled";
                 };
 
@@ -223,7 +223,9 @@
                         reg = <0x510000 0x4000>;
                         dma-coherent;
                         interrupts = <ICU_GRP_NSR 105 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&CP110_LABEL(clk) 1 23>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 23>,
+                                 <&CP110_LABEL(clk) 1 16>;
                         status = "disabled";
                 };
 
@@ -232,7 +234,8 @@
                         "generic-ahci";
                         reg = <0x540000 0x30000>;
                         interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&CP110_LABEL(clk) 1 15>;
+                        clocks = <&CP110_LABEL(clk) 1 15>,
+                                 <&CP110_LABEL(clk) 1 16>;
                         status = "disabled";
                 };
 
@@ -241,7 +244,9 @@
                         reg = <0x6a0000 0x1000>, <0x6b0000 0x1000>;
                         dma-coherent;
                         msi-parent = <&gic_v2m0>;
-                        clocks = <&CP110_LABEL(clk) 1 8>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 8>,
+                                 <&CP110_LABEL(clk) 1 14>;
                 };
 
                 CP110_LABEL(xor1): xor@6c0000 {
@@ -249,7 +254,9 @@
                         reg = <0x6c0000 0x1000>, <0x6d0000 0x1000>;
                         dma-coherent;
                         msi-parent = <&gic_v2m0>;
-                        clocks = <&CP110_LABEL(clk) 1 7>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 7>,
+                                 <&CP110_LABEL(clk) 1 14>;
                 };
 
                 CP110_LABEL(spi0): spi@700600 {
@@ -257,7 +264,9 @@
                         reg = <0x700600 0x50>;
                         #address-cells = <0x1>;
                         #size-cells = <0x0>;
-                        clocks = <&CP110_LABEL(clk) 1 21>;
+                        clock-names = "core", "axi";
+                        clocks = <&CP110_LABEL(clk) 1 21>,
+                                 <&CP110_LABEL(clk) 1 17>;
                         status = "disabled";
                 };
 
@@ -266,7 +275,9 @@
                         reg = <0x700680 0x50>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        clocks = <&CP110_LABEL(clk) 1 21>;
+                        clock-names = "core", "axi";
+                        clocks = <&CP110_LABEL(clk) 1 21>,
+                                 <&CP110_LABEL(clk) 1 17>;
                         status = "disabled";
                 };
 
@@ -276,7 +287,9 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         interrupts = <ICU_GRP_NSR 120 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&CP110_LABEL(clk) 1 21>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 21>,
+                                 <&CP110_LABEL(clk) 1 17>;
                         status = "disabled";
                 };
 
@@ -286,23 +299,75 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         interrupts = <ICU_GRP_NSR 121 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&CP110_LABEL(clk) 1 21>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 21>,
+                                 <&CP110_LABEL(clk) 1 17>;
+                        status = "disabled";
+                };
+
+                CP110_LABEL(uart0): serial@702000 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x702000 0x100>;
+                        reg-shift = <2>;
+                        interrupts = <ICU_GRP_NSR 122 IRQ_TYPE_LEVEL_HIGH>;
+                        reg-io-width = <1>;
+                        clock-names = "baudclk", "apb_pclk";
+                        clocks = <&CP110_LABEL(clk) 1 21>,
+                                 <&CP110_LABEL(clk) 1 17>;
+                        status = "disabled";
+                };
+
+                CP110_LABEL(uart1): serial@702100 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x702100 0x100>;
+                        reg-shift = <2>;
+                        interrupts = <ICU_GRP_NSR 123 IRQ_TYPE_LEVEL_HIGH>;
+                        reg-io-width = <1>;
+                        clock-names = "baudclk", "apb_pclk";
+                        clocks = <&CP110_LABEL(clk) 1 21>,
+                                 <&CP110_LABEL(clk) 1 17>;
+                        status = "disabled";
+                };
+
+                CP110_LABEL(uart2): serial@702200 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x702200 0x100>;
+                        reg-shift = <2>;
+                        interrupts = <ICU_GRP_NSR 124 IRQ_TYPE_LEVEL_HIGH>;
+                        reg-io-width = <1>;
+                        clock-names = "baudclk", "apb_pclk";
+                        clocks = <&CP110_LABEL(clk) 1 21>,
+                                 <&CP110_LABEL(clk) 1 17>;
                         status = "disabled";
                 };
 
-                CP110_LABEL(nand): nand@720000 {
+                CP110_LABEL(uart3): serial@702300 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x702300 0x100>;
+                        reg-shift = <2>;
+                        interrupts = <ICU_GRP_NSR 125 IRQ_TYPE_LEVEL_HIGH>;
+                        reg-io-width = <1>;
+                        clock-names = "baudclk", "apb_pclk";
+                        clocks = <&CP110_LABEL(clk) 1 21>,
+                                 <&CP110_LABEL(clk) 1 17>;
+                        status = "disabled";
+                };
+
+                CP110_LABEL(nand_controller): nand@720000 {
                         /*
                         * Due to the limitation of the pins available
                         * this controller is only usable on the CPM
                         * for A7K and on the CPS for A8K.
                         */
-                        compatible = "marvell,armada-8k-nand",
-                        "marvell,armada370-nand";
+                        compatible = "marvell,armada-8k-nand-controller",
+                                "marvell,armada370-nand-controller";
                         reg = <0x720000 0x54>;
                         #address-cells = <1>;
-                        #size-cells = <1>;
+                        #size-cells = <0>;
                         interrupts = <ICU_GRP_NSR 115 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&CP110_LABEL(clk) 1 2>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 2>,
+                                 <&CP110_LABEL(clk) 1 17>;
                         marvell,system-controller = <&CP110_LABEL(syscon0)>;
                         status = "disabled";
                 };
@@ -312,7 +377,9 @@
                         "inside-secure,safexcel-eip76";
                         reg = <0x760000 0x7d>;
                         interrupts = <ICU_GRP_NSR 95 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&CP110_LABEL(clk) 1 25>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 25>,
+                                 <&CP110_LABEL(clk) 1 17>;
                         status = "okay";
                 };
 
@@ -337,7 +404,9 @@
                                 <ICU_GRP_NSR 92 IRQ_TYPE_LEVEL_HIGH>;
                         interrupt-names = "mem", "ring0", "ring1",
                                 "ring2", "ring3", "eip";
-                        clocks = <&CP110_LABEL(clk) 1 26>;
+                        clock-names = "core", "reg";
+                        clocks = <&CP110_LABEL(clk) 1 26>,
+                                 <&CP110_LABEL(clk) 1 17>;
                         dma-coherent;
                 };
         };
@@ -364,7 +433,8 @@
                 interrupt-map = <0 0 0 0 &CP110_LABEL(icu) ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
                 interrupts = <ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
                 num-lanes = <1>;
-                clocks = <&CP110_LABEL(clk) 1 13>;
+                clock-names = "core", "reg";
+                clocks = <&CP110_LABEL(clk) 1 13>, <&CP110_LABEL(clk) 1 14>;
                 status = "disabled";
         };
 
@@ -391,7 +461,8 @@
                 interrupts = <ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
 
                 num-lanes = <1>;
-                clocks = <&CP110_LABEL(clk) 1 11>;
+                clock-names = "core", "reg";
+                clocks = <&CP110_LABEL(clk) 1 11>, <&CP110_LABEL(clk) 1 14>;
                 status = "disabled";
         };
 
@@ -418,7 +489,8 @@
                 interrupts = <ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
 
                 num-lanes = <1>;
-                clocks = <&CP110_LABEL(clk) 1 12>;
+                clock-names = "core", "reg";
+                clocks = <&CP110_LABEL(clk) 1 12>, <&CP110_LABEL(clk) 1 14>;
                 status = "disabled";
         };
 };
diff --git a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
index 10f9c76cd105..4ce9d6ca0bf7 100644
--- a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
@@ -41,6 +41,10 @@
 
 };
 
+&auxadc {
+        status = "okay";
+};
+
 &cpu0 {
         proc-supply = <&cpus_fixed_vproc0>;
 };
diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
index fdf66f4fe7c3..9d88f41aefa0 100644
--- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
@@ -289,6 +289,15 @@
                          (GIC_CPU_MASK_RAW(0x13) | IRQ_TYPE_LEVEL_HIGH)>;
         };
 
+        auxadc: adc@11001000 {
+                compatible = "mediatek,mt2712-auxadc";
+                reg = <0 0x11001000 0 0x1000>;
+                clocks = <&pericfg CLK_PERI_AUXADC>;
+                clock-names = "main";
+                #io-channel-cells = <1>;
+                status = "disabled";
+        };
+
         uart0: serial@11002000 {
                 compatible = "mediatek,mt2712-uart",
                              "mediatek,mt6577-uart";
diff --git a/arch/arm64/boot/dts/mediatek/mt6380.dtsi b/arch/arm64/boot/dts/mediatek/mt6380.dtsi
new file mode 100644
index 000000000000..53b335d2de5f
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt6380.dtsi
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * dts file for MediaTek MT6380 regulator
+ *
+ * Copyright (c) 2018 MediaTek Inc.
+ * Author: Chenglin Xu <chenglin.xu@mediatek.com>
+ *         Sean Wang <sean.wang@mediatek.com>
+ */
+
+&pwrap {
+        regulators {
+                compatible = "mediatek,mt6380-regulator";
+
+                mt6380_vcpu_reg: buck-vcore1 {
+                        regulator-name = "vcore1";
+                        regulator-min-microvolt = < 600000>;
+                        regulator-max-microvolt = <1393750>;
+                        regulator-ramp-delay = <6250>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+
+                mt6380_vcore_reg: buck-vcore {
+                        regulator-name = "vcore";
+                        regulator-min-microvolt = <600000>;
+                        regulator-max-microvolt = <1393750>;
+                        regulator-ramp-delay = <6250>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+
+                mt6380_vrf_reg: buck-vrf {
+                        regulator-name = "vrf";
+                        regulator-min-microvolt = <1200000>;
+                        regulator-max-microvolt = <1575000>;
+                        regulator-ramp-delay = <0>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+
+                mt6380_vm_reg: ldo-vm {
+                        regulator-name = "vm";
+                        regulator-min-microvolt = <1050000>;
+                        regulator-max-microvolt = <1400000>;
+                        regulator-ramp-delay = <0>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+
+                mt6380_va_reg: ldo-va {
+                        regulator-name = "va";
+                        regulator-min-microvolt = <2200000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-ramp-delay = <0>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+
+                mt6380_vphy_reg: ldo-vphy {
+                        regulator-name = "vphy";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        regulator-ramp-delay = <0>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+
+                mt6380_vddr_reg: ldo-vddr {
+                        regulator-name = "vddr";
+                        regulator-min-microvolt = <1240000>;
+                        regulator-max-microvolt = <1840000>;
+                        regulator-ramp-delay = <0>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+
+                mt6380_vt_reg: ldo-vt {
+                        regulator-name = "vt";
+                        regulator-min-microvolt = <2200000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-ramp-delay = <0>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
index c08309df2cc7..45d8655ee423 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
@@ -7,7 +7,11 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
 #include "mt7622.dtsi"
+#include "mt6380.dtsi"
 
 / {
         model = "MediaTek MT7622 RFB1 board";
@@ -17,11 +21,476 @@
                 bootargs = "console=ttyS0,115200n1";
         };
 
+        cpus {
+                cpu@0 {
+                        proc-supply = <&mt6380_vcpu_reg>;
+                        sram-supply = <&mt6380_vm_reg>;
+                };
+
+                cpu@1 {
+                        proc-supply = <&mt6380_vcpu_reg>;
+                        sram-supply = <&mt6380_vm_reg>;
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys-polled";
+                poll-interval = <100>;
+
+                factory {
+                        label = "factory";
+                        linux,code = <BTN_0>;
+                        gpios = <&pio 0 0>;
+                };
+
+                wps {
+                        label = "wps";
+                        linux,code = <KEY_WPS_BUTTON>;
+                        gpios = <&pio 102 0>;
+                };
+        };
+
         memory {
                 reg = <0 0x40000000 0 0x3F000000>;
         };
+
+        reg_1p8v: regulator-1p8v {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-1.8V";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                regulator-always-on;
+        };
+
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-3.3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
+        reg_5v: regulator-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-5V";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+};
+
+&pcie {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pcie0_pins>;
+        status = "okay";
+
+        pcie@0,0 {
+                status = "okay";
+        };
+};
+
+&pio {
+        /* eMMC is shared pin with parallel NAND */
+        emmc_pins_default: emmc-pins-default {
+                mux {
+                        function = "emmc", "emmc_rst";
+                        groups = "emmc";
+                };
+
+                /* "NDL0","NDL1","NDL2","NDL3","NDL4","NDL5","NDL6","NDL7",
+                 * "NRB","NCLE" pins are used as DAT0,DAT1,DAT2,DAT3,DAT4,
+                 * DAT5,DAT6,DAT7,CMD,CLK for eMMC respectively
+                 */
+                conf-cmd-dat {
+                        pins = "NDL0", "NDL1", "NDL2",
+                               "NDL3", "NDL4", "NDL5",
+                               "NDL6", "NDL7", "NRB";
+                        input-enable;
+                        bias-pull-up;
+                };
+
+                conf-clk {
+                        pins = "NCLE";
+                        bias-pull-down;
+                };
+        };
+
+        emmc_pins_uhs: emmc-pins-uhs {
+                mux {
+                        function = "emmc";
+                        groups = "emmc";
+                };
+
+                conf-cmd-dat {
+                        pins = "NDL0", "NDL1", "NDL2",
+                               "NDL3", "NDL4", "NDL5",
+                               "NDL6", "NDL7", "NRB";
+                        input-enable;
+                        drive-strength = <4>;
+                        bias-pull-up;
+                };
+
+                conf-clk {
+                        pins = "NCLE";
+                        drive-strength = <4>;
+                        bias-pull-down;
+                };
+        };
+
+        eth_pins: eth-pins {
+                mux {
+                        function = "eth";
+                        groups = "mdc_mdio", "rgmii_via_gmac2";
+                };
+        };
+
+        i2c1_pins: i2c1-pins {
+                mux {
+                        function = "i2c";
+                        groups =  "i2c1_0";
+                };
+        };
+
+        i2c2_pins: i2c2-pins {
+                mux {
+                        function = "i2c";
+                        groups =  "i2c2_0";
+                };
+        };
+
+        i2s1_pins: i2s1-pins {
+                mux {
+                        function = "i2s";
+                        groups =  "i2s_out_bclk_ws_mclk",
+                                  "i2s1_in_data",
+                                  "i2s1_out_data";
+                };
+        };
+
+        irrx_pins: irrx-pins {
+                mux {
+                        function = "ir";
+                        groups =  "ir_1_rx";
+                };
+        };
+
+        irtx_pins: irtx-pins {
+                mux {
+                        function = "ir";
+                        groups =  "ir_1_tx";
+                };
+        };
+
+        /* Parallel nand is shared pin with eMMC */
+        parallel_nand_pins: parallel-nand-pins {
+                mux {
+                        function = "flash";
+                        groups = "par_nand";
+                };
+        };
+
+        pcie0_pins: pcie0-pins {
+                mux {
+                        function = "pcie";
+                        groups = "pcie0_pad_perst",
+                                 "pcie0_1_waken",
+                                 "pcie0_1_clkreq";
+                };
+        };
+
+        pcie1_pins: pcie1-pins {
+                mux {
+                        function = "pcie";
+                        groups = "pcie1_pad_perst",
+                                 "pcie1_0_waken",
+                                 "pcie1_0_clkreq";
+                };
+        };
+
+        pmic_bus_pins: pmic-bus-pins {
+                mux {
+                        function = "pmic";
+                        groups = "pmic_bus";
+                };
+        };
+
+        pwm7_pins: pwm1-2-pins {
+                mux {
+                        function = "pwm";
+                        groups = "pwm_ch7_2";
+                };
+        };
+
+        wled_pins: wled-pins {
+                mux {
+                        function = "led";
+                        groups = "wled";
+                };
+        };
+
+        sd0_pins_default: sd0-pins-default {
+                mux {
+                        function = "sd";
+                        groups = "sd_0";
+                };
+
+                /* "I2S2_OUT, "I2S4_IN"", "I2S3_IN", "I2S2_IN",
+                 *  "I2S4_OUT", "I2S3_OUT" are used as DAT0, DAT1,
+                 *  DAT2, DAT3, CMD, CLK for SD respectively.
+                 */
+                conf-cmd-data {
+                        pins = "I2S2_OUT", "I2S4_IN", "I2S3_IN",
+                               "I2S2_IN","I2S4_OUT";
+                        input-enable;
+                        drive-strength = <8>;
+                        bias-pull-up;
+                };
+                conf-clk {
+                        pins = "I2S3_OUT";
+                        drive-strength = <12>;
+                        bias-pull-down;
+                };
+                conf-cd {
+                        pins = "TXD3";
+                        bias-pull-up;
+                };
+        };
+
+        sd0_pins_uhs: sd0-pins-uhs {
+                mux {
+                        function = "sd";
+                        groups = "sd_0";
+                };
+
+                conf-cmd-data {
+                        pins = "I2S2_OUT", "I2S4_IN", "I2S3_IN",
+                               "I2S2_IN","I2S4_OUT";
+                        input-enable;
+                        bias-pull-up;
+                };
+
+                conf-clk {
+                        pins = "I2S3_OUT";
+                        bias-pull-down;
+                };
+        };
+
+        /* Serial NAND is shared pin with SPI-NOR */
+        serial_nand_pins: serial-nand-pins {
+                mux {
+                        function = "flash";
+                        groups = "snfi";
+                };
+        };
+
+        spic0_pins: spic0-pins {
+                mux {
+                        function = "spi";
+                        groups = "spic0_0";
+                };
+        };
+
+        spic1_pins: spic1-pins {
+                mux {
+                        function = "spi";
+                        groups = "spic1_0";
+                };
+        };
+
+        /* SPI-NOR is shared pin with serial NAND */
+        spi_nor_pins: spi-nor-pins {
+                mux {
+                        function = "flash";
+                        groups = "spi_nor";
+                };
+        };
+
+        /* serial NAND is shared pin with SPI-NOR */
+        serial_nand_pins: serial-nand-pins {
+                mux {
+                        function = "flash";
+                        groups = "snfi";
+                };
+        };
+
+        uart0_pins: uart0-pins {
+                mux {
+                        function = "uart";
+                        groups = "uart0_0_tx_rx" ;
+                };
+        };
+
+        uart2_pins: uart2-pins {
+                mux {
+                        function = "uart";
+                        groups = "uart2_1_tx_rx" ;
+                };
+        };
+
+        watchdog_pins: watchdog-pins {
+                mux {
+                        function = "watchdog";
+                        groups = "watchdog";
+                };
+        };
+};
+
+&bch {
+        status = "disabled";
+};
+
+&btif {
+        status = "okay";
+};
+
+&cir {
+        pinctrl-names = "default";
+        pinctrl-0 = <&irrx_pins>;
+        status = "okay";
+};
+
+&eth {
+        pinctrl-names = "default";
+        pinctrl-0 = <&eth_pins>;
+        status = "okay";
+
+        gmac1: mac@1 {
+                compatible = "mediatek,eth-mac";
+                reg = <1>;
+                phy-handle = <&phy5>;
+        };
+
+        mdio-bus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                phy5: ethernet-phy@5 {
+                        reg = <5>;
+                        phy-mode = "sgmii";
+                };
+        };
+};
+
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_pins>;
+        status = "okay";
+};
+
+&i2c2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c2_pins>;
+        status = "okay";
+};
+
+&mmc0 {
+        pinctrl-names = "default", "state_uhs";
+        pinctrl-0 = <&emmc_pins_default>;
+        pinctrl-1 = <&emmc_pins_uhs>;
+        status = "okay";
+        bus-width = <8>;
+        max-frequency = <50000000>;
+        cap-mmc-highspeed;
+        mmc-hs200-1_8v;
+        vmmc-supply = <&reg_3p3v>;
+        vqmmc-supply = <&reg_1p8v>;
+        assigned-clocks = <&topckgen CLK_TOP_MSDC30_0_SEL>;
+        assigned-clock-parents = <&topckgen CLK_TOP_UNIV48M>;
+        non-removable;
+};
+
+&mmc1 {
+        pinctrl-names = "default", "state_uhs";
+        pinctrl-0 = <&sd0_pins_default>;
+        pinctrl-1 = <&sd0_pins_uhs>;
+        status = "okay";
+        bus-width = <4>;
+        max-frequency = <50000000>;
+        cap-sd-highspeed;
+        r_smpl = <1>;
+        cd-gpios = <&pio 81 GPIO_ACTIVE_LOW>;
+        vmmc-supply = <&reg_3p3v>;
+        vqmmc-supply = <&reg_3p3v>;
+        assigned-clocks = <&topckgen CLK_TOP_MSDC30_1_SEL>;
+        assigned-clock-parents = <&topckgen CLK_TOP_UNIV48M>;
+};
+
+&nandc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&parallel_nand_pins>;
+        status = "disabled";
+};
+
+&nor_flash {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spi_nor_pins>;
+        status = "disabled";
+
+        flash@0 {
+                compatible = "jedec,spi-nor";
+                reg = <0>;
+        };
+};
+
+&pwm {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm7_pins>;
+        status = "okay";
+};
+
+&pwrap {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pmic_bus_pins>;
+
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+};
+
+&sata_phy {
+        status = "okay";
+};
+
+&spi0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spic0_pins>;
+        status = "okay";
+};
+
+&spi1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&spic1_pins>;
+        status = "okay";
+};
+
+&ssusb {
+        vusb33-supply = <&reg_3p3v>;
+        vbus-supply = <&reg_5v>;
+        status = "okay";
+};
+
+&u3phy {
+        status = "okay";
 };
 
 &uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_pins>;
+        status = "okay";
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart2_pins>;
+        status = "okay";
+};
+
+&watchdog {
+        pinctrl-names = "default";
+        pinctrl-0 = <&watchdog_pins>;
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
index b111fec2ed9d..e9d5130df8d1 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -8,6 +8,11 @@
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/mt7622-clk.h>
+#include <dt-bindings/phy/phy.h>
+#include <dt-bindings/power/mt7622-power.h>
+#include <dt-bindings/reset/mt7622-reset.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
         compatible = "mediatek,mt7622";
@@ -15,6 +20,50 @@
         #address-cells = <2>;
         #size-cells = <2>;
 
+        cpu_opp_table: opp-table {
+                compatible = "operating-points-v2";
+                opp-shared;
+                opp-300000000 {
+                        opp-hz = /bits/ 64 <30000000>;
+                        opp-microvolt = <950000>;
+                };
+
+                opp-437500000 {
+                        opp-hz = /bits/ 64 <437500000>;
+                        opp-microvolt = <1000000>;
+                };
+
+                opp-600000000 {
+                        opp-hz = /bits/ 64 <600000000>;
+                        opp-microvolt = <1050000>;
+                };
+
+                opp-812500000 {
+                        opp-hz = /bits/ 64 <812500000>;
+                        opp-microvolt = <1100000>;
+                };
+
+                opp-1025000000 {
+                        opp-hz = /bits/ 64 <1025000000>;
+                        opp-microvolt = <1150000>;
+                };
+
+                opp-1137500000 {
+                        opp-hz = /bits/ 64 <1137500000>;
+                        opp-microvolt = <1200000>;
+                };
+
+                opp-1262500000 {
+                        opp-hz = /bits/ 64 <1262500000>;
+                        opp-microvolt = <1250000>;
+                };
+
+                opp-1350000000 {
+                        opp-hz = /bits/ 64 <1350000000>;
+                        opp-microvolt = <1310000>;
+                };
+        };
+
         cpus {
                 #address-cells = <2>;
                 #size-cells = <0>;
@@ -23,6 +72,11 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a53", "arm,armv8";
                         reg = <0x0 0x0>;
+                        clocks = <&infracfg CLK_INFRA_MUX1_SEL>,
+                                 <&apmixedsys CLK_APMIXED_MAIN_CORE_EN>;
+                        clock-names = "cpu", "intermediate";
+                        operating-points-v2 = <&cpu_opp_table>;
+                        #cooling-cells = <2>;
                         enable-method = "psci";
                         clock-frequency = <1300000000>;
                 };
@@ -31,21 +85,26 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a53", "arm,armv8";
                         reg = <0x0 0x1>;
+                        clocks = <&infracfg CLK_INFRA_MUX1_SEL>,
+                                 <&apmixedsys CLK_APMIXED_MAIN_CORE_EN>;
+                        clock-names = "cpu", "intermediate";
+                        operating-points-v2 = <&cpu_opp_table>;
                         enable-method = "psci";
                         clock-frequency = <1300000000>;
                 };
         };
 
-        uart_clk: dummy25m {
+        pwrap_clk: dummy40m {
                 compatible = "fixed-clock";
+                clock-frequency = <40000000>;
                 #clock-cells = <0>;
-                clock-frequency = <25000000>;
         };
 
-        bus_clk: dummy280m {
+        clk25m: oscillator {
                 compatible = "fixed-clock";
                 #clock-cells = <0>;
-                clock-frequency = <280000000>;
+                clock-frequency = <25000000>;
+                clock-output-names = "clkxtal";
         };
 
         psci {
@@ -65,6 +124,58 @@
                 };
         };
 
+        thermal-zones {
+                cpu_thermal: cpu-thermal {
+                        polling-delay-passive = <1000>;
+                        polling-delay = <1000>;
+
+                        thermal-sensors = <&thermal 0>;
+
+                        trips {
+                                cpu_passive: cpu-passive {
+                                        temperature = <47000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+
+                                cpu_active: cpu-active {
+                                        temperature = <67000>;
+                                        hysteresis = <2000>;
+                                        type = "active";
+                                };
+
+                                cpu_hot: cpu-hot {
+                                        temperature = <87000>;
+                                        hysteresis = <2000>;
+                                        type = "hot";
+                                };
+
+                                cpu-crit {
+                                        temperature = <107000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_passive>;
+                                        cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                                };
+
+                                map1 {
+                                        trip = <&cpu_active>;
+                                        cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                                };
+
+                                map2 {
+                                        trip = <&cpu_hot>;
+                                        cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                                };
+                        };
+                };
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupt-parent = <&gic>;
@@ -78,6 +189,58 @@
                               IRQ_TYPE_LEVEL_HIGH)>;
         };
 
+        infracfg: infracfg@10000000 {
+                compatible = "mediatek,mt7622-infracfg",
+                             "syscon";
+                reg = <0 0x10000000 0 0x1000>;
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+        };
+
+        pwrap: pwrap@10001000 {
+                compatible = "mediatek,mt7622-pwrap";
+                reg = <0 0x10001000 0 0x250>;
+                reg-names = "pwrap";
+                clocks = <&infracfg CLK_INFRA_PMIC_PD>, <&pwrap_clk>;
+                clock-names = "spi", "wrap";
+                resets = <&infracfg MT7622_INFRA_PMIC_WRAP_RST>;
+                reset-names = "pwrap";
+                interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        pericfg: pericfg@10002000 {
+                compatible = "mediatek,mt7622-pericfg",
+                             "syscon";
+                reg = <0 0x10002000 0 0x1000>;
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+        };
+
+        scpsys: scpsys@10006000 {
+                compatible = "mediatek,mt7622-scpsys",
+                             "syscon";
+                #power-domain-cells = <1>;
+                reg = <0 0x10006000 0 0x1000>;
+                interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_SPI 166 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_SPI 167 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_SPI 168 IRQ_TYPE_LEVEL_LOW>;
+                infracfg = <&infracfg>;
+                clocks = <&topckgen CLK_TOP_HIF_SEL>;
+                clock-names = "hif_sel";
+        };
+
+        cir: cir@10009000 {
+                compatible = "mediatek,mt7622-cir";
+                reg = <0 0x10009000 0 0x1000>;
+                interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&infracfg CLK_INFRA_IRRX_PD>,
+                         <&topckgen CLK_TOP_AXI_SEL>;
+                clock-names = "clk", "bus";
+                status = "disabled";
+        };
+
         sysirq: interrupt-controller@10200620 {
                 compatible = "mediatek,mt7622-sysirq",
                              "mediatek,mt6577-sysirq";
@@ -87,6 +250,62 @@
                 reg = <0 0x10200620 0 0x20>;
         };
 
+        efuse: efuse@10206000 {
+                compatible = "mediatek,mt7622-efuse",
+                             "mediatek,efuse";
+                reg = <0 0x10206000 0 0x1000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                thermal_calibration: calib@198 {
+                        reg = <0x198 0xc>;
+                };
+        };
+
+        apmixedsys: apmixedsys@10209000 {
+                compatible = "mediatek,mt7622-apmixedsys",
+                             "syscon";
+                reg = <0 0x10209000 0 0x1000>;
+                #clock-cells = <1>;
+        };
+
+        topckgen: topckgen@10210000 {
+                compatible = "mediatek,mt7622-topckgen",
+                             "syscon";
+                reg = <0 0x10210000 0 0x1000>;
+                #clock-cells = <1>;
+        };
+
+        rng: rng@1020f000 {
+                compatible = "mediatek,mt7622-rng",
+                             "mediatek,mt7623-rng";
+                reg = <0 0x1020f000 0 0x1000>;
+                clocks = <&infracfg CLK_INFRA_TRNG>;
+                clock-names = "rng";
+        };
+
+        pio: pinctrl@10211000 {
+                compatible = "mediatek,mt7622-pinctrl";
+                reg = <0 0x10211000 0 0x1000>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        watchdog: watchdog@10212000 {
+                compatible = "mediatek,mt7622-wdt",
+                             "mediatek,mt6589-wdt";
+                reg = <0 0x10212000 0 0x800>;
+        };
+
+        rtc: rtc@10212800 {
+                compatible = "mediatek,mt7622-rtc",
+                             "mediatek,soc-rtc";
+                reg = <0 0x10212800 0 0x200>;
+                interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_RTC>;
+                clock-names = "rtc";
+        };
+
         gic: interrupt-controller@10300000 {
                 compatible = "arm,gic-400";
                 interrupt-controller;
@@ -98,13 +317,459 @@
                       <0 0x10360000 0 0x2000>;
         };
 
+        auxadc: adc@11001000 {
+                compatible = "mediatek,mt7622-auxadc";
+                reg = <0 0x11001000 0 0x1000>;
+                clocks = <&pericfg CLK_PERI_AUXADC_PD>;
+                clock-names = "main";
+                #io-channel-cells = <1>;
+        };
+
         uart0: serial@11002000 {
                 compatible = "mediatek,mt7622-uart",
                              "mediatek,mt6577-uart";
                 reg = <0 0x11002000 0 0x400>;
                 interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_LOW>;
-                clocks = <&uart_clk>, <&bus_clk>;
+                clocks = <&topckgen CLK_TOP_UART_SEL>,
+                         <&pericfg CLK_PERI_UART1_PD>;
+                clock-names = "baud", "bus";
+                status = "disabled";
+        };
+
+        uart1: serial@11003000 {
+                compatible = "mediatek,mt7622-uart",
+                             "mediatek,mt6577-uart";
+                reg = <0 0x11003000 0 0x400>;
+                interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_UART_SEL>,
+                         <&pericfg CLK_PERI_UART1_PD>;
+                clock-names = "baud", "bus";
+                status = "disabled";
+        };
+
+        uart2: serial@11004000 {
+                compatible = "mediatek,mt7622-uart",
+                             "mediatek,mt6577-uart";
+                reg = <0 0x11004000 0 0x400>;
+                interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_UART_SEL>,
+                         <&pericfg CLK_PERI_UART2_PD>;
+                clock-names = "baud", "bus";
+                status = "disabled";
+        };
+
+        uart3: serial@11005000 {
+                compatible = "mediatek,mt7622-uart",
+                             "mediatek,mt6577-uart";
+                reg = <0 0x11005000 0 0x400>;
+                interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_UART_SEL>,
+                         <&pericfg CLK_PERI_UART3_PD>;
+                clock-names = "baud", "bus";
+                status = "disabled";
+        };
+
+        pwm: pwm@11006000 {
+                compatible = "mediatek,mt7622-pwm";
+                reg = <0 0x11006000 0 0x1000>;
+                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_PWM_SEL>,
+                         <&pericfg CLK_PERI_PWM_PD>,
+                         <&pericfg CLK_PERI_PWM1_PD>,
+                         <&pericfg CLK_PERI_PWM2_PD>,
+                         <&pericfg CLK_PERI_PWM3_PD>,
+                         <&pericfg CLK_PERI_PWM4_PD>,
+                         <&pericfg CLK_PERI_PWM5_PD>,
+                         <&pericfg CLK_PERI_PWM6_PD>;
+                clock-names = "top", "main", "pwm1", "pwm2", "pwm3", "pwm4",
+                              "pwm5", "pwm6";
+                status = "disabled";
+        };
+
+        i2c0: i2c@11007000 {
+                compatible = "mediatek,mt7622-i2c";
+                reg = <0 0x11007000 0 0x90>,
+                      <0 0x11000100 0 0x80>;
+                interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_LOW>;
+                clock-div = <16>;
+                clocks = <&pericfg CLK_PERI_I2C0_PD>,
+                         <&pericfg CLK_PERI_AP_DMA_PD>;
+                clock-names = "main", "dma";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
+        i2c1: i2c@11008000 {
+                compatible = "mediatek,mt7622-i2c";
+                reg = <0 0x11008000 0 0x90>,
+                      <0 0x11000180 0 0x80>;
+                interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_LOW>;
+                clock-div = <16>;
+                clocks = <&pericfg CLK_PERI_I2C1_PD>,
+                         <&pericfg CLK_PERI_AP_DMA_PD>;
+                clock-names = "main", "dma";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
+        i2c2: i2c@11009000 {
+                compatible = "mediatek,mt7622-i2c";
+                reg = <0 0x11009000 0 0x90>,
+                      <0 0x11000200 0 0x80>;
+                interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>;
+                clock-div = <16>;
+                clocks = <&pericfg CLK_PERI_I2C2_PD>,
+                         <&pericfg CLK_PERI_AP_DMA_PD>;
+                clock-names = "main", "dma";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
+        spi0: spi@1100a000 {
+                compatible = "mediatek,mt7622-spi";
+                reg = <0 0x1100a000 0 0x100>;
+                interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_SYSPLL3_D2>,
+                         <&topckgen CLK_TOP_SPI0_SEL>,
+                         <&pericfg CLK_PERI_SPI0_PD>;
+                clock-names = "parent-clk", "sel-clk", "spi-clk";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
+        thermal: thermal@1100b000 {
+                #thermal-sensor-cells = <1>;
+                compatible = "mediatek,mt7622-thermal";
+                reg = <0 0x1100b000 0 0x1000>;
+                interrupts = <0 78 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&pericfg CLK_PERI_THERM_PD>,
+                         <&pericfg CLK_PERI_AUXADC_PD>;
+                clock-names = "therm", "auxadc";
+                resets = <&pericfg MT7622_PERI_THERM_SW_RST>;
+                reset-names = "therm";
+                mediatek,auxadc = <&auxadc>;
+                mediatek,apmixedsys = <&apmixedsys>;
+                nvmem-cells = <&thermal_calibration>;
+                nvmem-cell-names = "calibration-data";
+        };
+
+        btif: serial@1100c000 {
+                compatible = "mediatek,mt7622-btif",
+                             "mediatek,mtk-btif";
+                reg = <0 0x1100c000 0 0x1000>;
+                interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&pericfg CLK_PERI_BTIF_PD>;
+                clock-names = "main";
+                reg-shift = <2>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        nandc: nfi@1100d000 {
+                compatible = "mediatek,mt7622-nfc";
+                reg = <0 0x1100D000 0 0x1000>;
+                interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&pericfg CLK_PERI_NFI_PD>,
+                         <&pericfg CLK_PERI_SNFI_PD>;
+                clock-names = "nfi_clk", "pad_clk";
+                ecc-engine = <&bch>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
+        bch: ecc@1100e000 {
+                compatible = "mediatek,mt7622-ecc";
+                reg = <0 0x1100e000 0 0x1000>;
+                interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&pericfg CLK_PERI_NFIECC_PD>;
+                clock-names = "nfiecc_clk";
+                status = "disabled";
+        };
+
+        nor_flash: spi@11014000 {
+                compatible = "mediatek,mt7622-nor",
+                             "mediatek,mt8173-nor";
+                reg = <0 0x11014000 0 0xe0>;
+                clocks = <&pericfg CLK_PERI_FLASH_PD>,
+                         <&topckgen CLK_TOP_FLASH_SEL>;
+                clock-names = "spi", "sf";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
+        spi1: spi@11016000 {
+                compatible = "mediatek,mt7622-spi";
+                reg = <0 0x11016000 0 0x100>;
+                interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_SYSPLL3_D2>,
+                         <&topckgen CLK_TOP_SPI1_SEL>,
+                         <&pericfg CLK_PERI_SPI1_PD>;
+                clock-names = "parent-clk", "sel-clk", "spi-clk";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
+        uart4: serial@11019000 {
+                compatible = "mediatek,mt7622-uart",
+                             "mediatek,mt6577-uart";
+                reg = <0 0x11019000 0 0x400>;
+                interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_UART_SEL>,
+                         <&pericfg CLK_PERI_UART4_PD>;
                 clock-names = "baud", "bus";
                 status = "disabled";
         };
+
+        mmc0: mmc@11230000 {
+                compatible = "mediatek,mt7622-mmc";
+                reg = <0 0x11230000 0 0x1000>;
+                interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&pericfg CLK_PERI_MSDC30_0_PD>,
+                         <&topckgen CLK_TOP_MSDC50_0_SEL>;
+                clock-names = "source", "hclk";
+                status = "disabled";
+        };
+
+        mmc1: mmc@11240000 {
+                compatible = "mediatek,mt7622-mmc";
+                reg = <0 0x11240000 0 0x1000>;
+                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&pericfg CLK_PERI_MSDC30_1_PD>,
+                         <&topckgen CLK_TOP_AXI_SEL>;
+                clock-names = "source", "hclk";
+                status = "disabled";
+        };
+
+        ssusbsys: ssusbsys@1a000000 {
+                compatible = "mediatek,mt7622-ssusbsys",
+                             "syscon";
+                reg = <0 0x1a000000 0 0x1000>;
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+        };
+
+        ssusb: usb@1a0c0000 {
+                compatible = "mediatek,mt7622-xhci",
+                             "mediatek,mtk-xhci";
+                reg = <0 0x1a0c0000 0 0x01000>,
+                      <0 0x1a0c4700 0 0x0100>;
+                reg-names = "mac", "ippc";
+                interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_LOW>;
+                power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF1>;
+                clocks = <&ssusbsys CLK_SSUSB_SYS_EN>,
+                         <&ssusbsys CLK_SSUSB_REF_EN>,
+                         <&ssusbsys CLK_SSUSB_MCU_EN>,
+                         <&ssusbsys CLK_SSUSB_DMA_EN>;
+                clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck";
+                phys = <&u2port0 PHY_TYPE_USB2>,
+                       <&u3port0 PHY_TYPE_USB3>,
+                       <&u2port1 PHY_TYPE_USB2>;
+
+                status = "disabled";
+        };
+
+        u3phy: usb-phy@1a0c4000 {
+                compatible = "mediatek,mt7622-u3phy",
+                             "mediatek,generic-tphy-v1";
+                reg = <0 0x1a0c4000 0 0x700>;
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+                status = "disabled";
+
+                u2port0: usb-phy@1a0c4800 {
+                        reg = <0 0x1a0c4800 0 0x0100>;
+                        #phy-cells = <1>;
+                        clocks = <&ssusbsys CLK_SSUSB_U2_PHY_EN>;
+                        clock-names = "ref";
+                };
+
+                u3port0: usb-phy@1a0c4900 {
+                        reg = <0 0x1a0c4900 0 0x0700>;
+                        #phy-cells = <1>;
+                        clocks = <&clk25m>;
+                        clock-names = "ref";
+                };
+
+                u2port1: usb-phy@1a0c5000 {
+                        reg = <0 0x1a0c5000 0 0x0100>;
+                        #phy-cells = <1>;
+                        clocks = <&ssusbsys CLK_SSUSB_U2_PHY_1P_EN>;
+                        clock-names = "ref";
+                };
+        };
+
+        pciesys: pciesys@1a100800 {
+                compatible = "mediatek,mt7622-pciesys",
+                             "syscon";
+                reg = <0 0x1a100800 0 0x1000>;
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+        };
+
+        pcie: pcie@1a140000 {
+                compatible = "mediatek,mt7622-pcie";
+                device_type = "pci";
+                reg = <0 0x1a140000 0 0x1000>,
+                      <0 0x1a143000 0 0x1000>,
+                      <0 0x1a145000 0 0x1000>;
+                reg-names = "subsys", "port0", "port1";
+                #address-cells = <3>;
+                #size-cells = <2>;
+                interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&pciesys CLK_PCIE_P0_MAC_EN>,
+                         <&pciesys CLK_PCIE_P1_MAC_EN>,
+                         <&pciesys CLK_PCIE_P0_AHB_EN>,
+                         <&pciesys CLK_PCIE_P0_AHB_EN>,
+                         <&pciesys CLK_PCIE_P0_AUX_EN>,
+                         <&pciesys CLK_PCIE_P1_AUX_EN>,
+                         <&pciesys CLK_PCIE_P0_AXI_EN>,
+                         <&pciesys CLK_PCIE_P1_AXI_EN>,
+                         <&pciesys CLK_PCIE_P0_OBFF_EN>,
+                         <&pciesys CLK_PCIE_P1_OBFF_EN>,
+                         <&pciesys CLK_PCIE_P0_PIPE_EN>,
+                         <&pciesys CLK_PCIE_P1_PIPE_EN>;
+                clock-names = "sys_ck0", "sys_ck1", "ahb_ck0", "ahb_ck1",
+                              "aux_ck0", "aux_ck1", "axi_ck0", "axi_ck1",
+                              "obff_ck0", "obff_ck1", "pipe_ck0", "pipe_ck1";
+                power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>;
+                bus-range = <0x00 0xff>;
+                ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x10000000>;
+                status = "disabled";
+
+                pcie0: pcie@0,0 {
+                        reg = <0x0000 0 0 0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges;
+                        status = "disabled";
+
+                        num-lanes = <1>;
+                        interrupt-map-mask = <0 0 0 7>;
+                        interrupt-map = <0 0 0 1 &pcie_intc0 0>,
+                                        <0 0 0 2 &pcie_intc0 1>,
+                                        <0 0 0 3 &pcie_intc0 2>,
+                                        <0 0 0 4 &pcie_intc0 3>;
+                        pcie_intc0: interrupt-controller {
+                                interrupt-controller;
+                                #address-cells = <0>;
+                                #interrupt-cells = <1>;
+                        };
+                };
+
+                pcie1: pcie@1,0 {
+                        reg = <0x0800 0 0 0 0>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        ranges;
+                        status = "disabled";
+
+                        num-lanes = <1>;
+                        interrupt-map-mask = <0 0 0 7>;
+                        interrupt-map = <0 0 0 1 &pcie_intc1 0>,
+                                        <0 0 0 2 &pcie_intc1 1>,
+                                        <0 0 0 3 &pcie_intc1 2>,
+                                        <0 0 0 4 &pcie_intc1 3>;
+                        pcie_intc1: interrupt-controller {
+                                interrupt-controller;
+                                #address-cells = <0>;
+                                #interrupt-cells = <1>;
+                        };
+                };
+        };
+
+        sata: sata@1a200000 {
+                compatible = "mediatek,mt7622-ahci",
+                             "mediatek,mtk-ahci";
+                reg = <0 0x1a200000 0 0x1100>;
+                interrupts = <GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "hostc";
+                clocks = <&pciesys CLK_SATA_AHB_EN>,
+                         <&pciesys CLK_SATA_AXI_EN>,
+                         <&pciesys CLK_SATA_ASIC_EN>,
+                         <&pciesys CLK_SATA_RBC_EN>,
+                         <&pciesys CLK_SATA_PM_EN>;
+                clock-names = "ahb", "axi", "asic", "rbc", "pm";
+                phys = <&sata_port PHY_TYPE_SATA>;
+                phy-names = "sata-phy";
+                ports-implemented = <0x1>;
+                power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>;
+                resets = <&pciesys MT7622_SATA_AXI_BUS_RST>,
+                         <&pciesys MT7622_SATA_PHY_SW_RST>,
+                         <&pciesys MT7622_SATA_PHY_REG_RST>;
+                reset-names = "axi", "sw", "reg";
+                mediatek,phy-mode = <&pciesys>;
+                status = "disabled";
+        };
+
+        sata_phy: sata-phy@1a243000 {
+                compatible = "mediatek,generic-tphy-v1";
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+                status = "disabled";
+
+                sata_port: sata-phy@1a243000 {
+                        reg = <0 0x1a243000 0 0x0100>;
+                        clocks = <&topckgen CLK_TOP_ETH_500M>;
+                        clock-names = "ref";
+                        #phy-cells = <1>;
+                };
+        };
+
+        ethsys: syscon@1b000000 {
+                compatible = "mediatek,mt7622-ethsys",
+                             "syscon";
+                reg = <0 0x1b000000 0 0x1000>;
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+        };
+
+        eth: ethernet@1b100000 {
+                compatible = "mediatek,mt7622-eth",
+                             "mediatek,mt2701-eth",
+                             "syscon";
+                reg = <0 0x1b100000 0 0x20000>;
+                interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_SPI 224 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_SPI 225 IRQ_TYPE_LEVEL_LOW>;
+                clocks = <&topckgen CLK_TOP_ETH_SEL>,
+                         <&ethsys CLK_ETH_ESW_EN>,
+                         <&ethsys CLK_ETH_GP0_EN>,
+                         <&ethsys CLK_ETH_GP1_EN>,
+                         <&ethsys CLK_ETH_GP2_EN>,
+                         <&sgmiisys CLK_SGMII_TX250M_EN>,
+                         <&sgmiisys CLK_SGMII_RX250M_EN>,
+                         <&sgmiisys CLK_SGMII_CDR_REF>,
+                         <&sgmiisys CLK_SGMII_CDR_FB>,
+                         <&topckgen CLK_TOP_SGMIIPLL>,
+                         <&apmixedsys CLK_APMIXED_ETH2PLL>;
+                clock-names = "ethif", "esw", "gp0", "gp1", "gp2",
+                              "sgmii_tx250m", "sgmii_rx250m",
+                              "sgmii_cdr_ref", "sgmii_cdr_fb", "sgmii_ck",
+                              "eth2pll";
+                power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>;
+                mediatek,ethsys = <&ethsys>;
+                mediatek,sgmiisys = <&sgmiisys>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
+        sgmiisys: sgmiisys@1b128000 {
+                compatible = "mediatek,mt7622-sgmiisys",
+                             "syscon";
+                reg = <0 0x1b128000 0 0x1000>;
+                #clock-cells = <1>;
+        };
 };
diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile
index 676aa2f238d1..7c13d7df484e 100644
--- a/arch/arm64/boot/dts/nvidia/Makefile
+++ b/arch/arm64/boot/dts/nvidia/Makefile
@@ -5,3 +5,4 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb
 dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2571.dtb
 dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-smaug.dtb
 dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
+dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p2972-0000.dtb
diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
new file mode 100644
index 000000000000..ecb034177fc2
--- /dev/null
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
@@ -0,0 +1,248 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "tegra194.dtsi"
+
+#include <dt-bindings/mfd/max77620.h>
+
+/ {
+        model = "NVIDIA Tegra194 P2888 Processor Module";
+        compatible = "nvidia,p2888", "nvidia,tegra194";
+
+        aliases {
+                sdhci0 = "/cbb/sdhci@3460000";
+                sdhci1 = "/cbb/sdhci@3400000";
+                serial0 = &uartb;
+                i2c0 = "/bpmp/i2c";
+                i2c1 = "/cbb/i2c@3160000";
+                i2c2 = "/cbb/i2c@c240000";
+                i2c3 = "/cbb/i2c@3180000";
+                i2c4 = "/cbb/i2c@3190000";
+                i2c5 = "/cbb/i2c@31c0000";
+                i2c6 = "/cbb/i2c@c250000";
+                i2c7 = "/cbb/i2c@31e0000";
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8";
+                stdout-path = "serial0:115200n8";
+        };
+
+        cbb {
+                serial@3110000 {
+                        status = "okay";
+                };
+
+                /* SDMMC1 (SD/MMC) */
+                sdhci@3400000 {
+/*
+                        cd-gpios = <&gpio TEGRA194_MAIN_GPIO(A, 0) GPIO_ACTIVE_LOW>;
+*/
+                };
+
+                /* SDMMC4 (eMMC) */
+                sdhci@3460000 {
+                        status = "okay";
+                        bus-width = <8>;
+                        non-removable;
+
+                        vqmmc-supply = <&vdd_1v8ls>;
+                        vmmc-supply = <&vdd_emmc_3v3>;
+                };
+
+                pmc@c360000 {
+                        nvidia,invert-interrupt;
+                };
+        };
+
+        bpmp {
+                i2c {
+                        status = "okay";
+
+                        pmic: pmic@3c {
+                                compatible = "maxim,max20024";
+                                reg = <0x3c>;
+
+                                interrupts = <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>;
+                                #interrupt-cells = <2>;
+                                interrupt-controller;
+
+                                #gpio-cells = <2>;
+                                gpio-controller;
+
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&max20024_default>;
+
+                                max20024_default: pinmux {
+                                        gpio0 {
+                                                pins = "gpio0";
+                                                function = "gpio";
+                                        };
+
+                                        gpio1 {
+                                                pins = "gpio1";
+                                                function = "fps-out";
+                                                maxim,active-fps-source = <MAX77620_FPS_SRC_DEF>;
+                                        };
+
+                                        gpio2 {
+                                                pins = "gpio2";
+                                                function = "fps-out";
+                                                maxim,active-fps-source = <MAX77620_FPS_SRC_DEF>;
+                                        };
+
+                                        gpio3 {
+                                                pins = "gpio3";
+                                                function = "fps-out";
+                                                maxim,active-fps-source = <MAX77620_FPS_SRC_DEF>;
+                                        };
+
+                                        gpio4 {
+                                                pins = "gpio4";
+                                                function = "32k-out1";
+                                                drive-push-pull = <1>;
+                                        };
+
+                                        gpio6 {
+                                                pins = "gpio6";
+                                                function = "gpio";
+                                                drive-push-pull = <1>;
+                                        };
+
+                                        gpio7 {
+                                                pins = "gpio7";
+                                                function = "gpio";
+                                                drive-push-pull = <0>;
+                                        };
+                                };
+
+                                fps {
+                                        fps0 {
+                                                maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>;
+                                                maxim,shutdown-fps-time-period-us = <640>;
+                                        };
+
+                                        fps1 {
+                                                maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN1>;
+                                                maxim,shutdown-fps-time-period-us = <640>;
+                                                maxim,device-state-on-disabled-event = <MAX77620_FPS_INACTIVE_STATE_SLEEP>;
+                                        };
+
+                                        fps2 {
+                                                maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>;
+                                                maxim,shutdown-fps-time-period-us = <640>;
+                                        };
+                                };
+
+                                regulators {
+                                        in-sd0-supply = <&vdd_5v0_sys>;
+                                        in-sd1-supply = <&vdd_5v0_sys>;
+                                        in-sd2-supply = <&vdd_5v0_sys>;
+                                        in-sd3-supply = <&vdd_5v0_sys>;
+                                        in-sd4-supply = <&vdd_5v0_sys>;
+
+                                        in-ldo0-1-supply = <&vdd_5v0_sys>;
+                                        in-ldo2-supply = <&vdd_5v0_sys>;
+                                        in-ldo3-5-supply = <&vdd_5v0_sys>;
+                                        in-ldo4-6-supply = <&vdd_5v0_sys>;
+                                        in-ldo7-8-supply = <&vdd_1v8ls>;
+
+                                        sd0 {
+                                                regulator-name = "VDD_1V0";
+                                                regulator-min-microvolt = <1000000>;
+                                                regulator-max-microvolt = <1000000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        sd1 {
+                                                regulator-name = "VDD_1V8HS";
+                                                regulator-min-microvolt = <1800000>;
+                                                regulator-max-microvolt = <1800000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        vdd_1v8ls: sd2 {
+                                                regulator-name = "VDD_1V8LS";
+                                                regulator-min-microvolt = <1800000>;
+                                                regulator-max-microvolt = <1800000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        sd3 {
+                                                regulator-name = "VDD_1V8AO";
+                                                regulator-min-microvolt = <1800000>;
+                                                regulator-max-microvolt = <1800000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        sd4 {
+                                                regulator-name = "VDD_DDR_1V1";
+                                                regulator-min-microvolt = <1100000>;
+                                                regulator-max-microvolt = <1100000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        ldo0 {
+                                                regulator-name = "VDD_RTC";
+                                                regulator-min-microvolt = <800000>;
+                                                regulator-max-microvolt = <800000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        ldo2 {
+                                                regulator-name = "VDD_AO_3V3";
+                                                regulator-min-microvolt = <3300000>;
+                                                regulator-max-microvolt = <3300000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        vdd_emmc_3v3: ldo3 {
+                                                regulator-name = "VDD_EMMC_3V3";
+                                                regulator-min-microvolt = <3300000>;
+                                                regulator-max-microvolt = <3300000>;
+                                        };
+
+                                        ldo5 {
+                                                regulator-name = "VDD_USB_3V3";
+                                                regulator-min-microvolt = <3300000>;
+                                                regulator-max-microvolt = <3300000>;
+                                        };
+
+                                        ldo6 {
+                                                regulator-name = "VDD_SDIO_3V3";
+                                                regulator-min-microvolt = <3300000>;
+                                                regulator-max-microvolt = <3300000>;
+                                        };
+
+                                        ldo7 {
+                                                regulator-name = "VDD_CSI_1V2";
+                                                regulator-min-microvolt = <1200000>;
+                                                regulator-max-microvolt = <1200000>;
+                                        };
+                                };
+                        };
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                vdd_5v0_sys: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+
+                        regulator-name = "VIN_SYS_5V0";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
new file mode 100644
index 000000000000..9ff3c18280c4
--- /dev/null
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "tegra194-p2888.dtsi"
+
+/ {
+        model = "NVIDIA Tegra194 P2972-0000 Development Board";
+        compatible = "nvidia,p2972-0000", "nvidia,tegra194";
+
+        cbb {
+                /* SDMMC1 (SD/MMC) */
+                sdhci@3400000 {
+                        status = "okay";
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
new file mode 100644
index 000000000000..6322ef265c2f
--- /dev/null
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@ -0,0 +1,344 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <dt-bindings/clock/tegra194-clock.h>
+#include <dt-bindings/gpio/tegra194-gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/mailbox/tegra186-hsp.h>
+#include <dt-bindings/reset/tegra194-reset.h>
+
+/ {
+        compatible = "nvidia,tegra194";
+        interrupt-parent = <&gic>;
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        /* control backbone */
+        cbb {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0x0 0x0 0x0 0x40000000>;
+
+                uarta: serial@3100000 {
+                        compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart";
+                        reg = <0x03100000 0x40>;
+                        reg-shift = <2>;
+                        interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_UARTA>;
+                        clock-names = "serial";
+                        resets = <&bpmp TEGRA194_RESET_UARTA>;
+                        reset-names = "serial";
+                        status = "disabled";
+                };
+
+                uartb: serial@3110000 {
+                        compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart";
+                        reg = <0x03110000 0x40>;
+                        reg-shift = <2>;
+                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_UARTB>;
+                        clock-names = "serial";
+                        resets = <&bpmp TEGRA194_RESET_UARTB>;
+                        reset-names = "serial";
+                        status = "disabled";
+                };
+
+                uartd: serial@3130000 {
+                        compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart";
+                        reg = <0x03130000 0x40>;
+                        reg-shift = <2>;
+                        interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_UARTD>;
+                        clock-names = "serial";
+                        resets = <&bpmp TEGRA194_RESET_UARTD>;
+                        reset-names = "serial";
+                        status = "disabled";
+                };
+
+                uarte: serial@3140000 {
+                        compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart";
+                        reg = <0x03140000 0x40>;
+                        reg-shift = <2>;
+                        interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_UARTE>;
+                        clock-names = "serial";
+                        resets = <&bpmp TEGRA194_RESET_UARTE>;
+                        reset-names = "serial";
+                        status = "disabled";
+                };
+
+                uartf: serial@3150000 {
+                        compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart";
+                        reg = <0x03150000 0x40>;
+                        reg-shift = <2>;
+                        interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_UARTF>;
+                        clock-names = "serial";
+                        resets = <&bpmp TEGRA194_RESET_UARTF>;
+                        reset-names = "serial";
+                        status = "disabled";
+                };
+
+                gen1_i2c: i2c@3160000 {
+                        compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c";
+                        reg = <0x03160000 0x10000>;
+                        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&bpmp TEGRA194_CLK_I2C1>;
+                        clock-names = "div-clk";
+                        resets = <&bpmp TEGRA194_RESET_I2C1>;
+                        reset-names = "i2c";
+                        status = "disabled";
+                };
+
+                uarth: serial@3170000 {
+                        compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart";
+                        reg = <0x03170000 0x40>;
+                        reg-shift = <2>;
+                        interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_UARTH>;
+                        clock-names = "serial";
+                        resets = <&bpmp TEGRA194_RESET_UARTH>;
+                        reset-names = "serial";
+                        status = "disabled";
+                };
+
+                cam_i2c: i2c@3180000 {
+                        compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c";
+                        reg = <0x03180000 0x10000>;
+                        interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&bpmp TEGRA194_CLK_I2C3>;
+                        clock-names = "div-clk";
+                        resets = <&bpmp TEGRA194_RESET_I2C3>;
+                        reset-names = "i2c";
+                        status = "disabled";
+                };
+
+                /* shares pads with dpaux1 */
+                dp_aux_ch1_i2c: i2c@3190000 {
+                        compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c";
+                        reg = <0x03190000 0x10000>;
+                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&bpmp TEGRA194_CLK_I2C4>;
+                        clock-names = "div-clk";
+                        resets = <&bpmp TEGRA194_RESET_I2C4>;
+                        reset-names = "i2c";
+                        status = "disabled";
+                };
+
+                /* shares pads with dpaux0 */
+                dp_aux_ch0_i2c: i2c@31b0000 {
+                        compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c";
+                        reg = <0x031b0000 0x10000>;
+                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&bpmp TEGRA194_CLK_I2C6>;
+                        clock-names = "div-clk";
+                        resets = <&bpmp TEGRA194_RESET_I2C6>;
+                        reset-names = "i2c";
+                        status = "disabled";
+                };
+
+                gen7_i2c: i2c@31c0000 {
+                        compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c";
+                        reg = <0x031c0000 0x10000>;
+                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&bpmp TEGRA194_CLK_I2C7>;
+                        clock-names = "div-clk";
+                        resets = <&bpmp TEGRA194_RESET_I2C7>;
+                        reset-names = "i2c";
+                        status = "disabled";
+                };
+
+                gen9_i2c: i2c@31e0000 {
+                        compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c";
+                        reg = <0x031e0000 0x10000>;
+                        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&bpmp TEGRA194_CLK_I2C9>;
+                        clock-names = "div-clk";
+                        resets = <&bpmp TEGRA194_RESET_I2C9>;
+                        reset-names = "i2c";
+                        status = "disabled";
+                };
+
+                sdmmc1: sdhci@3400000 {
+                        compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
+                        reg = <0x03400000 0x10000>;
+                        interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_SDMMC1>;
+                        clock-names = "sdhci";
+                        resets = <&bpmp TEGRA194_RESET_SDMMC1>;
+                        reset-names = "sdhci";
+                        status = "disabled";
+                };
+
+                sdmmc3: sdhci@3440000 {
+                        compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
+                        reg = <0x03440000 0x10000>;
+                        interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_SDMMC3>;
+                        clock-names = "sdhci";
+                        resets = <&bpmp TEGRA194_RESET_SDMMC3>;
+                        reset-names = "sdhci";
+                        status = "disabled";
+                };
+
+                sdmmc4: sdhci@3460000 {
+                        compatible = "nvidia,tegra194-sdhci", "nvidia,tegra186-sdhci";
+                        reg = <0x03460000 0x10000>;
+                        interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_SDMMC4>;
+                        clock-names = "sdhci";
+                        resets = <&bpmp TEGRA194_RESET_SDMMC4>;
+                        reset-names = "sdhci";
+                        status = "disabled";
+                };
+
+                gic: interrupt-controller@3881000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        interrupt-controller;
+                        reg = <0x03881000 0x1000>,
+                              <0x03882000 0x2000>,
+                              <0x03884000 0x2000>,
+                              <0x03886000 0x2000>;
+                        interrupts = <GIC_PPI 9
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+                        interrupt-parent = <&gic>;
+                };
+
+                hsp_top0: hsp@3c00000 {
+                        compatible = "nvidia,tegra186-hsp";
+                        reg = <0x03c00000 0xa0000>;
+                        interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "doorbell";
+                        #mbox-cells = <2>;
+                };
+
+                gen2_i2c: i2c@c240000 {
+                        compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c";
+                        reg = <0x0c240000 0x10000>;
+                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&bpmp TEGRA194_CLK_I2C2>;
+                        clock-names = "div-clk";
+                        resets = <&bpmp TEGRA194_RESET_I2C2>;
+                        reset-names = "i2c";
+                        status = "disabled";
+                };
+
+                gen8_i2c: i2c@c250000 {
+                        compatible = "nvidia,tegra194-i2c", "nvidia,tegra114-i2c";
+                        reg = <0x0c250000 0x10000>;
+                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        clocks = <&bpmp TEGRA194_CLK_I2C8>;
+                        clock-names = "div-clk";
+                        resets = <&bpmp TEGRA194_RESET_I2C8>;
+                        reset-names = "i2c";
+                        status = "disabled";
+                };
+
+                uartc: serial@c280000 {
+                        compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart";
+                        reg = <0x0c280000 0x40>;
+                        reg-shift = <2>;
+                        interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_UARTC>;
+                        clock-names = "serial";
+                        resets = <&bpmp TEGRA194_RESET_UARTC>;
+                        reset-names = "serial";
+                        status = "disabled";
+                };
+
+                uartg: serial@c290000 {
+                        compatible = "nvidia,tegra194-uart", "nvidia,tegra20-uart";
+                        reg = <0x0c290000 0x40>;
+                        reg-shift = <2>;
+                        interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&bpmp TEGRA194_CLK_UARTG>;
+                        clock-names = "serial";
+                        resets = <&bpmp TEGRA194_RESET_UARTG>;
+                        reset-names = "serial";
+                        status = "disabled";
+                };
+
+                pmc@c360000 {
+                        compatible = "nvidia,tegra194-pmc";
+                        reg = <0x0c360000 0x10000>,
+                              <0x0c370000 0x10000>,
+                              <0x0c380000 0x10000>,
+                              <0x0c390000 0x10000>,
+                              <0x0c3a0000 0x10000>;
+                        reg-names = "pmc", "wake", "aotag", "scratch", "misc";
+                };
+        };
+
+        sysram@40000000 {
+                compatible = "nvidia,tegra194-sysram", "mmio-sram";
+                reg = <0x0 0x40000000 0x0 0x50000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0x0 0x0 0x40000000 0x50000>;
+
+                cpu_bpmp_tx: shmem@4e000 {
+                        compatible = "nvidia,tegra194-bpmp-shmem";
+                        reg = <0x4e000 0x1000>;
+                        label = "cpu-bpmp-tx";
+                        pool;
+                };
+
+                cpu_bpmp_rx: shmem@4f000 {
+                        compatible = "nvidia,tegra194-bpmp-shmem";
+                        reg = <0x4f000 0x1000>;
+                        label = "cpu-bpmp-rx";
+                        pool;
+                };
+        };
+
+        bpmp: bpmp {
+                compatible = "nvidia,tegra186-bpmp";
+                mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB
+                                    TEGRA_HSP_DB_MASTER_BPMP>;
+                shmem = <&cpu_bpmp_tx &cpu_bpmp_rx>;
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+                #power-domain-cells = <1>;
+
+                bpmp_i2c: i2c {
+                        compatible = "nvidia,tegra186-bpmp-i2c";
+                        nvidia,bpmp-bus-id = <5>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                bpmp_thermal: thermal {
+                        compatible = "nvidia,tegra186-bpmp-thermal";
+                        #thermal-sensor-cells = <1>;
+                };
+        };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                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)>;
+                interrupt-parent = <&gic>;
+        };
+};
diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
index d67ef4319f3b..9d5a0e6b2ca4 100644
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
@@ -1325,6 +1325,11 @@
                 status = "okay";
         };
 
+        sata@70020000 {
+                status = "okay";
+                phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
+        };
+
         padctl@7009f000 {
                 status = "okay";
 
diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
index 9c2402108772..3be920efee82 100644
--- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
@@ -798,6 +798,22 @@
                 #iommu-cells = <1>;
         };
 
+        sata@70020000 {
+                compatible = "nvidia,tegra210-ahci";
+                reg = <0x0 0x70027000 0x0 0x2000>, /* AHCI */
+                      <0x0 0x70020000 0x0 0x7000>, /* SATA */
+                      <0x0 0x70001100 0x0 0x1000>; /* SATA AUX */
+                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&tegra_car TEGRA210_CLK_SATA>,
+                         <&tegra_car TEGRA210_CLK_SATA_OOB>;
+                clock-names = "sata", "sata-oob";
+                resets = <&tegra_car 124>,
+                         <&tegra_car 123>,
+                         <&tegra_car 129>;
+                reset-names = "sata", "sata-oob", "sata-cold";
+                status = "disabled";
+        };
+
         hda@70030000 {
                 compatible = "nvidia,tegra210-hda", "nvidia,tegra30-hda";
                 reg = <0x0 0x70030000 0x0 0x10000>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index e51b04900726..66b318e1de80 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -15,6 +15,7 @@
 #include <dt-bindings/clock/qcom,gcc-msm8916.h>
 #include <dt-bindings/reset/qcom,gcc-msm8916.h>
 #include <dt-bindings/clock/qcom,rpmcc.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
         model = "Qualcomm Technologies, Inc. MSM8916";
@@ -113,6 +114,9 @@
                         next-level-cache = <&L2_0>;
                         enable-method = "psci";
                         cpu-idle-states = <&CPU_SPC>;
+                        clocks = <&apcs 0>;
+                        operating-points-v2 = <&cpu_opp_table>;
+                        #cooling-cells = <2>;
                 };
 
                 CPU1: cpu@1 {
@@ -122,6 +126,9 @@
                         next-level-cache = <&L2_0>;
                         enable-method = "psci";
                         cpu-idle-states = <&CPU_SPC>;
+                        clocks = <&apcs 0>;
+                        operating-points-v2 = <&cpu_opp_table>;
+                        #cooling-cells = <2>;
                 };
 
                 CPU2: cpu@2 {
@@ -131,6 +138,9 @@
                         next-level-cache = <&L2_0>;
                         enable-method = "psci";
                         cpu-idle-states = <&CPU_SPC>;
+                        clocks = <&apcs 0>;
+                        operating-points-v2 = <&cpu_opp_table>;
+                        #cooling-cells = <2>;
                 };
 
                 CPU3: cpu@3 {
@@ -140,6 +150,9 @@
                         next-level-cache = <&L2_0>;
                         enable-method = "psci";
                         cpu-idle-states = <&CPU_SPC>;
+                        clocks = <&apcs 0>;
+                        operating-points-v2 = <&cpu_opp_table>;
+                        #cooling-cells = <2>;
                 };
 
                 L2_0: l2-cache {
@@ -188,6 +201,13 @@
                                         type = "critical";
                                 };
                         };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert0>;
+                                        cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                                };
+                        };
                 };
 
                 cpu-thermal1 {
@@ -208,10 +228,35 @@
                                         type = "critical";
                                 };
                         };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&cpu_alert1>;
+                                        cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                                };
+                        };
                 };
 
         };
 
+        cpu_opp_table: cpu_opp_table {
+                compatible = "operating-points-v2";
+                opp-shared;
+
+                opp-200000000 {
+                        opp-hz = /bits/ 64 <200000000>;
+                };
+                opp-400000000 {
+                        opp-hz = /bits/ 64 <400000000>;
+                };
+                opp-800000000 {
+                        opp-hz = /bits/ 64 <800000000>;
+                };
+                opp-998400000 {
+                        opp-hz = /bits/ 64 <998400000>;
+                };
+        };
+
         gpu_opp_table: opp_table {
                 compatible = "operating-points-v2";
 
@@ -326,9 +371,18 @@
                         status = "disabled";
                 };
 
-                apcs: syscon@b011000 {
-                        compatible = "syscon";
-                        reg = <0x0b011000 0x1000>;
+                a53pll: clock@b016000 {
+                        compatible = "qcom,msm8916-a53pll";
+                        reg = <0xb016000 0x40>;
+                        #clock-cells = <0>;
+                };
+
+                apcs: mailbox@b011000 {
+                        compatible = "qcom,msm8916-apcs-kpss-global", "syscon";
+                        reg = <0xb011000 0x1000>;
+                        #mbox-cells = <1>;
+                        clocks = <&a53pll>;
+                        #clock-cells = <0>;
                 };
 
                 blsp1_uart2: serial@78b0000 {
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 0a6f7952bbb1..410ae787ebb4 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -75,6 +75,17 @@
                         reg = <0x0 0x86200000 0x0 0x2600000>;
                         no-map;
                 };
+
+                rmtfs@86700000 {
+                        compatible = "qcom,rmtfs-mem";
+
+                        size = <0x0 0x200000>;
+                        alloc-ranges = <0x0 0xa0000000 0x0 0x2000000>;
+                        no-map;
+
+                        qcom,client-id = <1>;
+                        qcom,vmid = <15>;
+                };
         };
 
         cpus {
@@ -232,10 +243,10 @@
 
         timer {
                 compatible = "arm,armv8-timer";
-                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)>;
+                interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
+                             <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
         };
 
         clocks {
@@ -497,8 +508,8 @@
                 blsp2_spi5: spi@75ba000{
                         compatible = "qcom,spi-qup-v2.2.1";
                         reg = <0x075ba000 0x600>;
-                        interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&gcc GCC_BLSP2_QUP5_SPI_APPS_CLK>,
+                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&gcc GCC_BLSP2_QUP6_SPI_APPS_CLK>,
                                  <&gcc GCC_BLSP2_AHB_CLK>;
                         clock-names = "core", "iface";
                         pinctrl-names = "default", "sleep";
diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index 2186d0193b73..5ede06000ea4 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -7,5 +7,7 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-h3ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb
 dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb
+dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb
+dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb
 dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index 26769a11a190..f9acd125d687 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -23,6 +23,7 @@
 
         /delete-node/ mmu@febe0000;
         /delete-node/ mmu@fe980000;
+        /delete-node/ mmu@fd950000;
         /delete-node/ mmu@fd960000;
         /delete-node/ mmu@fd970000;
 
@@ -80,7 +81,7 @@
 
         vspd3: vsp@fea38000 {
                 compatible = "renesas,vsp2";
-                reg = <0 0xfea38000 0 0x4000>;
+                reg = <0 0xfea38000 0 0x8000>;
                 interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&cpg CPG_MOD 620>;
                 power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index d12df6f2ff09..1d5e3ac0231c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -41,6 +41,9 @@
                         power-domains = <&sysc R8A7795_PD_CA57_CPU0>;
                         next-level-cache = <&L2_CA57>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7795_CLK_Z>;
+                        operating-points-v2 = <&cluster0_opp>;
+                        #cooling-cells = <2>;
                 };
 
                 a57_1: cpu@1 {
@@ -50,6 +53,9 @@
                         power-domains = <&sysc R8A7795_PD_CA57_CPU1>;
                         next-level-cache = <&L2_CA57>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7795_CLK_Z>;
+                        operating-points-v2 = <&cluster0_opp>;
+                        #cooling-cells = <2>;
                 };
 
                 a57_2: cpu@2 {
@@ -59,6 +65,9 @@
                         power-domains = <&sysc R8A7795_PD_CA57_CPU2>;
                         next-level-cache = <&L2_CA57>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7795_CLK_Z>;
+                        operating-points-v2 = <&cluster0_opp>;
+                        #cooling-cells = <2>;
                 };
 
                 a57_3: cpu@3 {
@@ -68,6 +77,9 @@
                         power-domains = <&sysc R8A7795_PD_CA57_CPU3>;
                         next-level-cache = <&L2_CA57>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7795_CLK_Z>;
+                        operating-points-v2 = <&cluster0_opp>;
+                        #cooling-cells = <2>;
                 };
 
                 a53_0: cpu@100 {
@@ -77,6 +89,8 @@
                         power-domains = <&sysc R8A7795_PD_CA53_CPU0>;
                         next-level-cache = <&L2_CA53>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7795_CLK_Z2>;
+                        operating-points-v2 = <&cluster1_opp>;
                 };
 
                 a53_1: cpu@101 {
@@ -86,6 +100,8 @@
                         power-domains = <&sysc R8A7795_PD_CA53_CPU1>;
                         next-level-cache = <&L2_CA53>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7795_CLK_Z2>;
+                        operating-points-v2 = <&cluster1_opp>;
                 };
 
                 a53_2: cpu@102 {
@@ -95,6 +111,8 @@
                         power-domains = <&sysc R8A7795_PD_CA53_CPU2>;
                         next-level-cache = <&L2_CA53>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7795_CLK_Z2>;
+                        operating-points-v2 = <&cluster1_opp>;
                 };
 
                 a53_3: cpu@103 {
@@ -104,6 +122,8 @@
                         power-domains = <&sysc R8A7795_PD_CA53_CPU3>;
                         next-level-cache = <&L2_CA53>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7795_CLK_Z2>;
+                        operating-points-v2 = <&cluster1_opp>;
                 };
 
                 L2_CA57: cache-controller-0 {
@@ -165,11 +185,59 @@
                 clock-frequency = <0>;
         };
 
-        /* External SCIF clock - to be overridden by boards that provide it */
-        scif_clk: scif {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
+        cluster0_opp: opp_table0 {
+                compatible = "operating-points-v2";
+                opp-shared;
+
+                opp-500000000 {
+                        opp-hz = /bits/ 64 <500000000>;
+                        opp-microvolt = <830000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1000000000 {
+                        opp-hz = /bits/ 64 <1000000000>;
+                        opp-microvolt = <830000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1500000000 {
+                        opp-hz = /bits/ 64 <1500000000>;
+                        opp-microvolt = <830000>;
+                        clock-latency-ns = <300000>;
+                        opp-suspend;
+                };
+                opp-1600000000 {
+                        opp-hz = /bits/ 64 <1600000000>;
+                        opp-microvolt = <900000>;
+                        clock-latency-ns = <300000>;
+                        turbo-mode;
+                };
+                opp-1700000000 {
+                        opp-hz = /bits/ 64 <1700000000>;
+                        opp-microvolt = <960000>;
+                        clock-latency-ns = <300000>;
+                        turbo-mode;
+                };
+        };
+
+        cluster1_opp: opp_table1 {
+                compatible = "operating-points-v2";
+                opp-shared;
+
+                opp-800000000 {
+                        opp-hz = /bits/ 64 <800000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1000000000 {
+                        opp-hz = /bits/ 64 <1000000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1200000000 {
+                        opp-hz = /bits/ 64 <1200000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
         };
 
         /* External PCIe clock - can be overridden by the board */
@@ -208,6 +276,13 @@
                 method = "smc";
         };
 
+        /* External SCIF clock - to be overridden by boards that provide it */
+        scif_clk: scif {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
         soc: soc {
                 compatible = "simple-bus";
                 interrupt-parent = <&gic>;
@@ -470,6 +545,15 @@
                         status = "disabled";
                 };
 
+                ipmmu_pv1: mmu@fd950000 {
+                        compatible = "renesas,ipmmu-r8a7795";
+                        reg = <0 0xfd950000 0 0x1000>;
+                        renesas,ipmmu-main = <&ipmmu_mm 7>;
+                        power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+                        #iommu-cells = <1>;
+                        status = "disabled";
+                };
+
                 ipmmu_pv2: mmu@fd960000 {
                         compatible = "renesas,ipmmu-r8a7795";
                         reg = <0 0xfd960000 0 0x1000>;
@@ -798,7 +882,7 @@
                         clocks = <&cpg CPG_MOD 812>;
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 812>;
-                        phy-mode = "rgmii-txid";
+                        phy-mode = "rgmii";
                         iommus = <&ipmmu_ds0 16>;
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -992,8 +1076,9 @@
                                  <&cpg CPG_CORE R8A7795_CLK_S3D1>,
                                  <&scif_clk>;
                         clock-names = "fck", "brg_int", "scif_clk";
-                        dmas = <&dmac1 0x31>, <&dmac1 0x30>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x31>, <&dmac1 0x30>,
+                               <&dmac2 0x31>, <&dmac2 0x30>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 520>;
                         status = "disabled";
@@ -1009,8 +1094,9 @@
                                  <&cpg CPG_CORE R8A7795_CLK_S3D1>,
                                  <&scif_clk>;
                         clock-names = "fck", "brg_int", "scif_clk";
-                        dmas = <&dmac1 0x33>, <&dmac1 0x32>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x33>, <&dmac1 0x32>,
+                               <&dmac2 0x33>, <&dmac2 0x32>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 519>;
                         status = "disabled";
@@ -1026,8 +1112,9 @@
                                  <&cpg CPG_CORE R8A7795_CLK_S3D1>,
                                  <&scif_clk>;
                         clock-names = "fck", "brg_int", "scif_clk";
-                        dmas = <&dmac1 0x35>, <&dmac1 0x34>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x35>, <&dmac1 0x34>,
+                               <&dmac2 0x35>, <&dmac2 0x34>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 518>;
                         status = "disabled";
@@ -1138,8 +1225,9 @@
                                  <&cpg CPG_CORE R8A7795_CLK_S3D1>,
                                  <&scif_clk>;
                         clock-names = "fck", "brg_int", "scif_clk";
-                        dmas = <&dmac1 0x51>, <&dmac1 0x50>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x51>, <&dmac1 0x50>,
+                               <&dmac2 0x51>, <&dmac2 0x50>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 207>;
                         status = "disabled";
@@ -1154,8 +1242,9 @@
                                  <&cpg CPG_CORE R8A7795_CLK_S3D1>,
                                  <&scif_clk>;
                         clock-names = "fck", "brg_int", "scif_clk";
-                        dmas = <&dmac1 0x53>, <&dmac1 0x52>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x53>, <&dmac1 0x52>,
+                               <&dmac2 0x53>, <&dmac2 0x52>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 206>;
                         status = "disabled";
@@ -1170,8 +1259,9 @@
                                  <&cpg CPG_CORE R8A7795_CLK_S3D1>,
                                  <&scif_clk>;
                         clock-names = "fck", "brg_int", "scif_clk";
-                        dmas = <&dmac1 0x13>, <&dmac1 0x12>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x13>, <&dmac1 0x12>,
+                               <&dmac2 0x13>, <&dmac2 0x12>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 310>;
                         status = "disabled";
@@ -1218,8 +1308,9 @@
                                  <&cpg CPG_CORE R8A7795_CLK_S3D1>,
                                  <&scif_clk>;
                         clock-names = "fck", "brg_int", "scif_clk";
-                        dmas = <&dmac1 0x5b>, <&dmac1 0x5a>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x5b>, <&dmac1 0x5a>,
+                               <&dmac2 0x5b>, <&dmac2 0x5a>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 202>;
                         status = "disabled";
@@ -1251,8 +1342,9 @@
                         clocks = <&cpg CPG_MOD 931>;
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 931>;
-                        dmas = <&dmac1 0x91>, <&dmac1 0x90>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x91>, <&dmac1 0x90>,
+                               <&dmac2 0x91>, <&dmac2 0x90>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         i2c-scl-internal-delay-ns = <110>;
                         status = "disabled";
                 };
@@ -1267,8 +1359,9 @@
                         clocks = <&cpg CPG_MOD 930>;
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 930>;
-                        dmas = <&dmac1 0x93>, <&dmac1 0x92>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x93>, <&dmac1 0x92>,
+                               <&dmac2 0x93>, <&dmac2 0x92>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         i2c-scl-internal-delay-ns = <6>;
                         status = "disabled";
                 };
@@ -1283,8 +1376,9 @@
                         clocks = <&cpg CPG_MOD 929>;
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
                         resets = <&cpg 929>;
-                        dmas = <&dmac1 0x95>, <&dmac1 0x94>;
-                        dma-names = "tx", "rx";
+                        dmas = <&dmac1 0x95>, <&dmac1 0x94>,
+                               <&dmac2 0x95>, <&dmac2 0x94>;
+                        dma-names = "tx", "rx", "tx", "rx";
                         i2c-scl-internal-delay-ns = <6>;
                         status = "disabled";
                 };
@@ -2143,7 +2237,7 @@
 
                 vspd0: vsp@fea20000 {
                         compatible = "renesas,vsp2";
-                        reg = <0 0xfea20000 0 0x4000>;
+                        reg = <0 0xfea20000 0 0x8000>;
                         interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&cpg CPG_MOD 623>;
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
@@ -2163,7 +2257,7 @@
 
                 vspd1: vsp@fea28000 {
                         compatible = "renesas,vsp2";
-                        reg = <0 0xfea28000 0 0x4000>;
+                        reg = <0 0xfea28000 0 0x8000>;
                         interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&cpg CPG_MOD 622>;
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
@@ -2183,7 +2277,7 @@
 
                 vspd2: vsp@fea30000 {
                         compatible = "renesas,vsp2";
-                        reg = <0 0xfea30000 0 0x4000>;
+                        reg = <0 0xfea30000 0 0x8000>;
                         interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&cpg CPG_MOD 621>;
                         power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
@@ -2320,9 +2414,9 @@
 
                 tsc: thermal@e6198000 {
                         compatible = "renesas,r8a7795-thermal";
-                        reg = <0 0xe6198000 0 0x68>,
-                              <0 0xe61a0000 0 0x5c>,
-                              <0 0xe61a8000 0 0x5c>;
+                        reg = <0 0xe6198000 0 0x100>,
+                              <0 0xe61a0000 0 0x100>,
+                              <0 0xe61a8000 0 0x100>;
                         interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
@@ -2357,12 +2451,24 @@
                         thermal-sensors = <&tsc 0>;
 
                         trips {
+                                sensor1_passive: sensor1-passive {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
                                 sensor1_crit: sensor1-crit {
                                         temperature = <120000>;
                                         hysteresis = <2000>;
                                         type = "critical";
                                 };
                         };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&sensor1_passive>;
+                                        cooling-device = <&a57_0 4 4>;
+                                };
+                        };
                 };
 
                 sensor_thermal2: sensor-thermal2 {
@@ -2371,12 +2477,24 @@
                         thermal-sensors = <&tsc 1>;
 
                         trips {
+                                sensor2_passive: sensor2-passive {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
                                 sensor2_crit: sensor2-crit {
                                         temperature = <120000>;
                                         hysteresis = <2000>;
                                         type = "critical";
                                 };
                         };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&sensor2_passive>;
+                                        cooling-device = <&a57_0 4 4>;
+                                };
+                        };
                 };
 
                 sensor_thermal3: sensor-thermal3 {
@@ -2385,12 +2503,24 @@
                         thermal-sensors = <&tsc 2>;
 
                         trips {
+                                sensor3_passive: sensor3-passive {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
                                 sensor3_crit: sensor3-crit {
                                         temperature = <120000>;
                                         hysteresis = <2000>;
                                         type = "critical";
                                 };
                         };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&sensor3_passive>;
+                                        cooling-device = <&a57_0 4 4>;
+                                };
+                        };
                 };
         };
 
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index c5192d513d7d..556eb8e45499 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -71,6 +71,9 @@
                         power-domains = <&sysc R8A7796_PD_CA57_CPU0>;
                         next-level-cache = <&L2_CA57>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7796_CLK_Z>;
+                        operating-points-v2 = <&cluster0_opp>;
+                        #cooling-cells = <2>;
                 };
 
                 a57_1: cpu@1 {
@@ -80,6 +83,9 @@
                         power-domains = <&sysc R8A7796_PD_CA57_CPU1>;
                         next-level-cache = <&L2_CA57>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7796_CLK_Z>;
+                        operating-points-v2 = <&cluster0_opp>;
+                        #cooling-cells = <2>;
                 };
 
                 a53_0: cpu@100 {
@@ -89,6 +95,8 @@
                         power-domains = <&sysc R8A7796_PD_CA53_CPU0>;
                         next-level-cache = <&L2_CA53>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7796_CLK_Z2>;
+                        operating-points-v2 = <&cluster1_opp>;
                 };
 
                 a53_1: cpu@101 {
@@ -98,6 +106,8 @@
                         power-domains = <&sysc R8A7796_PD_CA53_CPU1>;
                         next-level-cache = <&L2_CA53>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7796_CLK_Z2>;
+                        operating-points-v2 = <&cluster1_opp>;
                 };
 
                 a53_2: cpu@102 {
@@ -107,6 +117,8 @@
                         power-domains = <&sysc R8A7796_PD_CA53_CPU2>;
                         next-level-cache = <&L2_CA53>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7796_CLK_Z2>;
+                        operating-points-v2 = <&cluster1_opp>;
                 };
 
                 a53_3: cpu@103 {
@@ -116,6 +128,8 @@
                         power-domains = <&sysc R8A7796_PD_CA53_CPU3>;
                         next-level-cache = <&L2_CA53>;
                         enable-method = "psci";
+                        clocks =<&cpg CPG_CORE R8A7796_CLK_Z2>;
+                        operating-points-v2 = <&cluster1_opp>;
                 };
 
                 L2_CA57: cache-controller-0 {
@@ -147,6 +161,72 @@
                 clock-frequency = <0>;
         };
 
+        cluster0_opp: opp_table0 {
+                compatible = "operating-points-v2";
+                opp-shared;
+
+                opp-500000000 {
+                        opp-hz = /bits/ 64 <500000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1000000000 {
+                        opp-hz = /bits/ 64 <1000000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1500000000 {
+                        opp-hz = /bits/ 64 <1500000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1600000000 {
+                        opp-hz = /bits/ 64 <1600000000>;
+                        opp-microvolt = <900000>;
+                        clock-latency-ns = <300000>;
+                        turbo-mode;
+                };
+                opp-1700000000 {
+                        opp-hz = /bits/ 64 <1700000000>;
+                        opp-microvolt = <900000>;
+                        clock-latency-ns = <300000>;
+                        turbo-mode;
+                };
+                opp-1800000000 {
+                        opp-hz = /bits/ 64 <1800000000>;
+                        opp-microvolt = <960000>;
+                        clock-latency-ns = <300000>;
+                        turbo-mode;
+                };
+        };
+
+        cluster1_opp: opp_table1 {
+                compatible = "operating-points-v2";
+                opp-shared;
+
+                opp-800000000 {
+                        opp-hz = /bits/ 64 <800000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1000000000 {
+                        opp-hz = /bits/ 64 <1000000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1200000000 {
+                        opp-hz = /bits/ 64 <1200000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                };
+                opp-1300000000 {
+                        opp-hz = /bits/ 64 <1300000000>;
+                        opp-microvolt = <820000>;
+                        clock-latency-ns = <300000>;
+                        turbo-mode;
+                };
+        };
+
         /* External PCIe clock - can be overridden by the board */
         pcie_bus_clk: pcie_bus {
                 compatible = "fixed-clock";
@@ -894,7 +974,7 @@
                         clocks = <&cpg CPG_MOD 812>;
                         power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
                         resets = <&cpg 812>;
-                        phy-mode = "rgmii-txid";
+                        phy-mode = "rgmii";
                         iommus = <&ipmmu_ds0 16>;
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -1561,9 +1641,9 @@
 
                 tsc: thermal@e6198000 {
                         compatible = "renesas,r8a7796-thermal";
-                        reg = <0 0xe6198000 0 0x68>,
-                              <0 0xe61a0000 0 0x5c>,
-                              <0 0xe61a8000 0 0x5c>;
+                        reg = <0 0xe6198000 0 0x100>,
+                              <0 0xe61a0000 0 0x100>,
+                              <0 0xe61a8000 0 0x100>;
                         interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
@@ -1839,7 +1919,7 @@
 
                 vspd0: vsp@fea20000 {
                         compatible = "renesas,vsp2";
-                        reg = <0 0xfea20000 0 0x4000>;
+                        reg = <0 0xfea20000 0 0x8000>;
                         interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&cpg CPG_MOD 623>;
                         power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
@@ -1859,7 +1939,7 @@
 
                 vspd1: vsp@fea28000 {
                         compatible = "renesas,vsp2";
-                        reg = <0 0xfea28000 0 0x4000>;
+                        reg = <0 0xfea28000 0 0x8000>;
                         interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&cpg CPG_MOD 622>;
                         power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
@@ -1879,7 +1959,7 @@
 
                 vspd2: vsp@fea30000 {
                         compatible = "renesas,vsp2";
-                        reg = <0 0xfea30000 0 0x4000>;
+                        reg = <0 0xfea30000 0 0x8000>;
                         interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>;
                         clocks = <&cpg CPG_MOD 621>;
                         power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
@@ -1998,12 +2078,24 @@
                         thermal-sensors = <&tsc 0>;
 
                         trips {
+                                sensor1_passive: sensor1-passive {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
                                 sensor1_crit: sensor1-crit {
                                         temperature = <120000>;
                                         hysteresis = <2000>;
                                         type = "critical";
                                 };
                         };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&sensor1_passive>;
+                                        cooling-device = <&a57_0 5 5>;
+                                };
+                        };
                 };
 
                 sensor_thermal2: sensor-thermal2 {
@@ -2012,12 +2104,24 @@
                         thermal-sensors = <&tsc 1>;
 
                         trips {
+                                sensor2_passive: sensor2-passive {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
                                 sensor2_crit: sensor2-crit {
                                         temperature = <120000>;
                                         hysteresis = <2000>;
                                         type = "critical";
                                 };
                         };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&sensor2_passive>;
+                                        cooling-device = <&a57_0 5 5>;
+                                };
+                        };
                 };
 
                 sensor_thermal3: sensor-thermal3 {
@@ -2026,12 +2130,24 @@
                         thermal-sensors = <&tsc 2>;
 
                         trips {
+                                sensor3_passive: sensor3-passive {
+                                        temperature = <95000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
                                 sensor3_crit: sensor3-crit {
                                         temperature = <120000>;
                                         hysteresis = <2000>;
                                         type = "critical";
                                 };
                         };
+
+                        cooling-maps {
+                                map0 {
+                                        trip = <&sensor3_passive>;
+                                        cooling-device = <&a57_0 5 5>;
+                                };
+                        };
                 };
         };
 
diff --git a/arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dts
new file mode 100644
index 000000000000..75d890d91df9
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a77965-salvator-x.dts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the Salvator-X board with R-Car M3-N
+ *
+ * Copyright (C) 2018 Jacopo Mondi <jacopo+renesas@jmondi.org>
+ */
+
+/dts-v1/;
+#include "r8a77965.dtsi"
+#include "salvator-x.dtsi"
+
+/ {
+        model = "Renesas Salvator-X board based on r8a77965";
+        compatible = "renesas,salvator-x", "renesas,r8a77965";
+
+        memory@48000000 {
+                device_type = "memory";
+                /* first 128MB is reserved for secure area. */
+                reg = <0x0 0x48000000 0x0 0x78000000>;
+        };
+};
diff --git a/arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts
new file mode 100644
index 000000000000..a83a00deed9e
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the Salvator-X 2nd version board with R-Car M3-N
+ *
+ * Copyright (C) 2017 Renesas Electronics Corp.
+ */
+
+/dts-v1/;
+#include "r8a77965.dtsi"
+#include "salvator-xs.dtsi"
+
+/ {
+        model = "Renesas Salvator-X 2nd version board based on r8a77965";
+        compatible = "renesas,salvator-xs", "renesas,r8a77965";
+
+        memory@48000000 {
+                device_type = "memory";
+                /* first 128MB is reserved for secure area. */
+                reg = <0x0 0x48000000 0x0 0x78000000>;
+        };
+};
diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
new file mode 100644
index 000000000000..f0871fcdd984
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -0,0 +1,878 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the r8a77965 SoC
+ *
+ * Copyright (C) 2018 Jacopo Mondi <jacopo+renesas@jmondi.org>
+ *
+ * Based on r8a7796.dtsi
+ * Copyright (C) 2016 Renesas Electronics Corp.
+ */
+
+#include <dt-bindings/clock/renesas-cpg-mssr.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+#define CPG_AUDIO_CLK_I         10
+
+/ {
+        compatible = "renesas,r8a77965";
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        aliases {
+                i2c7 = &i2c_dvfs;
+        };
+
+        psci {
+                compatible = "arm,psci-1.0", "arm,psci-0.2";
+                method = "smc";
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                a57_0: cpu@0 {
+                        compatible = "arm,cortex-a57", "arm,armv8";
+                        reg = <0x0>;
+                        device_type = "cpu";
+                        power-domains = <&sysc 0>;
+                        next-level-cache = <&L2_CA57>;
+                        enable-method = "psci";
+                };
+
+                a57_1: cpu@1 {
+                        compatible = "arm,cortex-a57","arm,armv8";
+                        reg = <0x1>;
+                        device_type = "cpu";
+                        power-domains = <&sysc 1>;
+                        next-level-cache = <&L2_CA57>;
+                        enable-method = "psci";
+                };
+
+                L2_CA57: cache-controller-0 {
+                        compatible = "cache";
+                        power-domains = <&sysc 12>;
+                        cache-unified;
+                        cache-level = <2>;
+                };
+        };
+
+        extal_clk: extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board */
+                clock-frequency = <0>;
+        };
+
+        extalr_clk: extalr {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board */
+                clock-frequency = <0>;
+        };
+
+        /*
+         * The external audio clocks are configured as 0 Hz fixed frequency
+         * clocks by default.
+         * Boards that provide audio clocks should override them.
+         */
+        audio_clk_a: audio_clk_a {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        audio_clk_b: audio_clk_b {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        audio_clk_c: audio_clk_c {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        /* External CAN clock - to be overridden by boards that provide it */
+        can_clk: can {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        /* External SCIF clock - to be overridden by boards that provide it */
+        scif_clk: scif {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        /* External PCIe clock - can be overridden by the board */
+        pcie_bus_clk: pcie_bus {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        /* External USB clocks - can be overridden by the board */
+        usb3s0_clk: usb3s0 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        usb_extal_clk: usb_extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+        };
+
+        pmu_a57 {
+                compatible = "arm,cortex-a57-pmu";
+                interrupts-extended = <&gic GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+                                      <&gic GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-affinity = <&a57_0>,
+                                     <&a57_1>;
+        };
+
+        soc {
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                gic: interrupt-controller@f1010000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        #address-cells = <0>;
+                        interrupt-controller;
+                        reg = <0x0 0xf1010000 0 0x1000>,
+                              <0x0 0xf1020000 0 0x20000>,
+                              <0x0 0xf1040000 0 0x20000>,
+                              <0x0 0xf1060000 0 0x20000>;
+                        interrupts = <GIC_PPI 9
+                                        (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 408>;
+                };
+
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a77965";
+                        reg = <0 0xe6060000 0 0x50c>;
+                };
+
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a77965-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>, <&extalr_clk>;
+                        clock-names = "extal", "extalr";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
+
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a77965-rst";
+                        reg = <0 0xe6160000 0 0x0200>;
+                };
+
+                prr: chipid@fff00044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xfff00044 0 4>;
+                };
+
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a77965-sysc";
+                        reg = <0 0xe6180000 0 0x0400>;
+                        #power-domain-cells = <1>;
+                };
+
+                gpio0: gpio@e6050000 {
+                        compatible = "renesas,gpio-r8a77965",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6050000 0 0x50>;
+                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 0 16>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 912>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 912>;
+                };
+
+                gpio1: gpio@e6051000 {
+                        compatible = "renesas,gpio-r8a77965",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6051000 0 0x50>;
+                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 32 29>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 911>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 911>;
+                };
+
+                gpio2: gpio@e6052000 {
+                        compatible = "renesas,gpio-r8a77965",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6052000 0 0x50>;
+                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 64 15>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 910>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 910>;
+                };
+
+                gpio3: gpio@e6053000 {
+                        compatible = "renesas,gpio-r8a77965",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6053000 0 0x50>;
+                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 96 16>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 909>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 909>;
+                };
+
+                gpio4: gpio@e6054000 {
+                        compatible = "renesas,gpio-r8a77965",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6054000 0 0x50>;
+                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 128 18>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 908>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 908>;
+                };
+
+                gpio5: gpio@e6055000 {
+                        compatible = "renesas,gpio-r8a77965",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6055000 0 0x50>;
+                        interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 160 26>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 907>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 907>;
+                };
+
+                gpio6: gpio@e6055400 {
+                        compatible = "renesas,gpio-r8a77965",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6055400 0 0x50>;
+                        interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 192 32>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 906>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 906>;
+                };
+
+                gpio7: gpio@e6055800 {
+                        compatible = "renesas,gpio-r8a77965",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6055800 0 0x50>;
+                        interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 224 4>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 905>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 905>;
+                };
+
+                intc_ex: interrupt-controller@e61c0000 {
+                        compatible = "renesas,intc-ex-r8a77965", "renesas,irqc";
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0 0xe61c0000 0 0x200>;
+                        interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 407>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 407>;
+                };
+
+                dmac0: dma-controller@e6700000 {
+                        compatible = "renesas,dmac-r8a77965",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe6700000 0 0x10000>;
+                        interrupts = <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                        "ch0", "ch1", "ch2", "ch3",
+                                        "ch4", "ch5", "ch6", "ch7",
+                                        "ch8", "ch9", "ch10", "ch11",
+                                        "ch12", "ch13", "ch14", "ch15";
+                        clocks = <&cpg CPG_MOD 219>;
+                        clock-names = "fck";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 219>;
+                        #dma-cells = <1>;
+                        dma-channels = <16>;
+                };
+
+                dmac1: dma-controller@e7300000 {
+                        compatible = "renesas,dmac-r8a77965",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe7300000 0 0x10000>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                        "ch0", "ch1", "ch2", "ch3",
+                                        "ch4", "ch5", "ch6", "ch7",
+                                        "ch8", "ch9", "ch10", "ch11",
+                                        "ch12", "ch13", "ch14", "ch15";
+                        clocks = <&cpg CPG_MOD 218>;
+                        clock-names = "fck";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 218>;
+                        #dma-cells = <1>;
+                        dma-channels = <16>;
+                };
+
+                dmac2: dma-controller@e7310000 {
+                        compatible = "renesas,dmac-r8a77965",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe7310000 0 0x10000>;
+                        interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 430 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 431 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                        "ch0", "ch1", "ch2", "ch3",
+                                        "ch4", "ch5", "ch6", "ch7",
+                                        "ch8", "ch9", "ch10", "ch11",
+                                        "ch12", "ch13", "ch14", "ch15";
+                        clocks = <&cpg CPG_MOD 217>;
+                        clock-names = "fck";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 217>;
+                        #dma-cells = <1>;
+                        dma-channels = <16>;
+                };
+
+                scif0: serial@e6e60000 {
+                        compatible = "renesas,scif-r8a77965",
+                                     "renesas,rcar-gen3-scif", "renesas,scif";
+                        reg = <0 0xe6e60000 0 64>;
+                        interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 207>,
+                                 <&cpg CPG_CORE 20>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x51>, <&dmac1 0x50>,
+                               <&dmac2 0x51>, <&dmac2 0x50>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 207>;
+                        status = "disabled";
+                };
+
+                scif1: serial@e6e68000 {
+                        compatible = "renesas,scif-r8a77965",
+                                     "renesas,rcar-gen3-scif", "renesas,scif";
+                        reg = <0 0xe6e68000 0 64>;
+                        interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 206>,
+                                 <&cpg CPG_CORE 20>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x53>, <&dmac1 0x52>,
+                               <&dmac2 0x53>, <&dmac2 0x52>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 206>;
+                        status = "disabled";
+                };
+
+                scif2: serial@e6e88000 {
+                        compatible = "renesas,scif-r8a77965",
+                                     "renesas,rcar-gen3-scif", "renesas,scif";
+                        reg = <0 0xe6e88000 0 64>;
+                        interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 310>,
+                                 <&cpg CPG_CORE 20>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 310>;
+                        status = "disabled";
+                };
+
+                scif3: serial@e6c50000 {
+                        compatible = "renesas,scif-r8a77965",
+                                     "renesas,rcar-gen3-scif", "renesas,scif";
+                        reg = <0 0xe6c50000 0 64>;
+                        interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 204>,
+                                 <&cpg CPG_CORE 20>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x57>, <&dmac0 0x56>;
+                        dma-names = "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 204>;
+                        status = "disabled";
+                };
+
+                scif4: serial@e6c40000 {
+                        compatible = "renesas,scif-r8a77965",
+                                     "renesas,rcar-gen3-scif", "renesas,scif";
+                        reg = <0 0xe6c40000 0 64>;
+                        interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 203>,
+                                 <&cpg CPG_CORE 20>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac0 0x59>, <&dmac0 0x58>;
+                        dma-names = "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 203>;
+                        status = "disabled";
+                };
+
+                scif5: serial@e6f30000 {
+                        compatible = "renesas,scif-r8a77965",
+                                     "renesas,rcar-gen3-scif", "renesas,scif";
+                        reg = <0 0xe6f30000 0 64>;
+                        interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 202>,
+                                 <&cpg CPG_CORE 20>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x5b>, <&dmac1 0x5a>,
+                               <&dmac2 0x5b>, <&dmac2 0x5a>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 202>;
+                        status = "disabled";
+                };
+
+                avb: ethernet@e6800000 {
+                        compatible = "renesas,etheravb-r8a77965",
+                                     "renesas,etheravb-rcar-gen3";
+                        reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>;
+                        interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14", "ch15",
+                                          "ch16", "ch17", "ch18", "ch19",
+                                          "ch20", "ch21", "ch22", "ch23",
+                                          "ch24";
+                        clocks = <&cpg CPG_MOD 812>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 812>;
+                        phy-mode = "rgmii";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                csi20: csi2@fea80000 {
+                        reg = <0 0xfea80000 0 0x10000>;
+                        /* placeholder */
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
+                csi40: csi2@feaa0000 {
+                        reg = <0 0xfeaa0000 0 0x10000>;
+                        /* placeholder */
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
+                vin0: video@e6ef0000 {
+                        reg = <0 0xe6ef0000 0 0x1000>;
+                        /* placeholder */
+                };
+
+                vin1: video@e6ef1000 {
+                        reg = <0 0xe6ef1000 0 0x1000>;
+                        /* placeholder */
+                };
+
+                vin2: video@e6ef2000 {
+                        reg = <0 0xe6ef2000 0 0x1000>;
+                        /* placeholder */
+                };
+
+                vin3: video@e6ef3000 {
+                        reg = <0 0xe6ef3000 0 0x1000>;
+                        /* placeholder */
+                };
+
+                vin4: video@e6ef4000 {
+                        reg = <0 0xe6ef4000 0 0x1000>;
+                        /* placeholder */
+                };
+
+                vin5: video@e6ef5000 {
+                        reg = <0 0xe6ef5000 0 0x1000>;
+                        /* placeholder */
+                };
+
+                vin6: video@e6ef6000 {
+                        reg = <0 0xe6ef6000 0 0x1000>;
+                        /* placeholder */
+                };
+
+                vin7: video@e6ef7000 {
+                        reg = <0 0xe6ef7000 0 0x1000>;
+                        /* placeholder */
+                };
+
+                ohci0: usb@ee080000 {
+                        reg = <0 0xee080000 0 0x100>;
+                        /* placeholder */
+                };
+
+                ehci0: usb@ee080100 {
+                        reg = <0 0xee080100 0 0x100>;
+                        /* placeholder */
+                };
+
+                usb2_phy0: usb-phy@ee080200 {
+                        reg = <0 0xee080200 0 0x700>;
+                        /* placeholder */
+                };
+
+                usb2_phy1: usb-phy@ee0a0200 {
+                        reg = <0 0xee0a0200 0 0x700>;
+                        /* placeholder */
+                };
+
+                ohci1: usb@ee0a0000 {
+                        reg = <0 0xee0a0000 0 0x100>;
+                        /* placeholder */
+                };
+
+                ehci1: usb@ee0a0100 {
+                        reg = <0 0xee0a0100 0 0x100>;
+                        /* placeholder */
+                };
+
+                i2c0: i2c@e6500000 {
+                        reg = <0 0xe6500000 0 0x40>;
+                        /* placeholder */
+                };
+
+                i2c1: i2c@e6508000 {
+                        reg = <0 0xe6508000 0 0x40>;
+                        /* placeholder */
+                };
+
+                i2c2: i2c@e6510000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        reg = <0 0xe6510000 0 0x40>;
+                        /* placeholder */
+                };
+
+                i2c3: i2c@e66d0000 {
+                        reg = <0 0xe66d0000 0 0x40>;
+                        /* placeholder */
+                };
+
+                i2c4: i2c@e66d8000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        reg = <0 0xe66d8000 0 0x40>;
+                        /* placeholder */
+                };
+
+                i2c5: i2c@e66e0000 {
+                        reg = <0 0xe66e0000 0 0x40>;
+                        /* placeholder */
+                };
+
+                i2c6: i2c@e66e8000 {
+                        reg = <0 0xe66e8000 0 0x40>;
+                        /* placeholder */
+                };
+
+                i2c_dvfs: i2c@e60b0000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,iic-r8a77965",
+                                     "renesas,rcar-gen3-iic",
+                                     "renesas,rmobile-iic";
+                        reg = <0 0xe60b0000 0 0x425>;
+                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 926>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 926>;
+                        dmas = <&dmac0 0x11>, <&dmac0 0x10>;
+                        dma-names = "tx", "rx";
+                        status = "disabled";
+                };
+
+                pwm0: pwm@e6e30000 {
+                        reg = <0 0xe6e30000 0 8>;
+                        /* placeholder */
+                };
+
+                pwm1: pwm@e6e31000 {
+                        reg = <0 0xe6e31000 0 8>;
+                        #pwm-cells = <2>;
+                        /* placeholder */
+                };
+
+                pwm2: pwm@e6e32000 {
+                        reg = <0 0xe6e32000 0 8>;
+                        /* placeholder */
+                };
+
+                pwm3: pwm@e6e33000 {
+                        reg = <0 0xe6e33000 0 8>;
+                        /* placeholder */
+                };
+
+                pwm4: pwm@e6e34000 {
+                        reg = <0 0xe6e34000 0 8>;
+                        /* placeholder */
+                };
+
+                pwm5: pwm@e6e35000 {
+                        reg = <0 0xe6e35000 0 8>;
+                        /* placeholder */
+                };
+
+                pwm6: pwm@e6e36000 {
+                        reg = <0 0xe6e36000 0 8>;
+                        /* placeholder */
+                };
+
+                du: display@feb00000 {
+                        reg = <0 0xfeb00000 0 0x80000>,
+                              <0 0xfeb90000 0 0x14>;
+                        /* placeholder */
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb: endpoint {
+                                        };
+                                };
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_hdmi0: endpoint {
+                                        };
+                                };
+                                port@2 {
+                                        reg = <2>;
+                                        du_out_lvds0: endpoint {
+                                        };
+                                };
+                        };
+                };
+
+                hsusb: usb@e6590000 {
+                        reg = <0 0xe6590000 0 0x100>;
+                        /* placeholder */
+                };
+
+                pciec0: pcie@fe000000 {
+                        reg = <0 0xfe000000 0 0x80000>;
+                        /* placeholder */
+                };
+
+                pciec1: pcie@ee800000 {
+                        reg = <0 0xee800000 0 0x80000>;
+                        /* placeholder */
+                };
+
+                rcar_sound: sound@ec500000 {
+                        reg =   <0 0xec500000 0 0x1000>, /* SCU */
+                                <0 0xec5a0000 0 0x100>,  /* ADG */
+                                <0 0xec540000 0 0x1000>, /* SSIU */
+                                <0 0xec541000 0 0x280>,  /* SSI */
+                                <0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
+                        /* placeholder */
+
+                        rcar_sound,dvc {
+                                dvc0: dvc-0 {
+                                };
+                                dvc1: dvc-1 {
+                                };
+                        };
+
+                        rcar_sound,src {
+                                src0: src-0 {
+                                };
+                                src1: src-1 {
+                                };
+                        };
+
+                        rcar_sound,ssi {
+                                ssi0: ssi-0 {
+                                };
+                                ssi1: ssi-1 {
+                                };
+                        };
+                };
+
+                sdhi0: sd@ee100000 {
+                        reg = <0 0xee100000 0 0x2000>;
+                        /* placeholder */
+                };
+
+                sdhi1: sd@ee120000 {
+                        reg = <0 0xee120000 0 0x2000>;
+                        /* placeholder */
+                };
+
+                sdhi2: sd@ee140000 {
+                        reg = <0 0xee140000 0 0x2000>;
+                        /* placeholder */
+                };
+
+                sdhi3: sd@ee160000 {
+                        reg = <0 0xee160000 0 0x2000>;
+                        /* placeholder */
+                };
+
+                usb3_phy0: usb-phy@e65ee000 {
+                        reg = <0 0xe65ee000 0 0x90>;
+                        #phy-cells = <0>;
+                        /* placeholder */
+                };
+
+                usb3_peri0: usb@ee020000 {
+                        reg = <0 0xee020000 0 0x400>;
+                        /* placeholder */
+                };
+
+                xhci0: usb@ee000000 {
+                        reg = <0 0xee000000 0 0xc00>;
+                        /* placeholder */
+                };
+
+                wdt0: watchdog@e6020000 {
+                        reg = <0 0xe6020000 0 0x0c>;
+                        /* placeholder */
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/renesas/r8a77970-eagle.dts b/arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
index 8fe5c193e049..3c5f598c9766 100644
--- a/arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
@@ -36,11 +36,14 @@
 &avb {
         renesas,no-ether-link;
         phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
         status = "okay";
 
         phy0: ethernet-phy@0 {
                 rxc-skew-ps = <1500>;
                 reg = <0>;
+                interrupt-parent = <&gpio1>;
+                interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
         };
 };
 
@@ -52,11 +55,41 @@
         clock-frequency = <32768>;
 };
 
+&i2c0 {
+        pinctrl-0 = <&i2c0_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+        clock-frequency = <400000>;
+
+        io_expander: gpio@20 {
+                compatible = "onnn,pca9654";
+                reg = <0x20>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+};
+
+&pfc {
+        i2c0_pins: i2c0 {
+                groups = "i2c0";
+                function = "i2c0";
+        };
+
+        scif0_pins: scif0 {
+                groups = "scif0_data";
+                function = "scif0";
+        };
+};
+
 &rwdt {
         timeout-sec = <60>;
         status = "okay";
 };
 
 &scif0 {
+        pinctrl-0 = <&scif0_pins>;
+        pinctrl-names = "default";
+
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts b/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
index 8624ca87d6b2..a8ceeac77992 100644
--- a/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
@@ -34,6 +34,7 @@
 &avb {
         renesas,no-ether-link;
         phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
         status = "okay";
 
         phy0: ethernet-phy@0 {
@@ -50,6 +51,16 @@
         clock-frequency = <32768>;
 };
 
+&pfc {
+        scif0_pins: scif0 {
+                groups = "scif0_data";
+                function = "scif0";
+        };
+};
+
 &scif0 {
+        pinctrl-0 = <&scif0_pins>;
+        pinctrl-names = "default";
+
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a77970.dtsi b/arch/arm64/boot/dts/renesas/r8a77970.dtsi
index c35a117fc447..c6db8ea43906 100644
--- a/arch/arm64/boot/dts/renesas/r8a77970.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77970.dtsi
@@ -19,9 +19,12 @@
         #address-cells = <2>;
         #size-cells = <2>;
 
-        psci {
-                compatible = "arm,psci-1.0", "arm,psci-0.2";
-                method = "smc";
+        aliases {
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                i2c2 = &i2c2;
+                i2c3 = &i2c3;
+                i2c4 = &i2c4;
         };
 
         cpus {
@@ -60,6 +63,11 @@
                 clock-frequency = <0>;
         };
 
+        psci {
+                compatible = "arm,psci-1.0", "arm,psci-0.2";
+                method = "smc";
+        };
+
         /* External SCIF clock - to be overridden by boards that provide it */
         scif_clk: scif {
                 compatible = "fixed-clock";
@@ -92,18 +100,6 @@
                         resets = <&cpg 408>;
                 };
 
-                timer {
-                        compatible = "arm,armv8-timer";
-                        interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) |
-                                                  IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) |
-                                                  IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) |
-                                                  IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) |
-                                                  IRQ_TYPE_LEVEL_LOW)>;
-                };
-
                 rwdt: watchdog@e6020000 {
                         compatible = "renesas,r8a77970-wdt",
                                      "renesas,rcar-gen3-wdt";
@@ -178,6 +174,101 @@
                         #iommu-cells = <1>;
                 };
 
+                pfc: pin-controller@e6060000 {
+                        compatible = "renesas,pfc-r8a77970";
+                        reg = <0 0xe6060000 0 0x504>;
+                };
+
+                gpio0: gpio@e6050000 {
+                        compatible = "renesas,gpio-r8a77970",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6050000 0 0x50>;
+                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 0 22>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 912>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 912>;
+                };
+
+                gpio1: gpio@e6051000 {
+                        compatible = "renesas,gpio-r8a77970",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6051000 0 0x50>;
+                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 32 28>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 911>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 911>;
+                };
+
+                gpio2: gpio@e6052000 {
+                        compatible = "renesas,gpio-r8a77970",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6052000 0 0x50>;
+                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 64 17>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 910>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 910>;
+                };
+
+                gpio3: gpio@e6053000 {
+                        compatible = "renesas,gpio-r8a77970",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6053000 0 0x50>;
+                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 96 17>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 909>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 909>;
+                };
+
+                gpio4: gpio@e6054000 {
+                        compatible = "renesas,gpio-r8a77970",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6054000 0 0x50>;
+                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 128 6>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 908>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 908>;
+                };
+
+                gpio5: gpio@e6055000 {
+                        compatible = "renesas,gpio-r8a77970",
+                                     "renesas,rcar-gen3-gpio";
+                        reg = <0 0xe6055000 0 0x50>;
+                        interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        gpio-ranges = <&pfc 0 160 15>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        clocks = <&cpg CPG_MOD 907>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 907>;
+                };
+
                 intc_ex: interrupt-controller@e61c0000 {
                         compatible = "renesas,intc-ex-r8a77970", "renesas,irqc";
                         #interrupt-cells = <2>;
@@ -255,6 +346,91 @@
                                <&ipmmu_ds1 22>, <&ipmmu_ds1 23>;
                 };
 
+                i2c0: i2c@e6500000 {
+                        compatible = "renesas,i2c-r8a77970",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe6500000 0 0x40>;
+                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 931>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 931>;
+                        dmas = <&dmac1 0x91>, <&dmac1 0x90>,
+                               <&dmac2 0x91>, <&dmac2 0x90>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c1: i2c@e6508000 {
+                        compatible = "renesas,i2c-r8a77970",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe6508000 0 0x40>;
+                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 930>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 930>;
+                        dmas = <&dmac1 0x93>, <&dmac1 0x92>,
+                               <&dmac2 0x93>, <&dmac2 0x92>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c2: i2c@e6510000 {
+                        compatible = "renesas,i2c-r8a77970",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe6510000 0 0x40>;
+                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 929>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 929>;
+                        dmas = <&dmac1 0x95>, <&dmac1 0x94>,
+                               <&dmac2 0x95>, <&dmac2 0x94>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c3: i2c@e66d0000 {
+                        compatible = "renesas,i2c-r8a77970",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe66d0000 0 0x40>;
+                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 928>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 928>;
+                        dmas = <&dmac1 0x97>, <&dmac1 0x96>,
+                               <&dmac2 0x97>, <&dmac2 0x96>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c4: i2c@e66d8000 {
+                        compatible = "renesas,i2c-r8a77970",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe66d8000 0 0x40>;
+                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 927>;
+                        power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
+                        resets = <&cpg 927>;
+                        dmas = <&dmac1 0x99>, <&dmac1 0x98>,
+                               <&dmac2 0x99>, <&dmac2 0x98>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
                 hscif0: serial@e6540000 {
                         compatible = "renesas,hscif-r8a77970",
                                      "renesas,rcar-gen3-hscif",
@@ -400,7 +576,7 @@
                 avb: ethernet@e6800000 {
                         compatible = "renesas,etheravb-r8a77970",
                                      "renesas,etheravb-rcar-gen3";
-                        reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>;
+                        reg = <0 0xe6800000 0 0x800>;
                         interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
@@ -436,10 +612,18 @@
                         clocks = <&cpg CPG_MOD 812>;
                         power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
                         resets = <&cpg 812>;
-                        phy-mode = "rgmii-id";
+                        phy-mode = "rgmii";
                         iommus = <&ipmmu_rt 3>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                 };
         };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
+        };
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
new file mode 100644
index 000000000000..06cf6845765a
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the Condor board
+ *
+ * Copyright (C) 2018 Renesas Electronics Corp.
+ * Copyright (C) 2018 Cogent Embedded, Inc.
+ */
+
+/dts-v1/;
+#include "r8a77980.dtsi"
+
+/ {
+        model = "Renesas Condor board based on r8a77980";
+        compatible = "renesas,condor", "renesas,r8a77980";
+
+        aliases {
+                serial0 = &scif0;
+                ethernet0 = &avb;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@48000000 {
+                device_type = "memory";
+                /* first 128MB is reserved for secure area. */
+                reg = <0 0x48000000 0 0x78000000>;
+        };
+};
+
+&avb {
+        phy-mode = "rgmii-id";
+        phy-handle = <&phy0>;
+        renesas,no-ether-link;
+        status = "okay";
+
+        phy0: ethernet-phy@0 {
+                rxc-skew-ps = <1500>;
+                reg = <0>;
+        };
+};
+
+&extal_clk {
+        clock-frequency = <16666666>;
+};
+
+&extalr_clk {
+        clock-frequency = <32768>;
+};
+
+&scif0 {
+        status = "okay";
+};
+
+&scif_clk {
+        clock-frequency = <14745600>;
+};
diff --git a/arch/arm64/boot/dts/renesas/r8a77980.dtsi b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
new file mode 100644
index 000000000000..03845fd74996
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
@@ -0,0 +1,385 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the r8a77980 SoC
+ *
+ * Copyright (C) 2018 Renesas Electronics Corp.
+ * Copyright (C) 2018 Cogent Embedded, Inc.
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/renesas-cpg-mssr.h>
+
+/ {
+        compatible = "renesas,r8a77980";
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                a53_0: cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a53", "arm,armv8";
+                        reg = <0>;
+                        clocks = <&cpg CPG_CORE 0>;
+                        power-domains = <&sysc 5>;
+                        next-level-cache = <&L2_CA53>;
+                        enable-method = "psci";
+                };
+
+                L2_CA53: cache-controller {
+                        compatible = "cache";
+                        power-domains = <&sysc 21>;
+                        cache-unified;
+                        cache-level = <2>;
+                };
+        };
+
+        extal_clk: extal {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board */
+                clock-frequency = <0>;
+        };
+
+        extalr_clk: extalr {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                /* This value must be overridden by the board */
+                clock-frequency = <0>;
+        };
+
+        psci {
+                compatible = "arm,psci-1.0", "arm,psci-0.2";
+                method = "smc";
+        };
+
+        /* External SCIF clock - to be overridden by boards that provide it */
+        scif_clk: scif {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <0>;
+        };
+
+        soc {
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
+
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                cpg: clock-controller@e6150000 {
+                        compatible = "renesas,r8a77980-cpg-mssr";
+                        reg = <0 0xe6150000 0 0x1000>;
+                        clocks = <&extal_clk>, <&extalr_clk>;
+                        clock-names = "extal", "extalr";
+                        #clock-cells = <2>;
+                        #power-domain-cells = <0>;
+                        #reset-cells = <1>;
+                };
+
+                rst: reset-controller@e6160000 {
+                        compatible = "renesas,r8a77980-rst";
+                        reg = <0 0xe6160000 0 0x200>;
+                };
+
+                sysc: system-controller@e6180000 {
+                        compatible = "renesas,r8a77980-sysc";
+                        reg = <0 0xe6180000 0 0x440>;
+                        #power-domain-cells = <1>;
+                };
+
+                hscif0: serial@e6540000 {
+                        compatible = "renesas,hscif-r8a77980",
+                                     "renesas,rcar-gen3-hscif",
+                                     "renesas,hscif";
+                        reg = <0 0xe6540000 0 0x60>;
+                        interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 520>,
+                                 <&cpg CPG_CORE 19>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x31>, <&dmac1 0x30>,
+                               <&dmac2 0x31>, <&dmac2 0x30>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 520>;
+                        status = "disabled";
+                };
+
+                hscif1: serial@e6550000 {
+                        compatible = "renesas,hscif-r8a77980",
+                                     "renesas,rcar-gen3-hscif",
+                                     "renesas,hscif";
+                        reg = <0 0xe6550000 0 0x60>;
+                        interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 519>,
+                                 <&cpg CPG_CORE 19>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x33>, <&dmac1 0x32>,
+                               <&dmac2 0x33>, <&dmac2 0x32>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 519>;
+                        status = "disabled";
+                };
+
+                hscif2: serial@e6560000 {
+                        compatible = "renesas,hscif-r8a77980",
+                                     "renesas,rcar-gen3-hscif",
+                                     "renesas,hscif";
+                        reg = <0 0xe6560000 0 0x60>;
+                        interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 518>,
+                                 <&cpg CPG_CORE 19>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x35>, <&dmac1 0x34>,
+                               <&dmac2 0x35>, <&dmac2 0x34>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 518>;
+                        status = "disabled";
+                };
+
+                hscif3: serial@e66a0000 {
+                        compatible = "renesas,hscif-r8a77980",
+                                     "renesas,rcar-gen3-hscif",
+                                     "renesas,hscif";
+                        reg = <0 0xe66a0000 0 0x60>;
+                        interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 517>,
+                                 <&cpg CPG_CORE 19>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x37>, <&dmac1 0x36>,
+                               <&dmac2 0x37>, <&dmac2 0x36>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 517>;
+                        status = "disabled";
+                };
+
+                avb: ethernet@e6800000 {
+                        compatible = "renesas,etheravb-r8a77980",
+                                     "renesas,etheravb-rcar-gen3";
+                        reg = <0 0xe6800000 0 0x800>;
+                        interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14", "ch15",
+                                          "ch16", "ch17", "ch18", "ch19",
+                                          "ch20", "ch21", "ch22", "ch23",
+                                          "ch24";
+                        clocks = <&cpg CPG_MOD 812>;
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 812>;
+                        phy-mode = "rgmii";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                scif0: serial@e6e60000 {
+                        compatible = "renesas,scif-r8a77980",
+                                     "renesas,rcar-gen3-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6e60000 0 0x40>;
+                        interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 207>,
+                                 <&cpg CPG_CORE 19>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x51>, <&dmac1 0x50>,
+                               <&dmac2 0x51>, <&dmac2 0x50>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 207>;
+                        status = "disabled";
+                };
+
+                scif1: serial@e6e68000 {
+                        compatible = "renesas,scif-r8a77980",
+                                     "renesas,rcar-gen3-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6e68000 0 0x40>;
+                        interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 206>,
+                                 <&cpg CPG_CORE 19>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x53>, <&dmac1 0x52>,
+                               <&dmac2 0x53>, <&dmac2 0x52>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 206>;
+                        status = "disabled";
+                };
+
+                scif3: serial@e6c50000 {
+                        compatible = "renesas,scif-r8a77980",
+                                     "renesas,rcar-gen3-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6c50000 0 0x40>;
+                        interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 204>,
+                                 <&cpg CPG_CORE 19>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x57>, <&dmac1 0x56>,
+                               <&dmac2 0x57>, <&dmac2 0x56>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 204>;
+                        status = "disabled";
+                };
+
+                scif4: serial@e6c40000 {
+                        compatible = "renesas,scif-r8a77980",
+                                     "renesas,rcar-gen3-scif",
+                                     "renesas,scif";
+                        reg = <0 0xe6c40000 0 0x40>;
+                        interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 203>,
+                                 <&cpg CPG_CORE 19>,
+                                 <&scif_clk>;
+                        clock-names = "fck", "brg_int", "scif_clk";
+                        dmas = <&dmac1 0x59>, <&dmac1 0x58>,
+                               <&dmac2 0x59>, <&dmac2 0x58>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 203>;
+                        status = "disabled";
+                };
+
+                dmac1: dma-controller@e7300000 {
+                        compatible = "renesas,dmac-r8a77980",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe7300000 0 0x10000>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 311 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14", "ch15";
+                        clocks = <&cpg CPG_MOD 218>;
+                        clock-names = "fck";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 218>;
+                        #dma-cells = <1>;
+                        dma-channels = <16>;
+                };
+
+                dmac2: dma-controller@e7310000 {
+                        compatible = "renesas,dmac-r8a77980",
+                                     "renesas,rcar-dmac";
+                        reg = <0 0xe7310000 0 0x10000>;
+                        interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 364 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 365 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 366 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH
+                                      GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                          "ch0", "ch1", "ch2", "ch3",
+                                          "ch4", "ch5", "ch6", "ch7",
+                                          "ch8", "ch9", "ch10", "ch11",
+                                          "ch12", "ch13", "ch14", "ch15";
+                        clocks = <&cpg CPG_MOD 217>;
+                        clock-names = "fck";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 217>;
+                        #dma-cells = <1>;
+                        dma-channels = <16>;
+                };
+
+                gic: interrupt-controller@f1010000 {
+                        compatible = "arm,gic-400";
+                        #interrupt-cells = <3>;
+                        #address-cells = <0>;
+                        interrupt-controller;
+                        reg = <0x0 0xf1010000 0 0x1000>,
+                              <0x0 0xf1020000 0 0x20000>,
+                              <0x0 0xf1040000 0 0x20000>,
+                              <0x0 0xf1060000 0 0x20000>;
+                        interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(1) |
+                                      IRQ_TYPE_LEVEL_HIGH)>;
+                        clocks = <&cpg CPG_MOD 408>;
+                        clock-names = "clk";
+                        power-domains = <&sysc 32>;
+                        resets = <&cpg 408>;
+                };
+
+                prr: chipid@fff00044 {
+                        compatible = "renesas,prr";
+                        reg = <0 0xfff00044 0 4>;
+                };
+        };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) |
+                                       IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) |
+                                       IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) |
+                                       IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) |
+                                       IRQ_TYPE_LEVEL_LOW)>;
+        };
+};
diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
index 09de73b11db8..d03f19414028 100644
--- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
@@ -27,11 +27,61 @@
                 stdout-path = "serial0:115200n8";
         };
 
+        vga {
+                compatible = "vga-connector";
+
+                port {
+                        vga_in: endpoint {
+                                remote-endpoint = <&adv7123_out>;
+                        };
+                };
+        };
+
+        vga-encoder {
+                compatible = "adi,adv7123";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                adv7123_in: endpoint {
+                                        remote-endpoint = <&du_out_rgb>;
+                                };
+                        };
+                        port@1 {
+                                reg = <1>;
+                                adv7123_out: endpoint {
+                                        remote-endpoint = <&vga_in>;
+                                };
+                        };
+                };
+        };
+
         memory@48000000 {
                 device_type = "memory";
                 /* first 128MB is reserved for secure area. */
                 reg = <0x0 0x48000000 0x0 0x18000000>;
         };
+
+        reg_1p8v: regulator0 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-1.8V";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
+        reg_3p3v: regulator1 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-3.3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
 };
 
 &extal_clk {
@@ -46,6 +96,21 @@
                 };
         };
 
+        du_pins: du {
+                groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
+                function = "du";
+        };
+
+        i2c0_pins: i2c0 {
+                groups = "i2c0";
+                function = "i2c0";
+        };
+
+        i2c1_pins: i2c1 {
+                groups = "i2c1";
+                function = "i2c1";
+        };
+
         pwm0_pins: pwm0 {
                 groups = "pwm0_c";
                 function = "pwm0";
@@ -61,12 +126,56 @@
                 function = "scif2";
         };
 
+        sdhi2_pins: sd2 {
+                groups = "mmc_data8", "mmc_ctrl";
+                function = "mmc";
+                power-source = <1800>;
+        };
+
+        sdhi2_pins_uhs: sd2_uhs {
+                groups = "mmc_data8", "mmc_ctrl";
+                function = "mmc";
+                power-source = <1800>;
+        };
+
         usb0_pins: usb0 {
                 groups = "usb0";
                 function = "usb0";
         };
 };
 
+&i2c0 {
+        pinctrl-0 = <&i2c0_pins>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        eeprom@50 {
+                compatible = "rohm,br24t01", "atmel,24c01";
+                reg = <0x50>;
+                pagesize = <8>;
+        };
+};
+
+&i2c1 {
+        pinctrl-0 = <&i2c1_pins>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&du {
+        pinctrl-0 = <&du_pins>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        ports {
+                port@0 {
+                        endpoint {
+                                remote-endpoint = <&adv7123_in>;
+                        };
+                };
+        };
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -80,6 +189,7 @@
         pinctrl-names = "default";
         renesas,no-ether-link;
         phy-handle = <&phy0>;
+        phy-mode = "rgmii-txid";
         status = "okay";
 
         phy0: ethernet-phy@0 {
@@ -97,6 +207,20 @@
         status = "okay";
 };
 
+&sdhi2 {
+        /* used for on-board eMMC */
+        pinctrl-0 = <&sdhi2_pins>;
+        pinctrl-1 = <&sdhi2_pins_uhs>;
+        pinctrl-names = "default", "state_uhs";
+
+        vmmc-supply = <&reg_3p3v>;
+        vqmmc-supply = <&reg_1p8v>;
+        bus-width = <8>;
+        mmc-hs200-1_8v;
+        non-removable;
+        status = "okay";
+};
+
 &usb2_phy0 {
         pinctrl-0 = <&usb0_pins>;
         pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/renesas/r8a77995.dtsi b/arch/arm64/boot/dts/renesas/r8a77995.dtsi
index cff42cd1a6c8..82aed7ee984c 100644
--- a/arch/arm64/boot/dts/renesas/r8a77995.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77995.dtsi
@@ -58,6 +58,11 @@
                 clock-frequency = <0>;
         };
 
+        pmu_a53 {
+                compatible = "arm,cortex-a53-pmu";
+                interrupts-extended = <&gic GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
         scif_clk: scif {
                 compatible = "fixed-clock";
                 #clock-cells = <0>;
@@ -88,18 +93,6 @@
                         resets = <&cpg 408>;
                 };
 
-                timer {
-                        compatible = "arm,armv8-timer";
-                        interrupts = <GIC_PPI 13
-                                        (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 14
-                                        (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 11
-                                        (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
-                                     <GIC_PPI 10
-                                        (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
-                };
-
                 rwdt: watchdog@e6020000 {
                         compatible = "renesas,r8a77995-wdt",
                                      "renesas,rcar-gen3-wdt";
@@ -110,11 +103,6 @@
                         status = "disabled";
                 };
 
-                pmu_a53 {
-                        compatible = "arm,cortex-a53-pmu";
-                        interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
-                };
-
                 ipmmu_vi0: mmu@febd0000 {
                         compatible = "renesas,ipmmu-r8a77995";
                         reg = <0 0xfebd0000 0 0x1000>;
@@ -488,7 +476,7 @@
                 avb: ethernet@e6800000 {
                         compatible = "renesas,etheravb-r8a77995",
                                      "renesas,etheravb-rcar-gen3";
-                        reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>;
+                        reg = <0 0xe6800000 0 0x800>;
                         interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
                                      <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
@@ -524,7 +512,7 @@
                         clocks = <&cpg CPG_MOD 812>;
                         power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
                         resets = <&cpg 812>;
-                        phy-mode = "rgmii-txid";
+                        phy-mode = "rgmii";
                         iommus = <&ipmmu_ds0 16>;
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -548,6 +536,73 @@
                         status = "disabled";
                 };
 
+                i2c0: i2c@e6500000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a77995",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe6500000 0 0x40>;
+                        interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 931>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 931>;
+                        dmas = <&dmac1 0x91>, <&dmac1 0x90>,
+                               <&dmac2 0x91>, <&dmac2 0x90>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
+
+                i2c1: i2c@e6508000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a77995",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe6508000 0 0x40>;
+                        interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 930>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 930>;
+                        dmas = <&dmac1 0x93>, <&dmac1 0x92>,
+                               <&dmac2 0x93>, <&dmac2 0x92>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
+
+                i2c2: i2c@e6510000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a77995",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe6510000 0 0x40>;
+                        interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 929>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 929>;
+                        dmas = <&dmac1 0x95>, <&dmac1 0x94>,
+                               <&dmac2 0x95>, <&dmac2 0x94>;
+                        dma-names = "tx", "rx", "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
+
+                i2c3: i2c@e66d0000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "renesas,i2c-r8a77995",
+                                     "renesas,rcar-gen3-i2c";
+                        reg = <0 0xe66d0000 0 0x40>;
+                        interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 928>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 928>;
+                        dmas = <&dmac0 0x97>, <&dmac0 0x96>;
+                        dma-names = "tx", "rx";
+                        i2c-scl-internal-delay-ns = <6>;
+                        status = "disabled";
+                };
+
                 pwm0: pwm@e6e30000 {
                         compatible = "renesas,pwm-r8a77995", "renesas,pwm-rcar";
                         reg = <0 0xe6e30000 0 0x8>;
@@ -636,5 +691,105 @@
                         #phy-cells = <0>;
                         status = "disabled";
                 };
+
+                vspbs: vsp@fe960000 {
+                        compatible = "renesas,vsp2";
+                        reg = <0 0xfe960000 0 0x8000>;
+                        interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 627>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 627>;
+                        renesas,fcp = <&fcpvb0>;
+                };
+
+                fcpvb0: fcp@fe96f000 {
+                        compatible = "renesas,fcpv";
+                        reg = <0 0xfe96f000 0 0x200>;
+                        clocks = <&cpg CPG_MOD 607>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 607>;
+                        iommus = <&ipmmu_vp0 5>;
+                };
+
+                vspd0: vsp@fea20000 {
+                        compatible = "renesas,vsp2";
+                        reg = <0 0xfea20000 0 0x8000>;
+                        interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 623>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 623>;
+                        renesas,fcp = <&fcpvd0>;
+                };
+
+                fcpvd0: fcp@fea27000 {
+                        compatible = "renesas,fcpv";
+                        reg = <0 0xfea27000 0 0x200>;
+                        clocks = <&cpg CPG_MOD 603>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 603>;
+                        iommus = <&ipmmu_vi0 8>;
+                };
+
+                vspd1: vsp@fea28000 {
+                        compatible = "renesas,vsp2";
+                        reg = <0 0xfea28000 0 0x8000>;
+                        interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 622>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 622>;
+                        renesas,fcp = <&fcpvd1>;
+                };
+
+                fcpvd1: fcp@fea2f000 {
+                        compatible = "renesas,fcpv";
+                        reg = <0 0xfea2f000 0 0x200>;
+                        clocks = <&cpg CPG_MOD 602>;
+                        power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+                        resets = <&cpg 602>;
+                        iommus = <&ipmmu_vi0 9>;
+                };
+
+                du: display@feb00000 {
+                        compatible = "renesas,du-r8a77995";
+                        reg = <0 0xfeb00000 0 0x80000>;
+                        interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cpg CPG_MOD 724>,
+                                 <&cpg CPG_MOD 723>;
+                        clock-names = "du.0", "du.1";
+                        vsps = <&vspd0 0 &vspd1 0>;
+                        status = "disabled";
+
+                        ports {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                port@0 {
+                                        reg = <0>;
+                                        du_out_rgb: endpoint {
+                                        };
+                                };
+
+                                port@1 {
+                                        reg = <1>;
+                                        du_out_lvds0: endpoint {
+                                        };
+                                };
+
+                                port@2 {
+                                        reg = <2>;
+                                        du_out_lvds1: endpoint {
+                                        };
+                                };
+                        };
+                };
+        };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
+                                      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
         };
 };
diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
index c3fafb6025b3..2a7f36abd2dd 100644
--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
@@ -256,6 +256,7 @@
         pinctrl-0 = <&avb_pins>;
         pinctrl-names = "default";
         phy-handle = <&phy0>;
+        phy-mode = "rgmii-txid";
         status = "okay";
 
         phy0: ethernet-phy@0 {
@@ -338,6 +339,13 @@
 &i2c4 {
         status = "okay";
 
+        pca9654: gpio@20 {
+                compatible = "onnn,pca9654";
+                reg = <0x20>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
         csa_vdd: adc@7c {
                 compatible = "maxim,max9611";
                 reg = <0x7c>;
diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index 3e7a6b94e9f8..6f814845f8b6 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -146,6 +146,7 @@
         pinctrl-0 = <&avb_pins>;
         pinctrl-names = "default";
         phy-handle = <&phy0>;
+        phy-mode = "rgmii-txid";
         status = "okay";
 
         phy0: ethernet-phy@0 {
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
index ce2701e37d00..48a83f882947 100644
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -1,8 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-lion-haikou.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
@@ -10,4 +12,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
new file mode 100644
index 000000000000..246c317f6a68
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -0,0 +1,267 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd
+ */
+
+/dts-v1/;
+#include "rk3328.dtsi"
+
+/ {
+        model = "Firefly roc-rk3328-cc";
+        compatible = "firefly,roc-rk3328-cc", "rockchip,rk3328";
+
+        chosen {
+                stdout-path = "serial2:1500000n8";
+        };
+
+        gmac_clkin: external-gmac-clock {
+                compatible = "fixed-clock";
+                clock-frequency = <125000000>;
+                clock-output-names = "gmac_clkin";
+                #clock-cells = <0>;
+        };
+
+        dc_12v: dc-12v {
+                compatible = "regulator-fixed";
+                regulator-name = "dc_12v";
+                regulator-always-on;
+                regulator-boot-on;
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+        };
+
+        vcc_sd: sdmmc-regulator {
+                compatible = "regulator-fixed";
+                gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&sdmmc0m1_gpio>;
+                regulator-name = "vcc_sd";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                vin-supply = <&vcc_io>;
+        };
+
+        vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&usb20_host_drv>;
+                regulator-name = "vcc_host1_5v";
+                regulator-always-on;
+                vin-supply = <&vcc_sys>;
+        };
+
+        vcc_sys: vcc-sys {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc_sys";
+                regulator-always-on;
+                regulator-boot-on;
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                vin-supply = <&dc_12v>;
+        };
+
+        vcc_phy: vcc-phy-regulator {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc_phy";
+                regulator-always-on;
+                regulator-boot-on;
+        };
+};
+
+&cpu0 {
+        cpu-supply = <&vdd_arm>;
+};
+
+&emmc {
+        bus-width = <8>;
+        cap-mmc-highspeed;
+        non-removable;
+        pinctrl-names = "default";
+        pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
+        status = "okay";
+};
+
+&gmac2io {
+        assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+        assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
+        clock_in_out = "input";
+        phy-supply = <&vcc_phy>;
+        phy-mode = "rgmii";
+        pinctrl-names = "default";
+        pinctrl-0 = <&rgmiim1_pins>;
+        snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+        snps,reset-active-low;
+        snps,reset-delays-us = <0 10000 50000>;
+        tx_delay = <0x25>;
+        rx_delay = <0x11>;
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+
+        rk805: pmic@18 {
+                compatible = "rockchip,rk805";
+                reg = <0x18>;
+                interrupt-parent = <&gpio1>;
+                interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
+                #clock-cells = <1>;
+                clock-output-names = "xin32k", "rk805-clkout2";
+                gpio-controller;
+                #gpio-cells = <2>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pmic_int_l>;
+                rockchip,system-power-controller;
+                wakeup-source;
+
+                vcc1-supply = <&vcc_sys>;
+                vcc2-supply = <&vcc_sys>;
+                vcc3-supply = <&vcc_sys>;
+                vcc4-supply = <&vcc_sys>;
+                vcc5-supply = <&vcc_io>;
+                vcc6-supply = <&vcc_io>;
+
+                regulators {
+                        vdd_logic: DCDC_REG1 {
+                                regulator-name = "vdd_logic";
+                                regulator-min-microvolt = <712500>;
+                                regulator-max-microvolt = <1450000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1000000>;
+                                };
+                        };
+
+                        vdd_arm: DCDC_REG2 {
+                                regulator-name = "vdd_arm";
+                                regulator-min-microvolt = <712500>;
+                                regulator-max-microvolt = <1450000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <950000>;
+                                };
+                        };
+
+                        vcc_ddr: DCDC_REG3 {
+                                regulator-name = "vcc_ddr";
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
+                        };
+
+                        vcc_io: DCDC_REG4 {
+                                regulator-name = "vcc_io";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
+                        };
+
+                        vcc_18: LDO_REG1 {
+                                regulator-name = "vcc_18";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1800000>;
+                                };
+                        };
+
+                        vcc18_emmc: LDO_REG2 {
+                                regulator-name = "vcc18_emmc";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1800000>;
+                                };
+                        };
+
+                        vdd_10: LDO_REG3 {
+                                regulator-name = "vdd_10";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1000000>;
+                                };
+                        };
+                };
+        };
+};
+
+&pinctrl {
+        pmic {
+                pmic_int_l: pmic-int-l {
+                        rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
+                };
+        };
+
+        usb2 {
+                usb20_host_drv: usb20-host-drv {
+                        rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+};
+
+&sdmmc {
+        bus-width = <4>;
+        cap-mmc-highspeed;
+        cap-sd-highspeed;
+        disable-wp;
+        max-frequency = <150000000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
+        vmmc-supply = <&vcc_sd>;
+        status = "okay";
+};
+
+&tsadc {
+        status = "okay";
+};
+
+&u2phy {
+        status = "okay";
+};
+
+&u2phy_host {
+        status = "okay";
+};
+
+&u2phy_otg {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&usb20_otg {
+        status = "okay";
+};
+
+&usb_host0_ehci {
+        status = "okay";
+};
+
+&usb_host0_ohci {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index cae341554486..be2bfbc6b483 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -318,7 +318,7 @@
                 clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
                 clock-names = "baudclk", "apb_pclk";
                 dmas = <&dmac 2>, <&dmac 3>;
-                #dma-cells = <2>;
+                dma-names = "tx", "rx";
                 pinctrl-names = "default";
                 pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
                 reg-io-width = <4>;
@@ -333,7 +333,7 @@
                 clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
                 clock-names = "sclk_uart", "pclk_uart";
                 dmas = <&dmac 4>, <&dmac 5>;
-                #dma-cells = <2>;
+                dma-names = "tx", "rx";
                 pinctrl-names = "default";
                 pinctrl-0 = <&uart1_xfer &uart1_cts &uart1_rts>;
                 reg-io-width = <4>;
@@ -348,7 +348,7 @@
                 clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
                 clock-names = "baudclk", "apb_pclk";
                 dmas = <&dmac 6>, <&dmac 7>;
-                #dma-cells = <2>;
+                dma-names = "tx", "rx";
                 pinctrl-names = "default";
                 pinctrl-0 = <&uart2m1_xfer>;
                 reg-io-width = <4>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
new file mode 100644
index 000000000000..fca8e87d8f52
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Theobroma Systems Design und Consulting GmbH
+ */
+
+/dts-v1/;
+#include "rk3368-lion.dtsi"
+
+/ {
+        model = "Theobroma Systems RK3368-uQ7 Baseboard";
+        compatible = "tsd,rk3368-lion-haikou", "rockchip,rk3368";
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        i2cmux2 {
+                i2c@0 {
+                        eeprom: eeprom@50 {
+                                compatible = "atmel,24c01";
+                                pagesize = <8>;
+                                reg = <0x50>;
+                        };
+                };
+        };
+
+        leds {
+                pinctrl-0 = <&led_pins_module>, <&led_sd_haikou>;
+
+                sd-card-led {
+                        label = "sd_card_led";
+                        gpios = <&gpio0 RK_PD2 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "mmc0";
+                };
+        };
+
+        dc_12v: dc-12v {
+                compatible = "regulator-fixed";
+                regulator-name = "dc_12v";
+                regulator-always-on;
+                regulator-boot-on;
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+        };
+
+        vcc3v3_baseboard: vcc3v3-baseboard {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc3v3_baseboard";
+                regulator-always-on;
+                regulator-boot-on;
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                vin-supply = <&dc_12v>;
+        };
+
+        vcc5v0_otg: vcc5v0-otg-regulator {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&otg_vbus_drv>;
+                regulator-name = "vcc5v0_otg";
+                regulator-always-on;
+        };
+};
+
+&sdmmc {
+        bus-width = <4>;
+        cap-mmc-highspeed;
+        cap-sd-highspeed;
+        cd-gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>;
+        disable-wp;
+        max-frequency = <25000000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
+        rockchip,default-sample-phase = <90>;
+        vmmc-supply = <&vcc3v3_baseboard>;
+        status = "okay";
+};
+
+&spi2 {
+        cs-gpios = <0>, <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>;
+        status = "okay";
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
+        status = "okay";
+};
+
+&usb_otg {
+        dr_mode = "otg";
+        status = "okay";
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
+        status = "okay";
+};
+
+&uart1 {
+        /* alternate function of GPIO5/6 */
+        status = "disabled";
+};
+
+&pinctrl {
+        pinctrl-names = "default";
+        pinctrl-0 = <&haikou_pin_hog>;
+
+        hog {
+                haikou_pin_hog: haikou-pin-hog {
+                        rockchip,pins =
+                                /* LID_BTN */
+                                <RK_GPIO3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,
+                                /* BATLOW# */
+                                <RK_GPIO0 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>,
+                                /* SLP_BTN# */
+                                <RK_GPIO3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>,
+                                /* BIOS_DISABLE# */
+                                <RK_GPIO3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
+                };
+        };
+
+        leds {
+                led_sd_haikou: led-sd-gpio {
+                        rockchip,pins =
+                                <RK_GPIO0 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+
+        sdmmc {
+                sdmmc_cd_gpio: sdmmc-cd-gpio {
+                        rockchip,pins =
+                                <RK_GPIO2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+
+        usb_otg {
+                otg_vbus_drv: otg-vbus-drv {
+                        rockchip,pins =
+                                <RK_GPIO0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
new file mode 100644
index 000000000000..1315972412df
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
@@ -0,0 +1,317 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Theobroma Systems Design und Consulting GmbH
+ */
+
+/dts-v1/;
+#include "rk3368.dtsi"
+
+/ {
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+
+        ext_gmac: gmac-clk {
+                compatible = "fixed-clock";
+                clock-frequency = <125000000>;
+                clock-output-names = "ext_gmac";
+                #clock-cells = <0>;
+        };
+
+        i2cmux1 {
+                compatible = "i2c-mux-gpio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                i2c-parent = <&i2c1>;
+                mux-gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>;
+
+                /* Q7_GPO_I2C */
+                i2c@0 {
+                        reg = <0>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                /* Q7_SMB */
+                i2c@1 {
+                        reg = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+        };
+
+        i2cmux2 {
+                compatible = "i2c-mux-gpio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                i2c-parent = <&i2c2>;
+                mux-gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_HIGH>;
+
+                /* Q7_LVDS_BLC_I2C */
+                i2c@0 {
+                        reg = <0>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        fan: fan@18 {
+                                compatible = "ti,amc6821";
+                                reg = <0x18>;
+                                cooling-min-state = <0>;
+                                cooling-max-state = <9>;
+                                #cooling-cells = <2>;
+                        };
+
+                        rtc_twi: rtc@6f {
+                                compatible = "isil,isl1208";
+                                reg = <0x6f>;
+                        };
+                };
+
+                /* Q7_GP2_I2C */
+                i2c@1 {
+                        reg = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&led_pins_module>;
+
+                module_led1 {
+                        label = "module_led1";
+                        gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                        panic-indicator;
+                };
+
+                module_led2 {
+                        label = "module_led2";
+                        gpios = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+        };
+
+        vcc_sys: vcc-sys-regulator {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc_sys";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+};
+
+&cpu_l0 {
+        cpu-supply = <&vdd_cpu>;
+};
+
+&cpu_l1 {
+        cpu-supply = <&vdd_cpu>;
+};
+
+&cpu_l2 {
+        cpu-supply = <&vdd_cpu>;
+};
+
+&cpu_l3 {
+        cpu-supply = <&vdd_cpu>;
+};
+
+&cpu_b0 {
+        cpu-supply = <&vdd_cpu>;
+};
+
+&cpu_b1 {
+        cpu-supply = <&vdd_cpu>;
+};
+
+&cpu_b2 {
+        cpu-supply = <&vdd_cpu>;
+};
+
+&cpu_b3 {
+        cpu-supply = <&vdd_cpu>;
+};
+
+&emmc {
+        bus-width = <8>;
+        clock-frequency = <150000000>;
+        disable-wp;
+        mmc-hs200-1_8v;
+        non-removable;
+        vmmc-supply = <&vcc33_io>;
+        vqmmc-supply = <&vcc18_io>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_bus8>;
+        status = "okay";
+};
+
+&gmac {
+        assigned-clocks = <&cru SCLK_MAC>;
+        assigned-clock-parents = <&ext_gmac>;
+        clock_in_out = "input";
+        phy-supply = <&vcc33_io>;
+        phy-mode = "rgmii";
+        pinctrl-names = "default";
+        pinctrl-0 = <&rgmii_pins>;
+        snps,reset-active-low;
+        snps,reset-delays-us = <0 10000 50000>;
+        snps,reset-gpio = <&gpio3 RK_PB3 GPIO_ACTIVE_HIGH>;
+        tx_delay = <0x10>;
+        rx_delay = <0x10>;
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+
+        rk808: pmic@1b {
+                compatible = "rockchip,rk808";
+                reg = <0x1b>;
+                interrupt-parent = <&gpio0>;
+                interrupts = <RK_PA5 IRQ_TYPE_LEVEL_LOW>;
+                clock-output-names = "xin32k", "rk808-clkout2";
+                #clock-cells = <1>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pmic_int_l>, <&pmic_sleep>;
+                rockchip,system-power-controller;
+                vcc1-supply = <&vcc_sys>;
+                vcc2-supply = <&vcc_sys>;
+                vcc3-supply = <&vcc_sys>;
+                vcc4-supply = <&vcc_sys>;
+                vcc6-supply = <&vcc_sys>;
+                vcc7-supply = <&vcc_sys>;
+                vcc8-supply = <&vcc_sys>;
+                vcc9-supply = <&vcc_sys>;
+                vcc10-supply = <&vcc_sys>;
+                vcc11-supply = <&vcc_sys>;
+                vcc12-supply = <&vcc_sys>;
+
+                regulators {
+                        vdd_cpu: DCDC_REG1 {
+                                regulator-name = "vdd_cpu";
+                                regulator-min-microvolt = <700000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        vdd_log: DCDC_REG2 {
+                                regulator-name = "vdd_log";
+                                regulator-min-microvolt = <700000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        vcc_ddr: DCDC_REG3 {
+                                regulator-name = "vcc_ddr";
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        vcc33_io: DCDC_REG4 {
+                                regulator-name = "vcc33_io";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        vcc33_video: LDO_REG2 {
+                                regulator-name = "vcc33_video";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        vdd10_pll: LDO_REG3 {
+                                regulator-name = "vdd10_pll";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        vcc18_io: LDO_REG4 {
+                                regulator-name = "vcc18_io";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-boot-on;
+                        };
+
+                        vdd10_video: LDO_REG6 {
+                                regulator-name = "vdd10_video";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        vcc18_video: LDO_REG8 {
+                                regulator-name = "vcc18_video";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+                };
+        };
+};
+
+&i2c1 {
+        status = "okay";
+};
+
+&i2c2 {
+        status = "okay";
+};
+
+&pinctrl {
+        leds {
+                led_pins_module: led-module-gpio {
+                        rockchip,pins =
+                                <RK_GPIO2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
+                                <RK_GPIO3 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+        pmic {
+                pmic_int_l: pmic-int-l {
+                        rockchip,pins = <RK_GPIO0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+                };
+
+                pmic_sleep: pmic-sleep {
+                        rockchip,pins = <RK_GPIO0 RK_PA0 RK_FUNC_2 &pcfg_pull_none>;
+                };
+        };
+};
+
+&spi1 {
+        status = "okay";
+
+        norflash: flash@0 {
+                compatible = "jedec,spi-nor";
+                reg = <0>;
+                spi-max-frequency = <50000000>;
+        };
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&usb_host0_ehci {
+        status = "okay";
+};
+
+&wdt {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 204bdb9857b9..18f546f2dfd1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -516,10 +516,15 @@
                 compatible = "rockchip,rk3399-gru-sound";
                 rockchip,cpu = <&i2s0 &i2s2>;
                 rockchip,codec = <&max98357a &headsetcodec
-                                  &codec &wacky_spi_audio>;
+                                  &codec &wacky_spi_audio &cdn_dp>;
         };
 };
 
+&cdn_dp {
+        status = "okay";
+        extcon = <&usbc_extcon0>, <&usbc_extcon1>;
+};
+
 /*
  * Set some suspend operating points to avoid OVP in suspend
  *
@@ -582,7 +587,8 @@
                 <&cru PCLK_PERIHP>,
                 <&cru ACLK_PERILP0>, <&cru HCLK_PERILP0>,
                 <&cru PCLK_PERILP0>, <&cru ACLK_CCI>,
-                <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>;
+                <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
+                <&cru ACLK_VIO>;
         assigned-clock-rates =
                 <600000000>, <800000000>,
                 <1000000000>,
@@ -590,7 +596,8 @@
                 <37500000>,
                 <100000000>, <100000000>,
                 <50000000>, <800000000>,
-                <100000000>, <50000000>;
+                <100000000>, <50000000>,
+                <400000000>;
 };
 
 &emmc_phy {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
index 9a7486058455..7d3e8bfd51dd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
@@ -61,6 +61,30 @@
                 };
         };
 
+        i2s0-sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,format = "i2s";
+                simple-audio-card,name = "Haikou,I2S-codec";
+                simple-audio-card,mclk-fs = <512>;
+
+                simple-audio-card,codec {
+                        clocks = <&sgtl5000_clk>;
+                        sound-dai = <&sgtl5000>;
+                };
+
+                simple-audio-card,cpu {
+                        bitclock-master;
+                        frame-master;
+                        sound-dai = <&i2s0>;
+                };
+        };
+
+        sgtl5000_clk: sgtl5000-oscillator  {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency  = <24576000>;
+        };
+
         dc_12v: dc-12v {
                 compatible = "regulator-fixed";
                 regulator-name = "dc_12v";
@@ -80,6 +104,16 @@
                 vin-supply = <&dc_12v>;
         };
 
+        vcc5v0_baseboard: vcc5v0-baseboard {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc5v0_baseboard";
+                regulator-always-on;
+                regulator-boot-on;
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                vin-supply = <&dc_12v>;
+        };
+
         vcc5v0_otg: vcc5v0-otg-regulator {
                 compatible = "regulator-fixed";
                 enable-active-high;
@@ -89,6 +123,24 @@
                 regulator-name = "vcc5v0_otg";
                 regulator-always-on;
         };
+
+        vdda_codec: vdda-codec {
+                compatible = "regulator-fixed";
+                regulator-name = "vdda_codec";
+                regulator-boot-on;
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                vin-supply = <&vcc5v0_baseboard>;
+        };
+
+        vddd_codec: vddd-codec {
+                compatible = "regulator-fixed";
+                regulator-name = "vddd_codec";
+                regulator-boot-on;
+                regulator-min-microvolt = <1600000>;
+                regulator-max-microvolt = <1600000>;
+                vin-supply = <&vcc5v0_baseboard>;
+        };
 };
 
 &i2c1 {
@@ -110,6 +162,17 @@
 &i2c4 {
         status = "okay";
         clock-frequency = <400000>;
+
+        sgtl5000: codec@0a {
+                compatible = "fsl,sgtl5000";
+                reg = <0x0a>;
+                clocks = <&sgtl5000_clk>;
+                #sound-dai-cells = <0>;
+                VDDA-supply = <&vdda_codec>;
+                VDDIO-supply = <&vdda_codec>;
+                VDDD-supply = <&vddd_codec>;
+                status = "okay";
+        };
 };
 
 &i2c6 {
@@ -117,14 +180,6 @@
         clock-frequency = <400000>;
 };
 
-&i2s0 {
-        status = "okay";
-        rockchip,playback-channels = <8>;
-        rockchip,capture-channels = <8>;
-        #sound-dai-cells = <0>;
-        status = "okay";
-};
-
 &pcie_phy {
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 1fc5060d7027..4a2d06abe9c1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -435,6 +435,28 @@
         };
 };
 
+&i2s0 {
+        pinctrl-0 = <&i2s0_2ch_bus>;
+        rockchip,playback-channels = <2>;
+        rockchip,capture-channels = <2>;
+        #sound-dai-cells = <0>;
+        status = "okay";
+};
+
+/*
+ * As Q7 does not specify neither a global nor a RX clock for I2S these
+ * signals are not used. Furthermore I2S0_LRCK_RX is used as GPIO.
+ * Therefore we have to redefine the i2s0_2ch_bus definition to prevent
+ * conflicts.
+ */
+&i2s0_2ch_bus {
+        rockchip,pins =
+                <RK_GPIO3 RK_PD0 RK_FUNC_1 &pcfg_pull_none>,
+                <RK_GPIO3 RK_PD2 RK_FUNC_1 &pcfg_pull_none>,
+                <RK_GPIO3 RK_PD3 RK_FUNC_1 &pcfg_pull_none>,
+                <RK_GPIO3 RK_PD7 RK_FUNC_1 &pcfg_pull_none>;
+};
+
 &io_domains {
         status = "okay";
         bt656-supply = <&vcc_1v8>;
@@ -505,6 +527,12 @@
         };
 };
 
+&tsadc {
+        rockchip,hw-tshut-mode = <1>;
+        rockchip,hw-tshut-polarity = <1>;
+        status = "okay";
+};
+
 &u2phy1 {
         status = "okay";
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
index b7bd88fb3ae3..56952d1a3fb8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
@@ -41,7 +41,6 @@
  */
 
 /dts-v1/;
-#include <dt-bindings/input/input.h>
 #include "rk3399-sapphire.dtsi"
 
 / {
@@ -95,22 +94,6 @@
                 };
         };
 
-        keys: gpio-keys {
-                compatible = "gpio-keys";
-                autorepeat;
-
-                power {
-                        debounce-interval = <100>;
-                        gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
-                        label = "GPIO Power";
-                        linux,code = <KEY_POWER>;
-                        linux,input-type = <1>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pwr_btn>;
-                        wakeup-source;
-                };
-        };
-
         rt5651-sound {
                 compatible = "simple-audio-card";
                 simple-audio-card,name = "realtek,rt5651-codec";
@@ -207,18 +190,7 @@
         status = "okay";
 };
 
-&i2s2 {
-        #sound-dai-cells = <0>;
-        status = "okay";
-};
-
 &pinctrl {
-        buttons {
-                pwr_btn: pwr-btn {
-                        rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
-                };
-        };
-
         sdio-pwrseq {
                 wifi_enable_h: wifi-enable-h {
                         rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -232,6 +204,22 @@
         };
 };
 
+&sdio0 {
+        bus-width = <4>;
+        cap-sd-highspeed;
+        cap-sdio-irq;
+        clock-frequency = <50000000>;
+        disable-wp;
+        keep-power-in-suspend;
+        max-frequency = <50000000>;
+        mmc-pwrseq = <&sdio_pwrseq>;
+        non-removable;
+        pinctrl-names = "default";
+        pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
+        sd-uhs-sdr104;
+        status = "okay";
+};
+
 &spdif {
         i2c-scl-rising-time-ns = <450>;
         i2c-scl-falling-time-ns = <15>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts
new file mode 100644
index 000000000000..5a58060447cf
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dts
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd.
+ */
+
+/dts-v1/;
+#include "rk3399-sapphire.dtsi"
+
+/ {
+        model = "Sapphire-RK3399 Board";
+        compatible = "rockchip,rk3399-sapphire", "rockchip,rk3399";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index ce592a4c0c4c..e5daed7d2026 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -41,6 +41,7 @@
  */
 
 #include "dt-bindings/pwm/pwm.h"
+#include "dt-bindings/input/input.h"
 #include "rk3399.dtsi"
 #include "rk3399-opp.dtsi"
 
@@ -102,6 +103,22 @@
                 regulator-max-microvolt = <12000000>;
         };
 
+        keys: gpio-keys {
+                compatible = "gpio-keys";
+                autorepeat;
+
+                power {
+                        debounce-interval = <100>;
+                        gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
+                        label = "GPIO Power";
+                        linux,code = <KEY_POWER>;
+                        linux,input-type = <1>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pwr_btn>;
+                        wakeup-source;
+                };
+        };
+
         /* switched by pmic_sleep */
         vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
                 compatible = "regulator-fixed";
@@ -143,6 +160,17 @@
                 regulator-always-on;
                 vin-supply = <&vcc_sys>;
         };
+
+        vdd_log: vdd-log {
+                compatible = "pwm-regulator";
+                pwms = <&pwm2 0 25000 1>;
+                regulator-name = "vdd_log";
+                regulator-always-on;
+                regulator-boot-on;
+                regulator-min-microvolt = <800000>;
+                regulator-max-microvolt = <1400000>;
+                vin-supply = <&vcc_sys>;
+        };
 };
 
 &cpu_l0 {
@@ -421,17 +449,6 @@
                         regulator-off-in-suspend;
                 };
         };
-
-        vdd_log: vdd-log {
-                compatible = "pwm-regulator";
-                pwms = <&pwm2 0 25000 1>;
-                regulator-name = "vdd_log";
-                regulator-always-on;
-                regulator-boot-on;
-                regulator-min-microvolt = <800000>;
-                regulator-max-microvolt = <1400000>;
-                vin-supply = <&vcc_sys>;
-        };
 };
 
 &i2c3 {
@@ -440,6 +457,11 @@
         status = "okay";
 };
 
+&i2s2 {
+        #sound-dai-cells = <0>;
+        status = "okay";
+};
+
 &io_domains {
         status = "okay";
 
@@ -470,6 +492,12 @@
 };
 
 &pinctrl {
+        buttons {
+                pwr_btn: pwr-btn {
+                        rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+                };
+        };
+
         pmic {
                 pmic_int_l: pmic-int-l {
                         rockchip,pins =
@@ -513,29 +541,12 @@
 
 &sdhci {
         bus-width = <8>;
-        keep-power-in-suspend;
         mmc-hs400-1_8v;
         mmc-hs400-enhanced-strobe;
         non-removable;
         status = "okay";
 };
 
-&sdio0 {
-        bus-width = <4>;
-        cap-sd-highspeed;
-        cap-sdio-irq;
-        clock-frequency = <50000000>;
-        disable-wp;
-        keep-power-in-suspend;
-        max-frequency = <50000000>;
-        mmc-pwrseq = <&sdio_pwrseq>;
-        non-removable;
-        pinctrl-names = "default";
-        pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
-        sd-uhs-sdr104;
-        status = "okay";
-};
-
 &sdmmc {
         bus-width = <4>;
         cap-mmc-highspeed;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 0b81ca1d07e7..4550c0f82be9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -457,6 +457,42 @@
                 };
         };
 
+        cdn_dp: dp@fec00000 {
+                compatible = "rockchip,rk3399-cdn-dp";
+                reg = <0x0 0xfec00000 0x0 0x100000>;
+                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH 0>;
+                assigned-clocks = <&cru SCLK_DP_CORE>;
+                assigned-clock-rates = <100000000>;
+                clocks = <&cru SCLK_DP_CORE>, <&cru PCLK_DP_CTRL>,
+                         <&cru SCLK_SPDIF_REC_DPTX>, <&cru PCLK_VIO_GRF>;
+                clock-names = "core-clk", "pclk", "spdif", "grf";
+                phys = <&tcphy0_dp>, <&tcphy1_dp>;
+                power-domains = <&power RK3399_PD_HDCP>;
+                resets = <&cru SRST_DPTX_SPDIF_REC>, <&cru SRST_P_UPHY0_DPTX>,
+                         <&cru SRST_P_UPHY0_APB>, <&cru SRST_DP_CORE>;
+                reset-names = "spdif", "dptx", "apb", "core";
+                rockchip,grf = <&grf>;
+                #sound-dai-cells = <1>;
+                status = "disabled";
+
+                ports {
+                        dp_in: port {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                dp_in_vopb: endpoint@0 {
+                                        reg = <0>;
+                                        remote-endpoint = <&vopb_out_dp>;
+                                };
+
+                                dp_in_vopl: endpoint@1 {
+                                        reg = <1>;
+                                        remote-endpoint = <&vopl_out_dp>;
+                                };
+                        };
+                };
+        };
+
         gic: interrupt-controller@fee00000 {
                 compatible = "arm,gic-v3";
                 #interrupt-cells = <4>;
@@ -1286,7 +1322,8 @@
                         <&cru PCLK_PERIHP>,
                         <&cru ACLK_PERILP0>, <&cru HCLK_PERILP0>,
                         <&cru PCLK_PERILP0>, <&cru ACLK_CCI>,
-                        <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>;
+                        <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>,
+                        <&cru ACLK_VIO>;
                 assigned-clock-rates =
                          <594000000>,  <800000000>,
                         <1000000000>,
@@ -1294,7 +1331,8 @@
                           <37500000>,
                          <100000000>,  <100000000>,
                           <50000000>, <600000000>,
-                         <100000000>,   <50000000>;
+                         <100000000>,   <50000000>,
+                         <400000000>;
         };
 
         grf: syscon@ff770000 {
@@ -1547,6 +1585,11 @@
                                 reg = <3>;
                                 remote-endpoint = <&mipi1_in_vopl>;
                         };
+
+                        vopl_out_dp: endpoint@4 {
+                                reg = <4>;
+                                remote-endpoint = <&dp_in_vopl>;
+                        };
                 };
         };
 
@@ -1599,6 +1642,11 @@
                                 reg = <3>;
                                 remote-endpoint = <&mipi1_in_vopb>;
                         };
+
+                        vopb_out_dp: endpoint@4 {
+                                reg = <4>;
+                                remote-endpoint = <&dp_in_vopb>;
+                        };
                 };
         };
 
@@ -2043,6 +2091,16 @@
                 };
 
                 i2s0 {
+                        i2s0_2ch_bus: i2s0-2ch-bus {
+                                rockchip,pins =
+                                        <3 24 RK_FUNC_1 &pcfg_pull_none>,
+                                        <3 25 RK_FUNC_1 &pcfg_pull_none>,
+                                        <3 26 RK_FUNC_1 &pcfg_pull_none>,
+                                        <3 27 RK_FUNC_1 &pcfg_pull_none>,
+                                        <3 31 RK_FUNC_1 &pcfg_pull_none>,
+                                        <4 0 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
                         i2s0_8ch_bus: i2s0-8ch-bus {
                                 rockchip,pins =
                                         <3 24 RK_FUNC_1 &pcfg_pull_none>,
@@ -2293,6 +2351,23 @@
                         };
                 };
 
+                testclk {
+                        test_clkout0: test-clkout0 {
+                                rockchip,pins =
+                                        <0 0 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
+                        test_clkout1: test-clkout1 {
+                                rockchip,pins =
+                                        <2 25 RK_FUNC_2 &pcfg_pull_none>;
+                        };
+
+                        test_clkout2: test-clkout2 {
+                                rockchip,pins =
+                                        <0 8 RK_FUNC_3 &pcfg_pull_none>;
+                        };
+                };
+
                 tsadc {
                         otp_gpio: otp-gpio {
                                 rockchip,pins = <1 6 RK_FUNC_GPIO &pcfg_pull_none>;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
index 2452b2243f42..9b4dc41703e3 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
@@ -1,14 +1,13 @@
-/*
- * Device Tree Source for UniPhier LD11 Global Board
- *
- * Copyright (C) 2016-2017 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *           Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD11 Global Board
+//
+// Copyright (C) 2016-2017 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+//           Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
 
 /dts-v1/;
+#include <dt-bindings/gpio/uniphier-gpio.h>
 #include "uniphier-ld11.dtsi"
 
 / {
@@ -37,6 +36,53 @@
                 device_type = "memory";
                 reg = <0 0x80000000 0 0x40000000>;
         };
+
+        dvdd_reg: reg-fixed {
+                compatible = "regulator-fixed";
+                regulator-name = "DVDD";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        amp_vcc_reg: reg-fixed {
+                compatible = "regulator-fixed";
+                regulator-name = "AMP_VCC";
+                regulator-min-microvolt = <24000000>;
+                regulator-max-microvolt = <24000000>;
+        };
+
+        sound {
+                compatible = "audio-graph-card";
+                label = "UniPhier LD11";
+                widgets = "Headphone", "Headphone Jack";
+                dais = <&i2s_port2
+                        &i2s_port3
+                        &i2s_port4
+                        &spdif_port0
+                        &comp_spdif_port0>;
+        };
+
+        spdif-out {
+                compatible = "linux,spdif-dit";
+                #sound-dai-cells = <0>;
+
+                port@0 {
+                        spdif_tx: endpoint {
+                                remote-endpoint = <&spdif_hiecout1>;
+                        };
+                };
+        };
+
+        comp-spdif-out {
+                compatible = "linux,spdif-dit";
+                #sound-dai-cells = <0>;
+
+                port@0 {
+                        comp_spdif_tx: endpoint {
+                                remote-endpoint = <&comp_spdif_hiecout1>;
+                        };
+                };
+        };
 };
 
 &serial0 {
@@ -47,9 +93,43 @@
         status = "okay";
 };
 
+&i2s_hpcmout1 {
+        dai-format = "i2s";
+        remote-endpoint = <&tas_speaker>;
+};
+
+&spdif_hiecout1 {
+        remote-endpoint = <&spdif_tx>;
+};
+
+&comp_spdif_hiecout1 {
+        remote-endpoint = <&comp_spdif_tx>;
+};
+
 &i2c0 {
         status = "okay";
 
+        tas5707a@1d {
+                compatible = "ti,tas5711";
+                reg = <0x1d>;
+                reset-gpios = <&gpio UNIPHIER_GPIO_PORT(23, 4) GPIO_ACTIVE_LOW>;
+                pdn-gpios = <&gpio UNIPHIER_GPIO_PORT(23, 5) GPIO_ACTIVE_LOW>;
+                #sound-dai-cells = <0>;
+                AVDD-supply = <&dvdd_reg>;
+                DVDD-supply = <&dvdd_reg>;
+                PVDD_A-supply = <&amp_vcc_reg>;
+                PVDD_B-supply = <&amp_vcc_reg>;
+                PVDD_C-supply = <&amp_vcc_reg>;
+                PVDD_D-supply = <&amp_vcc_reg>;
+
+                port@0 {
+                        tas_speaker: endpoint {
+                                dai-format = "i2s";
+                                remote-endpoint = <&i2s_hpcmout1>;
+                        };
+                };
+        };
+
         eeprom@50 {
                 compatible = "st,24c64", "atmel,24c64";
                 reg = <0x50>;
@@ -69,6 +149,17 @@
         status = "okay";
 };
 
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@1 {
+                reg = <1>;
+        };
+};
+
 &nand {
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
index 54c53170699a..b8f627348448 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD11 Reference Board
- *
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD11 Reference Board
+//
+// Copyright (C) 2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-ld11.dtsi"
@@ -70,3 +68,14 @@
 &usb2 {
         status = "okay";
 };
+
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@1 {
+                reg = <1>;
+        };
+};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index cd7c2d0a1f64..e62bda1cf2d9 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD11 SoC
- *
- * Copyright (C) 2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD11 SoC
+//
+// Copyright (C) 2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/uniphier-gpio.h>
@@ -187,6 +185,92 @@
                                                      <21 217 3>;
                 };
 
+                audio@56000000 {
+                        compatible = "socionext,uniphier-ld11-aio";
+                        reg = <0x56000000 0x80000>;
+                        interrupts = <0 144 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_aout1>,
+                                    <&pinctrl_aoutiec1>;
+                        clock-names = "aio";
+                        clocks = <&sys_clk 40>;
+                        reset-names = "aio";
+                        resets = <&sys_rst 40>;
+                        #sound-dai-cells = <1>;
+                        socionext,syscon = <&soc_glue>;
+
+                        i2s_port0: port@0 {
+                                i2s_hdmi: endpoint {
+                                };
+                        };
+
+                        i2s_port1: port@1 {
+                                i2s_pcmin2: endpoint {
+                                };
+                        };
+
+                        i2s_port2: port@2 {
+                                i2s_line: endpoint {
+                                        dai-format = "i2s";
+                                        remote-endpoint = <&evea_line>;
+                                };
+                        };
+
+                        i2s_port3: port@3 {
+                                i2s_hpcmout1: endpoint {
+                                };
+                        };
+
+                        i2s_port4: port@4 {
+                                i2s_hp: endpoint {
+                                        dai-format = "i2s";
+                                        remote-endpoint = <&evea_hp>;
+                                };
+                        };
+
+                        spdif_port0: port@5 {
+                                spdif_hiecout1: endpoint {
+                                };
+                        };
+
+                        src_port0: port@6 {
+                                i2s_epcmout2: endpoint {
+                                };
+                        };
+
+                        src_port1: port@7 {
+                                i2s_epcmout3: endpoint {
+                                };
+                        };
+
+                        comp_spdif_port0: port@8 {
+                                comp_spdif_hiecout1: endpoint {
+                                };
+                        };
+                };
+
+                codec@57900000 {
+                        compatible = "socionext,uniphier-evea";
+                        reg = <0x57900000 0x1000>;
+                        clock-names = "evea", "exiv";
+                        clocks = <&sys_clk 41>, <&sys_clk 42>;
+                        reset-names = "evea", "exiv", "adamv";
+                        resets = <&sys_rst 41>, <&sys_rst 42>, <&adamv_rst 0>;
+                        #sound-dai-cells = <1>;
+
+                        port@0 {
+                                evea_line: endpoint {
+                                        remote-endpoint = <&i2s_line>;
+                                };
+                        };
+
+                        port@1 {
+                                evea_hp: endpoint {
+                                        remote-endpoint = <&i2s_hp>;
+                                };
+                        };
+                };
+
                 adamv@57920000 {
                         compatible = "socionext,uniphier-ld11-adamv",
                                      "simple-mfd", "syscon";
@@ -396,7 +480,7 @@
                         };
                 };
 
-                soc-glue@5f800000 {
+                soc_glue: soc-glue@5f800000 {
                         compatible = "socionext,uniphier-ld11-soc-glue",
                                      "simple-mfd", "syscon";
                         reg = <0x5f800000 0x2000>;
@@ -460,6 +544,22 @@
                         };
                 };
 
+                eth: ethernet@65000000 {
+                        compatible = "socionext,uniphier-ld11-ave4";
+                        status = "disabled";
+                        reg = <0x65000000 0x8500>;
+                        interrupts = <0 66 4>;
+                        clocks = <&sys_clk 6>;
+                        resets = <&sys_rst 6>;
+                        phy-mode = "rmii";
+                        local-mac-address = [00 00 00 00 00 00];
+
+                        mdio: mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
                 nand: nand@68000000 {
                         compatible = "socionext,uniphier-denali-nand-v5b";
                         status = "disabled";
@@ -475,3 +575,12 @@
 };
 
 #include "uniphier-pinctrl.dtsi"
+
+&pinctrl_aoutiec1 {
+        drive-strength = <4>;   /* default: 4mA */
+
+        ao1arc {
+                pins = "AO1ARC";
+                drive-strength = <8>;   /* 8mA */
+        };
+};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
index fc2bc9d75d35..fe6608ea3277 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
@@ -1,14 +1,13 @@
-/*
- * Device Tree Source for UniPhier LD20 Global Board
- *
- * Copyright (C) 2015-2017 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *           Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD20 Global Board
+//
+// Copyright (C) 2015-2017 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+//           Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
 
 /dts-v1/;
+#include <dt-bindings/gpio/uniphier-gpio.h>
 #include "uniphier-ld20.dtsi"
 
 / {
@@ -37,6 +36,53 @@
                 device_type = "memory";
                 reg = <0 0x80000000 0 0xc0000000>;
         };
+
+        dvdd_reg: reg-fixed {
+                compatible = "regulator-fixed";
+                regulator-name = "DVDD";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+        };
+
+        amp_vcc_reg: reg-fixed {
+                compatible = "regulator-fixed";
+                regulator-name = "AMP_VCC";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+        };
+
+        sound {
+                compatible = "audio-graph-card";
+                label = "UniPhier LD20";
+                widgets = "Headphone", "Headphone Jack";
+                dais = <&i2s_port2
+                        &i2s_port3
+                        &i2s_port4
+                        &spdif_port0
+                        &comp_spdif_port0>;
+        };
+
+        spdif-out {
+                compatible = "linux,spdif-dit";
+                #sound-dai-cells = <0>;
+
+                port@0 {
+                        spdif_tx: endpoint {
+                                remote-endpoint = <&spdif_hiecout1>;
+                        };
+                };
+        };
+
+        comp-spdif-out {
+                compatible = "linux,spdif-dit";
+                #sound-dai-cells = <0>;
+
+                port@0 {
+                        comp_spdif_tx: endpoint {
+                                remote-endpoint = <&comp_spdif_hiecout1>;
+                        };
+                };
+        };
 };
 
 &serial0 {
@@ -47,8 +93,55 @@
         status = "okay";
 };
 
+&i2s_hpcmout1 {
+        dai-format = "i2s";
+        remote-endpoint = <&tas_speaker>;
+};
+
+&spdif_hiecout1 {
+        remote-endpoint = <&spdif_tx>;
+};
+
+&comp_spdif_hiecout1 {
+        remote-endpoint = <&comp_spdif_tx>;
+};
+
 &i2c0 {
         status = "okay";
+
+        tas5707@1b {
+                compatible = "ti,tas5711";
+                reg = <0x1b>;
+                reset-gpios = <&gpio UNIPHIER_GPIO_PORT(0, 0) GPIO_ACTIVE_LOW>;
+                pdn-gpios = <&gpio UNIPHIER_GPIO_PORT(0, 1) GPIO_ACTIVE_LOW>;
+                #sound-dai-cells = <0>;
+                AVDD-supply = <&dvdd_reg>;
+                DVDD-supply = <&dvdd_reg>;
+                PVDD_A-supply = <&amp_vcc_reg>;
+                PVDD_B-supply = <&amp_vcc_reg>;
+                PVDD_C-supply = <&amp_vcc_reg>;
+                PVDD_D-supply = <&amp_vcc_reg>;
+
+                port@0 {
+                        tas_speaker: endpoint {
+                                dai-format = "i2s";
+                                remote-endpoint = <&i2s_hpcmout1>;
+                        };
+                };
+        };
+};
+
+&eth {
+        status = "okay";
+        phy-mode = "rmii";
+        pinctrl-0 = <&pinctrl_ether_rmii>;
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@1 {
+                reg = <1>;
+        };
 };
 
 &nand {
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index 693371033c90..2c1a92fafbfb 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD20 Reference Board
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD20 Reference Board
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-ld20.dtsi"
@@ -58,3 +56,14 @@
 &i2c0 {
         status = "okay";
 };
+
+&eth {
+        status = "okay";
+        phy-handle = <&ethphy>;
+};
+
+&mdio {
+        ethphy: ethphy@0 {
+                reg = <0>;
+        };
+};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index 8a3276ba2da1..9efe20d07589 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier LD20 SoC
- *
- * Copyright (C) 2015-2016 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier LD20 SoC
+//
+// Copyright (C) 2015-2016 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/uniphier-gpio.h>
@@ -287,6 +285,92 @@
                                                      <21 217 3>;
                 };
 
+                audio@56000000 {
+                        compatible = "socionext,uniphier-ld20-aio";
+                        reg = <0x56000000 0x80000>;
+                        interrupts = <0 144 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_aout1>,
+                                    <&pinctrl_aoutiec1>;
+                        clock-names = "aio";
+                        clocks = <&sys_clk 40>;
+                        reset-names = "aio";
+                        resets = <&sys_rst 40>;
+                        #sound-dai-cells = <1>;
+                        socionext,syscon = <&soc_glue>;
+
+                        i2s_port0: port@0 {
+                                i2s_hdmi: endpoint {
+                                };
+                        };
+
+                        i2s_port1: port@1 {
+                                i2s_pcmin2: endpoint {
+                                };
+                        };
+
+                        i2s_port2: port@2 {
+                                i2s_line: endpoint {
+                                        dai-format = "i2s";
+                                        remote-endpoint = <&evea_line>;
+                                };
+                        };
+
+                        i2s_port3: port@3 {
+                                i2s_hpcmout1: endpoint {
+                                };
+                        };
+
+                        i2s_port4: port@4 {
+                                i2s_hp: endpoint {
+                                        dai-format = "i2s";
+                                        remote-endpoint = <&evea_hp>;
+                                };
+                        };
+
+                        spdif_port0: port@5 {
+                                spdif_hiecout1: endpoint {
+                                };
+                        };
+
+                        src_port0: port@6 {
+                                i2s_epcmout2: endpoint {
+                                };
+                        };
+
+                        src_port1: port@7 {
+                                i2s_epcmout3: endpoint {
+                                };
+                        };
+
+                        comp_spdif_port0: port@8 {
+                                comp_spdif_hiecout1: endpoint {
+                                };
+                        };
+                };
+
+                codec@57900000 {
+                        compatible = "socionext,uniphier-evea";
+                        reg = <0x57900000 0x1000>;
+                        clock-names = "evea", "exiv";
+                        clocks = <&sys_clk 41>, <&sys_clk 42>;
+                        reset-names = "evea", "exiv", "adamv";
+                        resets = <&sys_rst 41>, <&sys_rst 42>, <&adamv_rst 0>;
+                        #sound-dai-cells = <1>;
+
+                        port@0 {
+                                evea_line: endpoint {
+                                        remote-endpoint = <&i2s_line>;
+                                };
+                        };
+
+                        port@1 {
+                                evea_hp: endpoint {
+                                        remote-endpoint = <&i2s_hp>;
+                                };
+                        };
+                };
+
                 adamv@57920000 {
                         compatible = "socionext,uniphier-ld20-adamv",
                                      "simple-mfd", "syscon";
@@ -442,7 +526,7 @@
                         cdns,phy-dll-delay-sdclk-hsmmc = <21>;
                 };
 
-                soc-glue@5f800000 {
+                soc_glue: soc-glue@5f800000 {
                         compatible = "socionext,uniphier-ld20-soc-glue",
                                      "simple-mfd", "syscon";
                         reg = <0x5f800000 0x2000>;
@@ -513,6 +597,24 @@
                         };
                 };
 
+                eth: ethernet@65000000 {
+                        compatible = "socionext,uniphier-ld20-ave4";
+                        status = "disabled";
+                        reg = <0x65000000 0x8500>;
+                        interrupts = <0 66 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ether_rgmii>;
+                        clocks = <&sys_clk 6>;
+                        resets = <&sys_rst 6>;
+                        phy-mode = "rgmii";
+                        local-mac-address = [00 00 00 00 00 00];
+
+                        mdio: mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
                 nand: nand@68000000 {
                         compatible = "socionext,uniphier-denali-nand-v5b";
                         status = "disabled";
@@ -528,3 +630,21 @@
 };
 
 #include "uniphier-pinctrl.dtsi"
+
+&pinctrl_aout1 {
+        drive-strength = <4>;   /* default: 3.5mA */
+
+        ao1dacck {
+                pins = "AO1DACCK";
+                drive-strength = <5>;   /* 5mA */
+        };
+};
+
+&pinctrl_aoutiec1 {
+        drive-strength = <4>;   /* default: 3.5mA */
+
+        ao1arc {
+                pins = "AO1ARC";
+                drive-strength = <11>;  /* 11mA */
+        };
+};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
index 3c7108729827..c1bb607bd211 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier PXs3 Reference Board
- *
- * Copyright (C) 2017 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier PXs3 Reference Board
+//
+// Copyright (C) 2017 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 /dts-v1/;
 #include "uniphier-pxs3.dtsi"
@@ -77,6 +75,28 @@
         status = "okay";
 };
 
+&eth0 {
+        status = "okay";
+        phy-handle = <&ethphy0>;
+};
+
+&mdio0 {
+        ethphy0: ethphy@0 {
+                reg = <0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        phy-handle = <&ethphy1>;
+};
+
+&mdio1 {
+        ethphy1: ethphy@0 {
+                reg = <0>;
+        };
+};
+
 &nand {
         status = "okay";
 };
diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
index 234fc58cc599..7c8f710d9bfa 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
@@ -1,11 +1,9 @@
-/*
- * Device Tree Source for UniPhier PXs3 SoC
- *
- * Copyright (C) 2017 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
- */
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+//
+// Device Tree Source for UniPhier PXs3 SoC
+//
+// Copyright (C) 2017 Socionext Inc.
+//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/gpio/uniphier-gpio.h>
@@ -407,6 +405,42 @@
                         };
                 };
 
+                eth0: ethernet@65000000 {
+                        compatible = "socionext,uniphier-pxs3-ave4";
+                        status = "disabled";
+                        reg = <0x65000000 0x8500>;
+                        interrupts = <0 66 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ether_rgmii>;
+                        clocks = <&sys_clk 6>;
+                        resets = <&sys_rst 6>;
+                        phy-mode = "rgmii";
+                        local-mac-address = [00 00 00 00 00 00];
+
+                        mdio0: mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
+                eth1: ethernet@65200000 {
+                        compatible = "socionext,uniphier-pxs3-ave4";
+                        status = "disabled";
+                        reg = <0x65200000 0x8500>;
+                        interrupts = <0 67 4>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ether1_rgmii>;
+                        clocks = <&sys_clk 7>;
+                        resets = <&sys_rst 7>;
+                        phy-mode = "rgmii";
+                        local-mac-address = [00 00 00 00 00 00];
+
+                        mdio1: mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+
                 nand: nand@68000000 {
                         compatible = "socionext,uniphier-denali-nand-v5b";
                         status = "disabled";
diff --git a/arch/arm64/boot/dts/sprd/sc2731.dtsi b/arch/arm64/boot/dts/sprd/sc2731.dtsi
new file mode 100644
index 000000000000..4331006185bf
--- /dev/null
+++ b/arch/arm64/boot/dts/sprd/sc2731.dtsi
@@ -0,0 +1,169 @@
+/*
+ * Spreadtrum SC2731 PMIC dts file
+ *
+ * Copyright (C) 2018, Spreadtrum Communications Inc.
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ */
+
+&adi_bus {
+        sc2731_pmic: pmic@0 {
+                compatible = "sprd,sc2731";
+                reg = <0>;
+                spi-max-frequency = <26000000>;
+                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                rtc@280 {
+                        compatible = "sprd,sc27xx-rtc", "sprd,sc2731-rtc";
+                        reg = <0x280>;
+                        interrupt-parent = <&sc2731_pmic>;
+                        interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
+                };
+
+                regulators {
+                        compatible = "sprd,sc27xx-regulator";
+
+                        vddarm0: BUCK_CPU0 {
+                                regulator-name = "vddarm0";
+                                regulator-min-microvolt = <400000>;
+                                regulator-max-microvolt = <1996875>;
+                                regulator-ramp-delay = <25000>;
+                                regulator-always-on;
+                        };
+
+                        vddarm1: BUCK_CPU1 {
+                                regulator-name = "vddarm1";
+                                regulator-min-microvolt = <400000>;
+                                regulator-max-microvolt = <1996875>;
+                                regulator-ramp-delay = <25000>;
+                                regulator-always-on;
+                        };
+
+                        dcdcrf: BUCK_RF {
+                                regulator-name = "dcdcrf";
+                                regulator-min-microvolt = <600000>;
+                                regulator-max-microvolt = <2196875>;
+                                regulator-ramp-delay = <25000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-always-on;
+                        };
+
+                        vddcama0: LDO_CAMA0 {
+                                regulator-name = "vddcama0";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                        };
+
+                        vddcama1: LDO_CAMA1 {
+                                regulator-name = "vddcama1";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddcammot: LDO_CAMMOT {
+                                regulator-name = "vddcammot";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddvldo: LDO_VLDO {
+                                regulator-name = "vddvldo";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddemmccore: LDO_EMMCCORE {
+                                regulator-name = "vddemmccore";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                                regulator-boot-on;
+                        };
+
+                        vddsdcore: LDO_SDCORE {
+                                regulator-name = "vddsdcore";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddsdio: LDO_SDIO {
+                                regulator-name = "vddsdio";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddwifipa: LDO_WIFIPA {
+                                regulator-name = "vddwifipa";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddusb33: LDO_USB33 {
+                                regulator-name = "vddusb33";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <3750000>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddcamd0: LDO_CAMD0 {
+                                regulator-name = "vddcamd0";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1793750>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddcamd1: LDO_CAMD1 {
+                                regulator-name = "vddcamd1";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1793750>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddcon: LDO_CON {
+                                regulator-name = "vddcon";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1793750>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddcamio: LDO_CAMIO {
+                                regulator-name = "vddcamio";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1793750>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                        };
+
+                        vddsram: LDO_SRAM {
+                                regulator-name = "vddsram";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1793750>;
+                                regulator-enable-ramp-delay = <100>;
+                                regulator-ramp-delay = <25000>;
+                                regulator-always-on;
+                        };
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts
index ae0b28ce6319..985ebb5d157e 100644
--- a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts
+++ b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts
@@ -9,6 +9,7 @@
 /dts-v1/;
 
 #include "sc9860.dtsi"
+#include "sc2731.dtsi"
 
 / {
         model = "Spreadtrum SP9860G 3GFHD Board";
@@ -20,6 +21,7 @@
                 serial1 = &uart1; /* UART console */
                 serial2 = &uart2; /* Reserved */
                 serial3 = &uart3; /* for GPS */
+                spi0 = &adi_bus;
         };
 
         memory{
diff --git a/arch/arm64/boot/dts/sprd/whale2.dtsi b/arch/arm64/boot/dts/sprd/whale2.dtsi
index 328009c4638c..66a881e6da92 100644
--- a/arch/arm64/boot/dts/sprd/whale2.dtsi
+++ b/arch/arm64/boot/dts/sprd/whale2.dtsi
@@ -6,6 +6,8 @@
  * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
+#include <dt-bindings/clock/sprd,sc9860-clk.h>
+
 / {
         interrupt-parent = <&gic>;
         #address-cells = <2>;
@@ -104,6 +106,85 @@
                                 status = "disabled";
                         };
                 };
+
+                ap-ahb {
+                        compatible = "simple-bus";
+                        #address-cells = <2>;
+                        #size-cells = <2>;
+                        ranges;
+
+                        ap_dma: dma-controller@20100000 {
+                                compatible = "sprd,sc9860-dma";
+                                reg = <0 0x20100000 0 0x4000>;
+                                interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+                                #dma-cells = <1>;
+                                #dma-channels = <32>;
+                                clock-names = "enable";
+                                clocks = <&apahb_gate CLK_DMA_EB>;
+                        };
+                };
+
+                aon {
+                        compatible = "simple-bus";
+                        #address-cells = <2>;
+                        #size-cells = <2>;
+                        ranges;
+
+                        adi_bus: spi@40030000 {
+                                compatible = "sprd,sc9860-adi";
+                                reg = <0 0x40030000 0 0x10000>;
+                                hwlocks = <&hwlock 0>;
+                                hwlock-names = "adi";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+
+                        timer@40050000 {
+                                compatible = "sprd,sc9860-timer";
+                                reg = <0 0x40050000 0 0x20>;
+                                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&ext_32k>;
+                        };
+
+                        hwlock: hwspinlock@40500000 {
+                                compatible = "sprd,hwspinlock-r3p0";
+                                reg = <0 0x40500000 0 0x1000>;
+                                #hwlock-cells = <1>;
+                                clock-names = "enable";
+                                clocks = <&aon_gate CLK_SPLK_EB>;
+                        };
+
+                        pin_controller: pinctrl@402a0000 {
+                                compatible = "sprd,sc9860-pinctrl";
+                                reg = <0 0x402a0000 0 0x10000>;
+                        };
+
+                        watchdog@40310000 {
+                                compatible = "sprd,sp9860-wdt";
+                                reg = <0 0x40310000 0 0x1000>;
+                                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+                                timeout-sec = <12>;
+                                clock-names = "enable";
+                                clocks = <&aon_gate CLK_APCPU_WDG_EB>;
+                        };
+                };
+
+                agcp {
+                        compatible = "simple-bus";
+                        #address-cells = <2>;
+                        #size-cells = <2>;
+                        ranges;
+
+                        agcp_dma: dma-controller@41580000 {
+                                compatible = "sprd,sc9860-dma";
+                                reg = <0 0x41580000 0 0x4000>;
+                                #dma-cells = <1>;
+                                #dma-channels = <32>;
+                                clock-names = "enable", "ashb_eb";
+                                clocks = <&agcp_gate CLK_AGCP_DMAAP_EB>,
+                                       <&agcp_gate CLK_AGCP_AP_ASHB_EB>;
+                        };
+                };
         };
 
         ext_32k: ext_32k {
diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile
index a2d67084a514..c2a0c00272e2 100644
--- a/arch/arm64/boot/dts/xilinx/Makefile
+++ b/arch/arm64/boot/dts/xilinx/Makefile
@@ -1 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-ep108.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1232-revA.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1254-revA.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1275-revA.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1751-xm015-dc1.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1751-xm016-dc2.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1751-xm017-dc3.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1751-xm018-dc4.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zc1751-xm019-dc5.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu100-revC.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-revA.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-revB.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu102-rev1.0.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu104-revA.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu106-revA.dtb
+dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu111-revA.dtb
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi
new file mode 100644
index 000000000000..9c09baca7dd7
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi
@@ -0,0 +1,213 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Clock specification for Xilinx ZynqMP
+ *
+ * (C) Copyright 2015 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/ {
+        clk100: clk100 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <100000000>;
+        };
+
+        clk125: clk125 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <125000000>;
+        };
+
+        clk200: clk200 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <200000000>;
+        };
+
+        clk250: clk250 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <250000000>;
+        };
+
+        clk300: clk300 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <300000000>;
+        };
+
+        clk600: clk600 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <600000000>;
+        };
+
+        dp_aclk: clock0 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <100000000>;
+                clock-accuracy = <100>;
+        };
+
+        dp_aud_clk: clock1 {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <24576000>;
+                clock-accuracy = <100>;
+        };
+
+        dpdma_clk: dpdma_clk {
+                compatible = "fixed-clock";
+                #clock-cells = <0x0>;
+                clock-frequency = <533000000>;
+        };
+
+        drm_clock: drm_clock {
+                compatible = "fixed-clock";
+                #clock-cells = <0x0>;
+                clock-frequency = <262750000>;
+                clock-accuracy = <0x64>;
+        };
+};
+
+&can0 {
+        clocks = <&clk100 &clk100>;
+};
+
+&can1 {
+        clocks = <&clk100 &clk100>;
+};
+
+&fpd_dma_chan1 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan2 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan3 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan4 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan5 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan6 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan7 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&fpd_dma_chan8 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&lpd_dma_chan1 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&lpd_dma_chan2 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&lpd_dma_chan3 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&lpd_dma_chan4 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&lpd_dma_chan5 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&lpd_dma_chan6 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&lpd_dma_chan7 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&lpd_dma_chan8 {
+        clocks = <&clk600>, <&clk100>;
+};
+
+&gem0 {
+        clocks = <&clk125>, <&clk125>, <&clk125>;
+};
+
+&gem1 {
+        clocks = <&clk125>, <&clk125>, <&clk125>;
+};
+
+&gem2 {
+        clocks = <&clk125>, <&clk125>, <&clk125>;
+};
+
+&gem3 {
+        clocks = <&clk125>, <&clk125>, <&clk125>;
+};
+
+&gpio {
+        clocks = <&clk100>;
+};
+
+&i2c0 {
+        clocks = <&clk100>;
+};
+
+&i2c1 {
+        clocks = <&clk100>;
+};
+
+&sata {
+        clocks = <&clk250>;
+};
+
+&sdhci0 {
+        clocks = <&clk200 &clk200>;
+};
+
+&sdhci1 {
+        clocks = <&clk200 &clk200>;
+};
+
+&spi0 {
+        clocks = <&clk200 &clk200>;
+};
+
+&spi1 {
+        clocks = <&clk200 &clk200>;
+};
+
+&uart0 {
+        clocks = <&clk100 &clk100>;
+};
+
+&uart1 {
+        clocks = <&clk100 &clk100>;
+};
+
+&usb0 {
+        clocks = <&clk250>, <&clk250>;
+};
+
+&usb1 {
+        clocks = <&clk250>, <&clk250>;
+};
+
+&watchdog0 {
+        clocks = <&clk250>;
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
index b87b8316f4ac..9f5eedbc2139 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * clock specification for Xilinx ZynqMP ep108 development board
  *
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
index bf552674a834..4b0684911626 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * dts file for Xilinx ZynqMP ep108 development board
  *
@@ -47,7 +48,7 @@
         status = "okay";
         phy-handle = <&phy0>;
         phy-mode = "rgmii-id";
-        phy0: phy@0{
+        phy0: phy@0 {
                 reg = <0>;
                 max-speed = <100>;
         };
@@ -78,10 +79,20 @@
 &sata {
         status = "okay";
         ceva,broken-gen2;
+        /* SATA Phy OOB timing settings */
+        ceva,p0-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;
+        ceva,p0-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;
+        ceva,p0-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
+        ceva,p0-retry-params = /bits/ 16 <0x0216 0x7F06>;
+        ceva,p1-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;
+        ceva,p1-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;
+        ceva,p1-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
+        ceva,p1-retry-params = /bits/ 16 <0x0216 0x7F06>;
 };
 
 &sdhci0 {
         status = "okay";
+        bus-width = <8>;
 };
 
 &sdhci1 {
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts
new file mode 100644
index 000000000000..0f7b4cf6078e
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZC1232
+ *
+ * (C) Copyright 2017 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+
+/ {
+        model = "ZynqMP ZC1232 RevA";
+        compatible = "xlnx,zynqmp-zc1232-revA", "xlnx,zynqmp-zc1232", "xlnx,zynqmp";
+
+        aliases {
+                serial0 = &uart0;
+                serial1 = &dcc;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>;
+        };
+};
+
+&dcc {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+        /* SATA OOB timing settings */
+        ceva,p0-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p0-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+        ceva,p1-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p1-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+};
+
+&uart0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts
new file mode 100644
index 000000000000..9092828f92ec
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZC1254
+ *
+ * (C) Copyright 2015 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ * Siva Durga Prasad Paladugu <sivadur@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+
+/ {
+        model = "ZynqMP ZC1254 RevA";
+        compatible = "xlnx,zynqmp-zc1254-revA", "xlnx,zynqmp-zc1254", "xlnx,zynqmp";
+
+        aliases {
+                serial0 = &uart0;
+                serial1 = &dcc;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>;
+        };
+};
+
+&dcc {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts
new file mode 100644
index 000000000000..4f404c580eec
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1275-revA.dts
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZC1275
+ *
+ * (C) Copyright 2017 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ * Siva Durga Prasad Paladugu <sivadur@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+
+/ {
+        model = "ZynqMP ZC1275 RevA";
+        compatible = "xlnx,zynqmp-zc1275-revA", "xlnx,zynqmp-zc1275", "xlnx,zynqmp";
+
+        aliases {
+                serial0 = &uart0;
+                serial1 = &dcc;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>;
+        };
+};
+
+&dcc {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts
new file mode 100644
index 000000000000..9a3e39d1294f
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP zc1751-xm015-dc1
+ *
+ * (C) Copyright 2015 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "ZynqMP zc1751-xm015-dc1 RevA";
+        compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp";
+
+        aliases {
+                ethernet0 = &gem3;
+                i2c0 = &i2c1;
+                mmc0 = &sdhci0;
+                mmc1 = &sdhci1;
+                rtc0 = &rtc;
+                serial0 = &uart0;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
+        };
+};
+
+&fpd_dma_chan1 {
+        status = "okay";
+};
+
+&fpd_dma_chan2 {
+        status = "okay";
+};
+
+&fpd_dma_chan3 {
+        status = "okay";
+};
+
+&fpd_dma_chan4 {
+        status = "okay";
+};
+
+&fpd_dma_chan5 {
+        status = "okay";
+};
+
+&fpd_dma_chan6 {
+        status = "okay";
+};
+
+&fpd_dma_chan7 {
+        status = "okay";
+};
+
+&fpd_dma_chan8 {
+        status = "okay";
+};
+
+&gem3 {
+        status = "okay";
+        phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
+        phy0: phy@0 {
+                reg = <0>;
+        };
+};
+
+&gpio {
+        status = "okay";
+};
+
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        eeprom: eeprom@55 {
+                compatible = "atmel,24c64"; /* 24AA64 */
+                reg = <0x55>;
+        };
+};
+
+&rtc {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+        /* SATA phy OOB timing settings */
+        ceva,p0-cominit-params = /bits/ 8 <0x1B 0x4D 0x18 0x28>;
+        ceva,p0-comwake-params = /bits/ 8 <0x06 0x19 0x08 0x0E>;
+        ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+        ceva,p1-cominit-params = /bits/ 8 <0x1B 0x4D 0x18 0x28>;
+        ceva,p1-comwake-params = /bits/ 8 <0x06 0x19 0x08 0x0E>;
+        ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+};
+
+/* eMMC */
+&sdhci0 {
+        status = "okay";
+        bus-width = <8>;
+};
+
+/* SD1 with level shifter */
+&sdhci1 {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
+
+/* ULPI SMSC USB3320 */
+&usb0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
new file mode 100644
index 000000000000..11cc67184fa9
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts
@@ -0,0 +1,168 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP zc1751-xm016-dc2
+ *
+ * (C) Copyright 2015 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "ZynqMP zc1751-xm016-dc2 RevA";
+        compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp";
+
+        aliases {
+                can0 = &can0;
+                can1 = &can1;
+                ethernet0 = &gem2;
+                i2c0 = &i2c0;
+                rtc0 = &rtc;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                spi0 = &spi0;
+                spi1 = &spi1;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
+        };
+};
+
+&can0 {
+        status = "okay";
+};
+
+&can1 {
+        status = "okay";
+};
+
+&fpd_dma_chan1 {
+        status = "okay";
+};
+
+&fpd_dma_chan2 {
+        status = "okay";
+};
+
+&fpd_dma_chan3 {
+        status = "okay";
+};
+
+&fpd_dma_chan4 {
+        status = "okay";
+};
+
+&fpd_dma_chan5 {
+        status = "okay";
+};
+
+&fpd_dma_chan6 {
+        status = "okay";
+};
+
+&fpd_dma_chan7 {
+        status = "okay";
+};
+
+&fpd_dma_chan8 {
+        status = "okay";
+};
+
+&gem2 {
+        status = "okay";
+        phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
+        phy0: phy@5 {
+                reg = <5>;
+                ti,rx-internal-delay = <0x8>;
+                ti,tx-internal-delay = <0xa>;
+                ti,fifo-depth = <0x1>;
+        };
+};
+
+&gpio {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        tca6416_u26: gpio@20 {
+                compatible = "ti,tca6416";
+                reg = <0x20>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                /* IRQ not connected */
+        };
+
+        rtc@68 {
+                compatible = "dallas,ds1339";
+                reg = <0x68>;
+        };
+};
+
+&rtc {
+        status = "okay";
+};
+
+&spi0 {
+        status = "okay";
+        num-cs = <1>;
+
+        spi0_flash0: flash0@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "sst,sst25wf080", "jedec,spi-nor";
+                spi-max-frequency = <50000000>;
+                reg = <0>;
+
+                partition@0 {
+                        label = "data";
+                        reg = <0x0 0x100000>;
+                };
+        };
+};
+
+&spi1 {
+        status = "okay";
+        num-cs = <1>;
+
+        spi1_flash0: flash0@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "atmel,at45db041e", "atmel,at45", "atmel,dataflash";
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+
+                partition@0 {
+                        label = "data";
+                        reg = <0x0 0x84000>;
+                };
+        };
+};
+
+/* ULPI SMSC USB3320 */
+&usb1 {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts
new file mode 100644
index 000000000000..7a49deeae647
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP zc1751-xm017-dc3
+ *
+ * (C) Copyright 2016 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+
+/ {
+        model = "ZynqMP zc1751-xm017-dc3 RevA";
+        compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp";
+
+        aliases {
+                ethernet0 = &gem0;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                mmc0 = &sdhci1;
+                rtc0 = &rtc;
+                serial0 = &uart0;
+                serial1 = &uart1;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
+        };
+};
+
+&fpd_dma_chan1 {
+        status = "okay";
+};
+
+&fpd_dma_chan2 {
+        status = "okay";
+};
+
+&fpd_dma_chan3 {
+        status = "okay";
+};
+
+&fpd_dma_chan4 {
+        status = "okay";
+};
+
+&fpd_dma_chan5 {
+        status = "okay";
+};
+
+&fpd_dma_chan6 {
+        status = "okay";
+};
+
+&fpd_dma_chan7 {
+        status = "okay";
+};
+
+&fpd_dma_chan8 {
+        status = "okay";
+};
+
+&gem0 {
+        status = "okay";
+        phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
+        phy0: phy@0 { /* VSC8211 */
+                reg = <0>;
+        };
+};
+
+&gpio {
+        status = "okay";
+};
+
+/* just eeprom here */
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        tca6416_u26: gpio@20 {
+                compatible = "ti,tca6416";
+                reg = <0x20>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                /* IRQ not connected */
+        };
+
+        rtc@68 {
+                compatible = "dallas,ds1339";
+                reg = <0x68>;
+        };
+};
+
+/* eeprom24c02 and SE98A temp chip pca9306 */
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+};
+
+&rtc {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+        /* SATA phy OOB timing settings */
+        ceva,p0-cominit-params = /bits/ 8 <0x1B 0x4D 0x18 0x28>;
+        ceva,p0-comwake-params = /bits/ 8 <0x06 0x19 0x08 0x0E>;
+        ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+        ceva,p1-cominit-params = /bits/ 8 <0x1B 0x4D 0x18 0x28>;
+        ceva,p1-comwake-params = /bits/ 8 <0x06 0x19 0x08 0x0E>;
+        ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+};
+
+&sdhci1 { /* emmc with some settings */
+        status = "okay";
+};
+
+/* main */
+&uart0 {
+        status = "okay";
+};
+
+/* DB9 */
+&uart1 {
+        status = "okay";
+};
+
+&usb0 {
+        status = "okay";
+        dr_mode = "host";
+};
+
+/* ULPI SMSC USB3320 */
+&usb1 {
+        status = "okay";
+        dr_mode = "host";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts
new file mode 100644
index 000000000000..54c7b4f1d1e4
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts
@@ -0,0 +1,178 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP zc1751-xm018-dc4
+ *
+ * (C) Copyright 2015 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+
+/ {
+        model = "ZynqMP zc1751-xm018-dc4";
+        compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp";
+
+        aliases {
+                ethernet0 = &gem0;
+                ethernet1 = &gem1;
+                ethernet2 = &gem2;
+                ethernet3 = &gem3;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                rtc0 = &rtc;
+                serial0 = &uart0;
+                serial1 = &uart1;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
+        };
+};
+
+&can0 {
+        status = "okay";
+};
+
+&can1 {
+        status = "okay";
+};
+
+&fpd_dma_chan1 {
+        status = "okay";
+};
+
+&fpd_dma_chan2 {
+        status = "okay";
+};
+
+&fpd_dma_chan3 {
+        status = "okay";
+};
+
+&fpd_dma_chan4 {
+        status = "okay";
+};
+
+&fpd_dma_chan5 {
+        status = "okay";
+};
+
+&fpd_dma_chan6 {
+        status = "okay";
+};
+
+&fpd_dma_chan7 {
+        status = "okay";
+};
+
+&fpd_dma_chan8 {
+        status = "okay";
+};
+
+&lpd_dma_chan1 {
+        status = "okay";
+};
+
+&lpd_dma_chan2 {
+        status = "okay";
+};
+
+&lpd_dma_chan3 {
+        status = "okay";
+};
+
+&lpd_dma_chan4 {
+        status = "okay";
+};
+
+&lpd_dma_chan5 {
+        status = "okay";
+};
+
+&lpd_dma_chan6 {
+        status = "okay";
+};
+
+&lpd_dma_chan7 {
+        status = "okay";
+};
+
+&lpd_dma_chan8 {
+        status = "okay";
+};
+
+&gem0 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy0>;
+        ethernet_phy0: ethernet-phy@0 { /* Marvell 88e1512 */
+                reg = <0>;
+        };
+        ethernet_phy7: ethernet-phy@7 { /* Vitesse VSC8211 */
+                reg = <7>;
+        };
+        ethernet_phy3: ethernet-phy@3 { /* Realtek RTL8211DN */
+                reg = <3>;
+        };
+        ethernet_phy8: ethernet-phy@8 { /* Vitesse VSC8211 */
+                reg = <8>;
+        };
+};
+
+&gem1 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy7>;
+};
+
+&gem2 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy3>;
+};
+
+&gem3 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy8>;
+};
+
+&gpio {
+        status = "okay";
+};
+
+&i2c0 {
+        clock-frequency = <400000>;
+        status = "okay";
+};
+
+&i2c1 {
+        clock-frequency = <400000>;
+        status = "okay";
+};
+
+&rtc {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&watchdog0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts
new file mode 100644
index 000000000000..b8b5ff13818d
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP zc1751-xm019-dc5
+ *
+ * (C) Copyright 2015 - 2018, Xilinx, Inc.
+ *
+ * Siva Durga Prasad <siva.durga.paladugu@xilinx.com>
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "ZynqMP zc1751-xm019-dc5 RevA";
+        compatible = "xlnx,zynqmp-zc1751", "xlnx,zynqmp";
+
+        aliases {
+                ethernet0 = &gem1;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                mmc0 = &sdhci0;
+                serial0 = &uart0;
+                serial1 = &uart1;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
+        };
+};
+
+&fpd_dma_chan1 {
+        status = "okay";
+};
+
+&fpd_dma_chan2 {
+        status = "okay";
+};
+
+&fpd_dma_chan3 {
+        status = "okay";
+};
+
+&fpd_dma_chan4 {
+        status = "okay";
+};
+
+&fpd_dma_chan5 {
+        status = "okay";
+};
+
+&fpd_dma_chan6 {
+        status = "okay";
+};
+
+&fpd_dma_chan7 {
+        status = "okay";
+};
+
+&fpd_dma_chan8 {
+        status = "okay";
+};
+
+&gem1 {
+        status = "okay";
+        phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
+        phy0: phy@0 {
+                reg = <0>;
+        };
+};
+
+&gpio {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+};
+
+&sdhci0 {
+        status = "okay";
+        no-1-8-v;
+};
+
+&ttc0 {
+        status = "okay";
+};
+
+&ttc1 {
+        status = "okay";
+};
+
+&ttc2 {
+        status = "okay";
+};
+
+&ttc3 {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&watchdog0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
new file mode 100644
index 000000000000..3e862a9faf26
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts
@@ -0,0 +1,289 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZCU100 revC
+ *
+ * (C) Copyright 2016 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ * Nathalie Chan King Choy
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "ZynqMP ZCU100 RevC";
+        compatible = "xlnx,zynqmp-zcu100-revC", "xlnx,zynqmp-zcu100", "xlnx,zynqmp";
+
+        aliases {
+                i2c0 = &i2c1;
+                rtc0 = &rtc;
+                serial0 = &uart1;
+                serial1 = &uart0;
+                serial2 = &dcc;
+                spi0 = &spi0;
+                spi1 = &spi1;
+                mmc0 = &sdhci0;
+                mmc1 = &sdhci1;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>;
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+                sw4 {
+                        label = "sw4";
+                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_POWER>;
+                        gpio-key,wakeup;
+                        autorepeat;
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                ds2 {
+                        label = "ds2";
+                        gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+
+                ds3 {
+                        label = "ds3";
+                        gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "phy0tx"; /* WLAN tx */
+                        default-state = "off";
+                };
+
+                ds4 {
+                        label = "ds4";
+                        gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "phy0rx"; /* WLAN rx */
+                        default-state = "off";
+                };
+
+                ds5 {
+                        label = "ds5";
+                        gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "bluetooth-power";
+                };
+
+                vbus_det { /* U5 USB5744 VBUS detection via MIO25 */
+                        label = "vbus_det";
+                        gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                };
+
+                bt_power {
+                        label = "bt_power";
+                        gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
+                        default-state = "on";
+                };
+        };
+
+        wmmcsdio_fixed: fixedregulator-mmcsdio {
+                compatible = "regulator-fixed";
+                regulator-name = "wmmcsdio_fixed";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        sdio_pwrseq: sdio_pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */
+        };
+};
+
+&dcc {
+        status = "okay";
+};
+
+&gpio {
+        status = "okay";
+        gpio-line-names = "UART1_TX", "UART1_RX", "UART0_RX", "UART0_TX", "I2C1_SCL",
+                          "I2C1_SDA", "SPI1_SCLK", "WLAN_EN", "BT_EN", "SPI1_CS",
+                          "SPI1_MISO", "SPI1_MOSI", "I2C_MUX_RESET", "SD0_DAT0", "SD0_DAT1",
+                          "SD0_DAT2", "SD0_DAT3", "PS_LED3", "PS_LED2", "PS_LED1",
+                          "PS_LED0", "SD0_CMD", "SD0_CLK", "GPIO_PB", "SD0_DETECT",
+                          "VBUS_DET", "POWER_INT", "DP_AUX", "DP_HPD", "DP_OE",
+                          "DP_AUX_IN", "INA226_ALERT", "PS_FP_PWR_EN", "PL_PWR_EN", "POWER_KILL",
+                          "", "GPIO-A", "GPIO-B", "SPI0_SCLK", "GPIO-C",
+                          "GPIO-D", "SPI0_CS", "SPI0_MISO", "SPI_MOSI", "GPIO-E",
+                          "GPIO-F", "SD1_D0", "SD1_D1", "SD1_D2", "SD1_D3",
+                          "SD1_CMD", "SD1_CLK", "USB0_CLK", "USB0_DIR", "USB0_DATA2",
+                          "USB0_NXT", "USB0_DATA0", "USB0_DATA1", "USB0_STP", "USB0_DATA3",
+                          "USB0_DATA4", "USB0_DATA5", "USB0_DATA6", "USB0_DATA7", "USB1_CLK",
+                          "USB1_DIR", "USB1_DATA2", "USB1_NXT", "USB1_DATA0", "USB1_DATA1",
+                          "USB1_STP", "USB1_DATA3", "USB1_DATA4", "USB1_DATA5", "USB1_DATA6",
+                          "USB_DATA7", "WLAN_IRQ", "PMIC_IRQ", /* MIO end and EMIO start */
+                          "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "", "", "", "", "", "", "",
+                          "", "", "", "";
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <100000>;
+        i2c-mux@75 { /* u11 */
+                compatible = "nxp,pca9548";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x75>;
+                i2csw_0: i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        label = "LS-I2C0";
+                };
+                i2csw_1: i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        label = "LS-I2C1";
+                };
+                i2csw_2: i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        label = "HS-I2C2";
+                };
+                i2csw_3: i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        label = "HS-I2C3";
+                };
+                i2csw_4: i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x4>;
+
+                        pmic: pmic@5e { /* Custom TI PMIC u33 */
+                                compatible = "ti,tps65086";
+                                reg = <0x5e>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <77 GPIO_ACTIVE_LOW>;
+                                #gpio-cells = <2>;
+                                gpio-controller;
+                        };
+                };
+                i2csw_5: i2c@5 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <5>;
+                        /* PS_PMBUS */
+                        ina226@40 { /* u35 */
+                                compatible = "ti,ina226";
+                                reg = <0x40>;
+                                shunt-resistor = <10000>;
+                                /* MIO31 is alert which should be routed to PMUFW */
+                        };
+                };
+                i2csw_6: i2c@6 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <6>;
+                        /*
+                         * Not Connected
+                         */
+                };
+                i2csw_7: i2c@7 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <7>;
+                        /*
+                         * usb5744 (DNP) - U5
+                         * 100kHz - this is default freq for us
+                         */
+                };
+        };
+};
+
+&rtc {
+        status = "okay";
+};
+
+/* SD0 only supports 3.3V, no level shifter */
+&sdhci0 {
+        status = "okay";
+        no-1-8-v;
+        broken-cd; /* CD has to be enabled by default */
+        disable-wp;
+};
+
+&sdhci1 {
+        status = "okay";
+        bus-width = <0x4>;
+        non-removable;
+        disable-wp;
+        cap-power-off-card;
+        mmc-pwrseq = <&sdio_pwrseq>;
+        vqmmc-supply = <&wmmcsdio_fixed>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        wlcore: wifi@2 {
+                compatible = "ti,wl1831";
+                reg = <2>;
+                interrupt-parent = <&gpio>;
+                interrupts = <76 IRQ_TYPE_EDGE_RISING>; /* MIO76 WLAN_IRQ 1V8 */
+        };
+};
+
+&spi0 { /* Low Speed connector */
+        status = "okay";
+        label = "LS-SPI0";
+};
+
+&spi1 { /* High Speed connector */
+        status = "okay";
+        label = "HS-SPI1";
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+
+};
+
+/* ULPI SMSC USB3320 */
+&usb0 {
+        status = "okay";
+};
+
+/* ULPI SMSC USB3320 */
+&usb1 {
+        status = "okay";
+};
+
+&watchdog0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts
new file mode 100644
index 000000000000..6647e97edba3
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZCU102 Rev1.0
+ *
+ * (C) Copyright 2016 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+#include "zynqmp-zcu102-revB.dts"
+
+/ {
+        model = "ZynqMP ZCU102 Rev1.0";
+        compatible = "xlnx,zynqmp-zcu102-rev1.0", "xlnx,zynqmp-zcu102", "xlnx,zynqmp";
+};
+
+&eeprom {
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        board_sn: board-sn@0 {
+                reg = <0x0 0x14>;
+        };
+
+        eth_mac: eth-mac@20 {
+                reg = <0x20 0x6>;
+        };
+
+        board_name: board-name@d0 {
+                reg = <0xd0 0x6>;
+        };
+
+        board_revision: board-revision@e0 {
+                reg = <0xe0 0x3>;
+        };
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
new file mode 100644
index 000000000000..5b4ffe646a9b
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts
@@ -0,0 +1,548 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZCU102 RevA
+ *
+ * (C) Copyright 2015 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "ZynqMP ZCU102 RevA";
+        compatible = "xlnx,zynqmp-zcu102-revA", "xlnx,zynqmp-zcu102", "xlnx,zynqmp";
+
+        aliases {
+                ethernet0 = &gem3;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                mmc0 = &sdhci1;
+                rtc0 = &rtc;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &dcc;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+                sw19 {
+                        label = "sw19";
+                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
+                        linux,code = <KEY_DOWN>;
+                        gpio-key,wakeup;
+                        autorepeat;
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                heartbeat_led {
+                        label = "heartbeat";
+                        gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&dcc {
+        status = "okay";
+};
+
+&fpd_dma_chan1 {
+        status = "okay";
+};
+
+&fpd_dma_chan2 {
+        status = "okay";
+};
+
+&fpd_dma_chan3 {
+        status = "okay";
+};
+
+&fpd_dma_chan4 {
+        status = "okay";
+};
+
+&fpd_dma_chan5 {
+        status = "okay";
+};
+
+&fpd_dma_chan6 {
+        status = "okay";
+};
+
+&fpd_dma_chan7 {
+        status = "okay";
+};
+
+&fpd_dma_chan8 {
+        status = "okay";
+};
+
+&gem3 {
+        status = "okay";
+        phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
+        phy0: phy@21 {
+                reg = <21>;
+                ti,rx-internal-delay = <0x8>;
+                ti,tx-internal-delay = <0xa>;
+                ti,fifo-depth = <0x1>;
+        };
+};
+
+&gpio {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        tca6416_u97: gpio@20 {
+                compatible = "ti,tca6416";
+                reg = <0x20>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                /*
+                 * IRQ not connected
+                 * Lines:
+                 * 0 - PS_GTR_LAN_SEL0
+                 * 1 - PS_GTR_LAN_SEL1
+                 * 2 - PS_GTR_LAN_SEL2
+                 * 3 - PS_GTR_LAN_SEL3
+                 * 4 - PCI_CLK_DIR_SEL
+                 * 5 - IIC_MUX_RESET_B
+                 * 6 - GEM3_EXP_RESET_B
+                 * 7, 10 - 17 - not connected
+                 */
+
+                gtr_sel0 {
+                        gpio-hog;
+                        gpios = <0 0>;
+                        output-low; /* PCIE = 0, DP = 1 */
+                        line-name = "sel0";
+                };
+                gtr_sel1 {
+                        gpio-hog;
+                        gpios = <1 0>;
+                        output-high; /* PCIE = 0, DP = 1 */
+                        line-name = "sel1";
+                };
+                gtr_sel2 {
+                        gpio-hog;
+                        gpios = <2 0>;
+                        output-high; /* PCIE = 0, USB0 = 1 */
+                        line-name = "sel2";
+                };
+                gtr_sel3 {
+                        gpio-hog;
+                        gpios = <3 0>;
+                        output-high; /* PCIE = 0, SATA = 1 */
+                        line-name = "sel3";
+                };
+        };
+
+        tca6416_u61: gpio@21 {
+                compatible = "ti,tca6416";
+                reg = <0x21>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                /*
+                 * IRQ not connected
+                 * Lines:
+                 * 0 - VCCPSPLL_EN
+                 * 1 - MGTRAVCC_EN
+                 * 2 - MGTRAVTT_EN
+                 * 3 - VCCPSDDRPLL_EN
+                 * 4 - MIO26_PMU_INPUT_LS
+                 * 5 - PL_PMBUS_ALERT
+                 * 6 - PS_PMBUS_ALERT
+                 * 7 - MAXIM_PMBUS_ALERT
+                 * 10 - PL_DDR4_VTERM_EN
+                 * 11 - PL_DDR4_VPP_2V5_EN
+                 * 12 - PS_DIMM_VDDQ_TO_PSVCCO_ON
+                 * 13 - PS_DIMM_SUSPEND_EN
+                 * 14 - PS_DDR4_VTERM_EN
+                 * 15 - PS_DDR4_VPP_2V5_EN
+                 * 16 - 17 - not connected
+                 */
+        };
+
+        i2c-mux@75 { /* u60 */
+                compatible = "nxp,pca9544";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x75>;
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /* PS_PMBUS */
+                        ina226@40 { /* u76 */
+                                compatible = "ti,ina226";
+                                reg = <0x40>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@41 { /* u77 */
+                                compatible = "ti,ina226";
+                                reg = <0x41>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@42 { /* u78 */
+                                compatible = "ti,ina226";
+                                reg = <0x42>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@43 { /* u87 */
+                                compatible = "ti,ina226";
+                                reg = <0x43>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@44 { /* u85 */
+                                compatible = "ti,ina226";
+                                reg = <0x44>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@45 { /* u86 */
+                                compatible = "ti,ina226";
+                                reg = <0x45>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@46 { /* u93 */
+                                compatible = "ti,ina226";
+                                reg = <0x46>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@47 { /* u88 */
+                                compatible = "ti,ina226";
+                                reg = <0x47>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4a { /* u15 */
+                                compatible = "ti,ina226";
+                                reg = <0x4a>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4b { /* u92 */
+                                compatible = "ti,ina226";
+                                reg = <0x4b>;
+                                shunt-resistor = <5000>;
+                        };
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        /* PL_PMBUS */
+                        ina226@40 { /* u79 */
+                                compatible = "ti,ina226";
+                                reg = <0x40>;
+                                shunt-resistor = <2000>;
+                        };
+                        ina226@41 { /* u81 */
+                                compatible = "ti,ina226";
+                                reg = <0x41>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@42 { /* u80 */
+                                compatible = "ti,ina226";
+                                reg = <0x42>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@43 { /* u84 */
+                                compatible = "ti,ina226";
+                                reg = <0x43>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@44 { /* u16 */
+                                compatible = "ti,ina226";
+                                reg = <0x44>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@45 { /* u65 */
+                                compatible = "ti,ina226";
+                                reg = <0x45>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@46 { /* u74 */
+                                compatible = "ti,ina226";
+                                reg = <0x46>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@47 { /* u75 */
+                                compatible = "ti,ina226";
+                                reg = <0x47>;
+                                shunt-resistor = <5000>;
+                        };
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        /* MAXIM_PMBUS - 00 */
+                        max15301@a { /* u46 */
+                                compatible = "maxim,max15301";
+                                reg = <0xa>;
+                        };
+                        max15303@b { /* u4 */
+                                compatible = "maxim,max15303";
+                                reg = <0xb>;
+                        };
+                        max15303@10 { /* u13 */
+                                compatible = "maxim,max15303";
+                                reg = <0x10>;
+                        };
+                        max15301@13 { /* u47 */
+                                compatible = "maxim,max15301";
+                                reg = <0x13>;
+                        };
+                        max15303@14 { /* u7 */
+                                compatible = "maxim,max15303";
+                                reg = <0x14>;
+                        };
+                        max15303@15 { /* u6 */
+                                compatible = "maxim,max15303";
+                                reg = <0x15>;
+                        };
+                        max15303@16 { /* u10 */
+                                compatible = "maxim,max15303";
+                                reg = <0x16>;
+                        };
+                        max15303@17 { /* u9 */
+                                compatible = "maxim,max15303";
+                                reg = <0x17>;
+                        };
+                        max15301@18 { /* u63 */
+                                compatible = "maxim,max15301";
+                                reg = <0x18>;
+                        };
+                        max15303@1a { /* u49 */
+                                compatible = "maxim,max15303";
+                                reg = <0x1a>;
+                        };
+                        max15303@1d { /* u18 */
+                                compatible = "maxim,max15303";
+                                reg = <0x1d>;
+                        };
+                        max15303@20 { /* u8 */
+                                compatible = "maxim,max15303";
+                                status = "disabled"; /* unreachable */
+                                reg = <0x20>;
+                        };
+
+                        max20751@72 { /* u95 */
+                                compatible = "maxim,max20751";
+                                reg = <0x72>;
+                        };
+                        max20751@73 { /* u96 */
+                                compatible = "maxim,max20751";
+                                reg = <0x73>;
+                        };
+                };
+                /* Bus 3 is not connected */
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        /* PL i2c via PCA9306 - u45 */
+        i2c-mux@74 { /* u34 */
+                compatible = "nxp,pca9548";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x74>;
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /*
+                         * IIC_EEPROM 1kB memory which uses 256B blocks
+                         * where every block has different address.
+                         *    0 - 256B address 0x54
+                         * 256B - 512B address 0x55
+                         * 512B - 768B address 0x56
+                         * 768B - 1024B address 0x57
+                         */
+                        eeprom: eeprom@54 { /* u23 */
+                                compatible = "atmel,24c08";
+                                reg = <0x54>;
+                        };
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        si5341: clock-generator@36 { /* SI5341 - u69 */
+                                reg = <0x36>;
+                        };
+
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        si570_1: clock-generator@5d { /* USER SI570 - u42 */
+                                #clock-cells = <0>;
+                                compatible = "silabs,si570";
+                                reg = <0x5d>;
+                                temperature-stability = <50>;
+                                factory-fout = <300000000>;
+                                clock-frequency = <300000000>;
+                        };
+                };
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        si570_2: clock-generator@5d { /* USER MGT SI570 - u56 */
+                                #clock-cells = <0>;
+                                compatible = "silabs,si570";
+                                reg = <0x5d>;
+                                temperature-stability = <50>; /* copy from zc702 */
+                                factory-fout = <156250000>;
+                                clock-frequency = <148500000>;
+                        };
+                };
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        si5328: clock-generator@69 {/* SI5328 - u20 */
+                                reg = <0x69>;
+                                /*
+                                 * Chip has interrupt present connected to PL
+                                 * interrupt-parent = <&>;
+                                 * interrupts = <>;
+                                 */
+                        };
+                };
+                /* 5 - 7 unconnected */
+        };
+
+        i2c-mux@75 {
+                compatible = "nxp,pca9548"; /* u135 */
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x75>;
+
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /* HPC0_IIC */
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        /* HPC1_IIC */
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        /* SYSMON */
+                };
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        /* DDR4 SODIMM */
+                };
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        /* SEP 3 */
+                };
+                i2c@5 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <5>;
+                        /* SEP 2 */
+                };
+                i2c@6 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <6>;
+                        /* SEP 1 */
+                };
+                i2c@7 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <7>;
+                        /* SEP 0 */
+                };
+        };
+};
+
+&pcie {
+        status = "okay";
+};
+
+&rtc {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+        /* SATA OOB timing settings */
+        ceva,p0-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p0-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+        ceva,p1-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p1-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+};
+
+/* SD1 with level shifter */
+&sdhci1 {
+        status = "okay";
+        no-1-8-v;
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+/* ULPI SMSC USB3320 */
+&usb0 {
+        status = "okay";
+};
+
+&watchdog0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
new file mode 100644
index 000000000000..af4d86882a5c
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZCU102 RevB
+ *
+ * (C) Copyright 2016 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+#include "zynqmp-zcu102-revA.dts"
+
+/ {
+        model = "ZynqMP ZCU102 RevB";
+        compatible = "xlnx,zynqmp-zcu102-revB", "xlnx,zynqmp-zcu102", "xlnx,zynqmp";
+};
+
+&gem3 {
+        phy-handle = <&phyc>;
+        phyc: phy@c {
+                reg = <0xc>;
+                ti,rx-internal-delay = <0x8>;
+                ti,tx-internal-delay = <0xa>;
+                ti,fifo-depth = <0x1>;
+        };
+        /* Cleanup from RevA */
+        /delete-node/ phy@21;
+};
+
+/* Fix collision with u61 */
+&i2c0 {
+        i2c-mux@75 {
+                i2c@2 {
+                        max15303@1b { /* u8 */
+                                compatible = "maxim,max15303";
+                                reg = <0x1b>;
+                        };
+                        /delete-node/ max15303@20;
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
new file mode 100644
index 000000000000..d4ad19a38c93
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts
@@ -0,0 +1,195 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZCU104
+ *
+ * (C) Copyright 2017 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "ZynqMP ZCU104 RevA";
+        compatible = "xlnx,zynqmp-zcu104-revA", "xlnx,zynqmp-zcu104", "xlnx,zynqmp";
+
+        aliases {
+                ethernet0 = &gem3;
+                i2c0 = &i2c1;
+                mmc0 = &sdhci1;
+                rtc0 = &rtc;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &dcc;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>;
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&dcc {
+        status = "okay";
+};
+
+&gem3 {
+        status = "okay";
+        phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
+        phy0: phy@c {
+                reg = <0xc>;
+                ti,rx-internal-delay = <0x8>;
+                ti,tx-internal-delay = <0xa>;
+                ti,fifo-depth = <0x1>;
+        };
+};
+
+&gpio {
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        /* Another connection to this bus via PL i2c via PCA9306 - u45 */
+        i2c-mux@74 { /* u34 */
+                compatible = "nxp,pca9548";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x74>;
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /*
+                         * IIC_EEPROM 1kB memory which uses 256B blocks
+                         * where every block has different address.
+                         *    0 - 256B address 0x54
+                         * 256B - 512B address 0x55
+                         * 512B - 768B address 0x56
+                         * 768B - 1024B address 0x57
+                         */
+                        eeprom@54 { /* u23 */
+                                compatible = "atmel,24c08";
+                                reg = <0x54>;
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                        };
+                };
+
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        clock_8t49n287: clock-generator@6c { /* 8T49N287 - u182 */
+                                reg = <0x6c>;
+                        };
+                };
+
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        irps5401_43: irps54012@43 { /* IRPS5401 - u175 */
+                                reg = <0x43>;
+                        };
+                        irps5401_4d: irps54012@4d { /* IRPS5401 - u180 */
+                                reg = <0x4d>;
+                        };
+                };
+
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        tca6416_u97: gpio@21 {
+                                compatible = "ti,tca6416";
+                                reg = <0x21>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                /*
+                                 * IRQ not connected
+                                 * Lines:
+                                 * 0 - IRPS5401_ALERT_B
+                                 * 1 - HDMI_8T49N241_INT_ALM
+                                 * 2 - MAX6643_OT_B
+                                 * 3 - MAX6643_FANFAIL_B
+                                 * 5 - IIC_MUX_RESET_B
+                                 * 6 - GEM3_EXP_RESET_B
+                                 * 7 - FMC_LPC_PRSNT_M2C_B
+                                 * 4, 10 - 17 - not connected
+                                 */
+                        };
+                };
+
+                i2c@5 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <5>;
+                };
+
+                i2c@7 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <7>;
+                };
+
+                /* 3, 6 not connected */
+        };
+};
+
+&rtc {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+        /* SATA OOB timing settings */
+        ceva,p0-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p0-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+        ceva,p1-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p1-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+};
+
+/* SD1 with level shifter */
+&sdhci1 {
+        status = "okay";
+        no-1-8-v;
+        disable-wp;
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+/* ULPI SMSC USB3320 */
+&usb0 {
+        status = "okay";
+};
+
+&watchdog0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
new file mode 100644
index 000000000000..668f7f26716a
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
@@ -0,0 +1,522 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZCU106
+ *
+ * (C) Copyright 2016, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "ZynqMP ZCU106 RevA";
+        compatible = "xlnx,zynqmp-zcu106-revA", "xlnx,zynqmp-zcu106", "xlnx,zynqmp";
+
+        aliases {
+                ethernet0 = &gem3;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                mmc0 = &sdhci1;
+                rtc0 = &rtc;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &dcc;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+                sw19 {
+                        label = "sw19";
+                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
+                        linux,code = <KEY_DOWN>;
+                        gpio-key,wakeup;
+                        autorepeat;
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                heartbeat_led {
+                        label = "heartbeat";
+                        gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+        };
+};
+
+&can1 {
+        status = "okay";
+};
+
+&dcc {
+        status = "okay";
+};
+
+/* fpd_dma clk 667MHz, lpd_dma 500MHz */
+&fpd_dma_chan1 {
+        status = "okay";
+};
+
+&fpd_dma_chan2 {
+        status = "okay";
+};
+
+&fpd_dma_chan3 {
+        status = "okay";
+};
+
+&fpd_dma_chan4 {
+        status = "okay";
+};
+
+&fpd_dma_chan5 {
+        status = "okay";
+};
+
+&fpd_dma_chan6 {
+        status = "okay";
+};
+
+&fpd_dma_chan7 {
+        status = "okay";
+};
+
+&fpd_dma_chan8 {
+        status = "okay";
+};
+
+&gem3 {
+        status = "okay";
+        phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
+        phy0: phy@c {
+                reg = <0xc>;
+                ti,rx-internal-delay = <0x8>;
+                ti,tx-internal-delay = <0xa>;
+                ti,fifo-depth = <0x1>;
+        };
+};
+
+&gpio {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        tca6416_u97: gpio@20 {
+                compatible = "ti,tca6416";
+                reg = <0x20>;
+                gpio-controller; /* interrupt not connected */
+                #gpio-cells = <2>;
+                /*
+                 * IRQ not connected
+                 * Lines:
+                 * 0 - SFP_SI5328_INT_ALM
+                 * 1 - HDMI_SI5328_INT_ALM
+                 * 5 - IIC_MUX_RESET_B
+                 * 6 - GEM3_EXP_RESET_B
+                 * 10 - FMC_HPC0_PRSNT_M2C_B
+                 * 11 - FMC_HPC1_PRSNT_M2C_B
+                 * 2-4, 7, 12-17 - not connected
+                 */
+        };
+
+        tca6416_u61: gpio@21 {
+                compatible = "ti,tca6416";
+                reg = <0x21>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                /*
+                 * IRQ not connected
+                 * Lines:
+                 * 0 - VCCPSPLL_EN
+                 * 1 - MGTRAVCC_EN
+                 * 2 - MGTRAVTT_EN
+                 * 3 - VCCPSDDRPLL_EN
+                 * 4 - MIO26_PMU_INPUT_LS
+                 * 5 - PL_PMBUS_ALERT
+                 * 6 - PS_PMBUS_ALERT
+                 * 7 - MAXIM_PMBUS_ALERT
+                 * 10 - PL_DDR4_VTERM_EN
+                 * 11 - PL_DDR4_VPP_2V5_EN
+                 * 12 - PS_DIMM_VDDQ_TO_PSVCCO_ON
+                 * 13 - PS_DIMM_SUSPEND_EN
+                 * 14 - PS_DDR4_VTERM_EN
+                 * 15 - PS_DDR4_VPP_2V5_EN
+                 * 16 - 17 - not connected
+                 */
+        };
+
+        i2c-mux@75 { /* u60 */
+                compatible = "nxp,pca9544";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x75>;
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /* PS_PMBUS */
+                        ina226@40 { /* u76 */
+                                compatible = "ti,ina226";
+                                reg = <0x40>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@41 { /* u77 */
+                                compatible = "ti,ina226";
+                                reg = <0x41>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@42 { /* u78 */
+                                compatible = "ti,ina226";
+                                reg = <0x42>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@43 { /* u87 */
+                                compatible = "ti,ina226";
+                                reg = <0x43>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@44 { /* u85 */
+                                compatible = "ti,ina226";
+                                reg = <0x44>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@45 { /* u86 */
+                                compatible = "ti,ina226";
+                                reg = <0x45>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@46 { /* u93 */
+                                compatible = "ti,ina226";
+                                reg = <0x46>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@47 { /* u88 */
+                                compatible = "ti,ina226";
+                                reg = <0x47>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4a { /* u15 */
+                                compatible = "ti,ina226";
+                                reg = <0x4a>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4b { /* u92 */
+                                compatible = "ti,ina226";
+                                reg = <0x4b>;
+                                shunt-resistor = <5000>;
+                        };
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        /* PL_PMBUS */
+                        ina226@40 { /* u79 */
+                                compatible = "ti,ina226";
+                                reg = <0x40>;
+                                shunt-resistor = <2000>;
+                        };
+                        ina226@41 { /* u81 */
+                                compatible = "ti,ina226";
+                                reg = <0x41>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@42 { /* u80 */
+                                compatible = "ti,ina226";
+                                reg = <0x42>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@43 { /* u84 */
+                                compatible = "ti,ina226";
+                                reg = <0x43>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@44 { /* u16 */
+                                compatible = "ti,ina226";
+                                reg = <0x44>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@45 { /* u65 */
+                                compatible = "ti,ina226";
+                                reg = <0x45>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@46 { /* u74 */
+                                compatible = "ti,ina226";
+                                reg = <0x46>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@47 { /* u75 */
+                                compatible = "ti,ina226";
+                                reg = <0x47>;
+                                shunt-resistor = <5000>;
+                        };
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        /* MAXIM_PMBUS - 00 */
+                        max15301@a { /* u46 */
+                                compatible = "maxim,max15301";
+                                reg = <0xa>;
+                        };
+                        max15303@b { /* u4 */
+                                compatible = "maxim,max15303";
+                                reg = <0xb>;
+                        };
+                        max15303@10 { /* u13 */
+                                compatible = "maxim,max15303";
+                                reg = <0x10>;
+                        };
+                        max15301@13 { /* u47 */
+                                compatible = "maxim,max15301";
+                                reg = <0x13>;
+                        };
+                        max15303@14 { /* u7 */
+                                compatible = "maxim,max15303";
+                                reg = <0x14>;
+                        };
+                        max15303@15 { /* u6 */
+                                compatible = "maxim,max15303";
+                                reg = <0x15>;
+                        };
+                        max15303@16 { /* u10 */
+                                compatible = "maxim,max15303";
+                                reg = <0x16>;
+                        };
+                        max15303@17 { /* u9 */
+                                compatible = "maxim,max15303";
+                                reg = <0x17>;
+                        };
+                        max15301@18 { /* u63 */
+                                compatible = "maxim,max15301";
+                                reg = <0x18>;
+                        };
+                        max15303@1a { /* u49 */
+                                compatible = "maxim,max15303";
+                                reg = <0x1a>;
+                        };
+                        max15303@1b { /* u8 */
+                                compatible = "maxim,max15303";
+                                reg = <0x1b>;
+                        };
+                        max15303@1d { /* u18 */
+                                compatible = "maxim,max15303";
+                                reg = <0x1d>;
+                        };
+
+                        max20751@72 { /* u95 */
+                                compatible = "maxim,max20751";
+                                reg = <0x72>;
+                        };
+                        max20751@73 { /* u96 */
+                                compatible = "maxim,max20751";
+                                reg = <0x73>;
+                        };
+                };
+                /* Bus 3 is not connected */
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        /* PL i2c via PCA9306 - u45 */
+        i2c-mux@74 { /* u34 */
+                compatible = "nxp,pca9548";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x74>;
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /*
+                         * IIC_EEPROM 1kB memory which uses 256B blocks
+                         * where every block has different address.
+                         *    0 - 256B address 0x54
+                         * 256B - 512B address 0x55
+                         * 512B - 768B address 0x56
+                         * 768B - 1024B address 0x57
+                         */
+                        eeprom: eeprom@54 { /* u23 */
+                                compatible = "atmel,24c08";
+                                reg = <0x54>;
+                        };
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        si5341: clock-generator@36 { /* SI5341 - u69 */
+                                reg = <0x36>;
+                        };
+
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        si570_1: clock-generator@5d { /* USER SI570 - u42 */
+                                #clock-cells = <0>;
+                                compatible = "silabs,si570";
+                                reg = <0x5d>;
+                                temperature-stability = <50>;
+                                factory-fout = <300000000>;
+                                clock-frequency = <300000000>;
+                        };
+                };
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        si570_2: clock-generator@5d { /* USER MGT SI570 - u56 */
+                                #clock-cells = <0>;
+                                compatible = "silabs,si570";
+                                reg = <0x5d>;
+                                temperature-stability = <50>; /* copy from zc702 */
+                                factory-fout = <156250000>;
+                                clock-frequency = <148500000>;
+                        };
+                };
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        si5328: clock-generator@69 {/* SI5328 - u20 */
+                                reg = <0x69>;
+                        };
+                };
+                i2c@5 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <5>; /* FAN controller */
+                        temp@4c {/* lm96163 - u128 */
+                                compatible = "national,lm96163";
+                                reg = <0x4c>;
+                        };
+                };
+                /* 6 - 7 unconnected */
+        };
+
+        i2c-mux@75 {
+                compatible = "nxp,pca9548"; /* u135 */
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x75>;
+
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /* HPC0_IIC */
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        /* HPC1_IIC */
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        /* SYSMON */
+                };
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        /* DDR4 SODIMM */
+                };
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        /* SEP 3 */
+                };
+                i2c@5 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <5>;
+                        /* SEP 2 */
+                };
+                i2c@6 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <6>;
+                        /* SEP 1 */
+                };
+                i2c@7 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <7>;
+                        /* SEP 0 */
+                };
+        };
+};
+
+&rtc {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+        /* SATA OOB timing settings */
+        ceva,p0-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p0-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+        ceva,p1-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p1-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+};
+
+/* SD1 with level shifter */
+&sdhci1 {
+        status = "okay";
+        no-1-8-v;
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+/* ULPI SMSC USB3320 */
+&usb0 {
+        status = "okay";
+};
+
+&watchdog0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
new file mode 100644
index 000000000000..9a9dd6a0142b
--- /dev/null
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts
@@ -0,0 +1,444 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZCU111
+ *
+ * (C) Copyright 2017 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+/dts-v1/;
+
+#include "zynqmp.dtsi"
+#include "zynqmp-clk.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "ZynqMP ZCU111 RevA";
+        compatible = "xlnx,zynqmp-zcu111-revA", "xlnx,zynqmp-zcu111", "xlnx,zynqmp";
+
+        aliases {
+                ethernet0 = &gem3;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                mmc0 = &sdhci1;
+                rtc0 = &rtc;
+                serial0 = &uart0;
+                serial1 = &dcc;
+        };
+
+        chosen {
+                bootargs = "earlycon";
+                stdout-path = "serial0:115200n8";
+        };
+
+        memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x0 0x0 0x80000000>, <0x8 0x00000000 0x0 0x80000000>;
+                /* Another 4GB connected to PL */
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+                sw19 {
+                        label = "sw19";
+                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
+                        linux,code = <KEY_DOWN>;
+                        gpio-key,wakeup;
+                        autorepeat;
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                heartbeat_led {
+                        label = "heartbeat";
+                        gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+        };
+};
+
+&dcc {
+        status = "okay";
+};
+
+&fpd_dma_chan1 {
+        status = "okay";
+};
+
+&fpd_dma_chan2 {
+        status = "okay";
+};
+
+&fpd_dma_chan3 {
+        status = "okay";
+};
+
+&fpd_dma_chan4 {
+        status = "okay";
+};
+
+&fpd_dma_chan5 {
+        status = "okay";
+};
+
+&fpd_dma_chan6 {
+        status = "okay";
+};
+
+&fpd_dma_chan7 {
+        status = "okay";
+};
+
+&fpd_dma_chan8 {
+        status = "okay";
+};
+
+&gem3 {
+        status = "okay";
+        phy-handle = <&phy0>;
+        phy-mode = "rgmii-id";
+        phy0: phy@c {
+                reg = <0xc>;
+                ti,rx-internal-delay = <0x8>;
+                ti,tx-internal-delay = <0xa>;
+                ti,fifo-depth = <0x1>;
+        };
+};
+
+&gpio {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        tca6416_u22: gpio@20 {
+                compatible = "ti,tca6416";
+                reg = <0x20>;
+                gpio-controller; /* interrupt not connected */
+                #gpio-cells = <2>;
+                /*
+                 * IRQ not connected
+                 * Lines:
+                 * 0 - MAX6643_OT_B
+                 * 1 - MAX6643_FANFAIL_B
+                 * 2 - MIO26_PMU_INPUT_LS
+                 * 4 - SFP_SI5382_INT_ALM
+                 * 5 - IIC_MUX_RESET_B
+                 * 6 - GEM3_EXP_RESET_B
+                 * 10 - FMCP_HSPC_PRSNT_M2C_B
+                 * 11 - CLK_SPI_MUX_SEL0
+                 * 12 - CLK_SPI_MUX_SEL1
+                 * 16 - IRPS5401_ALERT_B
+                 * 17 - INA226_PMBUS_ALERT
+                 * 3, 7, 13-15 - not connected
+                 */
+        };
+
+        i2c-mux@75 { /* u23 */
+                compatible = "nxp,pca9544";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x75>;
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /* PS_PMBUS */
+                        /* PMBUS_ALERT done via pca9544 */
+                        ina226@40 { /* u67 */
+                                compatible = "ti,ina226";
+                                reg = <0x40>;
+                                shunt-resistor = <2000>;
+                        };
+                        ina226@41 { /* u59 */
+                                compatible = "ti,ina226";
+                                reg = <0x41>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@42 { /* u61 */
+                                compatible = "ti,ina226";
+                                reg = <0x42>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@43 { /* u60 */
+                                compatible = "ti,ina226";
+                                reg = <0x43>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@45 { /* u64 */
+                                compatible = "ti,ina226";
+                                reg = <0x45>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@46 { /* u69 */
+                                compatible = "ti,ina226";
+                                reg = <0x46>;
+                                shunt-resistor = <2000>;
+                        };
+                        ina226@47 { /* u66 */
+                                compatible = "ti,ina226";
+                                reg = <0x47>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@48 { /* u65 */
+                                compatible = "ti,ina226";
+                                reg = <0x48>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@49 { /* u63 */
+                                compatible = "ti,ina226";
+                                reg = <0x49>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4a { /* u3 */
+                                compatible = "ti,ina226";
+                                reg = <0x4a>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4b { /* u71 */
+                                compatible = "ti,ina226";
+                                reg = <0x4b>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4c { /* u77 */
+                                compatible = "ti,ina226";
+                                reg = <0x4c>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4d { /* u73 */
+                                compatible = "ti,ina226";
+                                reg = <0x4d>;
+                                shunt-resistor = <5000>;
+                        };
+                        ina226@4e { /* u79 */
+                                compatible = "ti,ina226";
+                                reg = <0x4e>;
+                                shunt-resistor = <5000>;
+                        };
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        /* NC */
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        irps5401_43: irps54012@43 { /* IRPS5401 - u53 check these */
+                                reg = <0x43>;
+                        };
+                        irps5401_44: irps54012@44 { /* IRPS5401 - u55 */
+                                reg = <0x44>;
+                        };
+                        irps5401_45: irps54012@45 { /* IRPS5401 - u57 */
+                                reg = <0x45>;
+                        };
+                        /* u68 IR38064 +0 */
+                        /* u70 IR38060 +1 */
+                        /* u74 IR38060 +2 */
+                        /* u75 IR38060 +6 */
+                        /* J19 header too */
+
+                };
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        /* SYSMON */
+                };
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        i2c-mux@74 { /* u26 */
+                compatible = "nxp,pca9548";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x74>;
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /*
+                         * IIC_EEPROM 1kB memory which uses 256B blocks
+                         * where every block has different address.
+                         *    0 - 256B address 0x54
+                         * 256B - 512B address 0x55
+                         * 512B - 768B address 0x56
+                         * 768B - 1024B address 0x57
+                         */
+                        eeprom: eeprom@54 { /* u88 */
+                                compatible = "atmel,24c08";
+                                reg = <0x54>;
+                        };
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        si5341: clock-generator@36 { /* SI5341 - u46 */
+                                reg = <0x36>;
+                        };
+
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        si570_1: clock-generator@5d { /* USER SI570 - u47 */
+                                #clock-cells = <0>;
+                                compatible = "silabs,si570";
+                                reg = <0x5d>;
+                                temperature-stability = <50>;
+                                factory-fout = <300000000>;
+                                clock-frequency = <300000000>;
+                        };
+                };
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        si570_2: clock-generator@5d { /* USER MGT SI570 - u49 */
+                                #clock-cells = <0>;
+                                compatible = "silabs,si570";
+                                reg = <0x5d>;
+                                temperature-stability = <50>;
+                                factory-fout = <156250000>;
+                                clock-frequency = <148500000>;
+                        };
+                };
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        si5328: clock-generator@69 { /* SI5328 - u48 */
+                                reg = <0x69>;
+                        };
+                };
+                i2c@5 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <5>;
+                                sc18is603@2f { /* sc18is602 - u93 */
+                                        compatible = "nxp,sc18is603";
+                                        reg = <0x2f>;
+                                        /* 4 gpios for CS not handled by driver */
+                                        /*
+                                         * USB2ANY cable or
+                                         * LMK04208 - u90 or
+                                         * LMX2594 - u102 or
+                                         * LMX2594 - u103 or
+                                         * LMX2594 - u104
+                                         */
+                                };
+                };
+                i2c@6 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <6>;
+                        /* FMC connector */
+                };
+                /* 7 NC */
+        };
+
+        i2c-mux@75 {
+                compatible = "nxp,pca9548"; /* u27 */
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x75>;
+
+                i2c@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>;
+                        /* FMCP_HSPC_IIC */
+                };
+                i2c@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>;
+                        /* NC */
+                };
+                i2c@2 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <2>;
+                        /* SYSMON */
+                };
+                i2c@3 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3>;
+                        /* DDR4 SODIMM */
+                };
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <4>;
+                        /* SFP3 */
+                };
+                i2c@5 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <5>;
+                        /* SFP2 */
+                };
+                i2c@6 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <6>;
+                        /* SFP1 */
+                };
+                i2c@7 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <7>;
+                        /* SFP0 */
+                };
+        };
+};
+
+&rtc {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+        /* SATA OOB timing settings */
+        ceva,p0-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p0-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p0-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p0-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+        ceva,p1-cominit-params = /bits/ 8 <0x18 0x40 0x18 0x28>;
+        ceva,p1-comwake-params = /bits/ 8 <0x06 0x14 0x08 0x0E>;
+        ceva,p1-burst-params = /bits/ 8 <0x13 0x08 0x4A 0x06>;
+        ceva,p1-retry-params = /bits/ 16 <0x96A4 0x3FFC>;
+};
+
+/* SD1 with level shifter */
+&sdhci1 {
+        status = "okay";
+        no-1-8-v;
+};
+
+&uart0 {
+        status = "okay";
+};
+
+/* ULPI SMSC USB3320 */
+&usb0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 7665fbddff28..a091e6f03014 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * dts file for Xilinx ZynqMP
  *
@@ -355,7 +356,7 @@
                 };
 
                 gem0: ethernet@ff0b0000 {
-                        compatible = "cdns,gem";
+                        compatible = "cdns,zynqmp-gem", "cdns,gem";
                         status = "disabled";
                         interrupt-parent = <&gic>;
                         interrupts = <0 57 4>, <0 57 4>;
@@ -366,7 +367,7 @@
                 };
 
                 gem1: ethernet@ff0c0000 {
-                        compatible = "cdns,gem";
+                        compatible = "cdns,zynqmp-gem", "cdns,gem";
                         status = "disabled";
                         interrupt-parent = <&gic>;
                         interrupts = <0 59 4>, <0 59 4>;
@@ -377,7 +378,7 @@
                 };
 
                 gem2: ethernet@ff0d0000 {
-                        compatible = "cdns,gem";
+                        compatible = "cdns,zynqmp-gem", "cdns,gem";
                         status = "disabled";
                         interrupt-parent = <&gic>;
                         interrupts = <0 61 4>, <0 61 4>;
@@ -388,7 +389,7 @@
                 };
 
                 gem3: ethernet@ff0e0000 {
-                        compatible = "cdns,gem";
+                        compatible = "cdns,zynqmp-gem", "cdns,gem";
                         status = "disabled";
                         interrupt-parent = <&gic>;
                         interrupts = <0 63 4>, <0 63 4>;
@@ -439,10 +440,10 @@
                         device_type = "pci";
                         interrupt-parent = <&gic>;
                         interrupts = <0 118 4>,
-                                    <0 117 4>,
-                                    <0 116 4>,
-                                    <0 115 4>,  /* MSI_1 [63...32] */
-                                    <0 114 4>;  /* MSI_0 [31...0] */
+                                     <0 117 4>,
+                                     <0 116 4>,
+                                     <0 115 4>, /* MSI_1 [63...32] */
+                                     <0 114 4>; /* MSI_0 [31...0] */
                         interrupt-names = "misc", "dummy", "intx",
                                           "msi1", "msi0";
                         msi-parent = <&pcie>;
diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
index 80dc211eb74b..617beb234259 100644
--- a/drivers/clk/imx/clk-imx7d.c
+++ b/drivers/clk/imx/clk-imx7d.c
@@ -795,6 +795,8 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
         clks[IMX7D_DRAM_PHYM_ALT_ROOT_CLK] = imx_clk_gate4("dram_phym_alt_root_clk", "dram_phym_alt_post_div", base + 0x4130, 0);
         clks[IMX7D_DRAM_ALT_ROOT_CLK] = imx_clk_gate4("dram_alt_root_clk", "dram_alt_post_div", base + 0x4130, 0);
         clks[IMX7D_OCOTP_CLK] = imx_clk_gate4("ocotp_clk", "ipg_root_clk", base + 0x4230, 0);
+        clks[IMX7D_SNVS_CLK] = imx_clk_gate4("snvs_clk", "ipg_root_clk", base + 0x4250, 0);
+        clks[IMX7D_CAAM_CLK] = imx_clk_gate4("caam_clk", "ipg_root_clk", base + 0x4240, 0);
         clks[IMX7D_USB_HSIC_ROOT_CLK] = imx_clk_gate4("usb_hsic_root_clk", "usb_hsic_post_div", base + 0x4420, 0);
         clks[IMX7D_SDMA_CORE_CLK] = imx_clk_gate4("sdma_root_clk", "ahb_root_clk", base + 0x4480, 0);
         clks[IMX7D_PCIE_CTRL_ROOT_CLK] = imx_clk_gate4("pcie_ctrl_root_clk", "pcie_ctrl_post_div", base + 0x4600, 0);
@@ -857,6 +859,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node)
         clks[IMX7D_WDOG2_ROOT_CLK] = imx_clk_gate4("wdog2_root_clk", "wdog_post_div", base + 0x49d0, 0);
         clks[IMX7D_WDOG3_ROOT_CLK] = imx_clk_gate4("wdog3_root_clk", "wdog_post_div", base + 0x49e0, 0);
         clks[IMX7D_WDOG4_ROOT_CLK] = imx_clk_gate4("wdog4_root_clk", "wdog_post_div", base + 0x49f0, 0);
+        clks[IMX7D_KPP_ROOT_CLK] = imx_clk_gate4("kpp_root_clk", "ipg_root_clk", base + 0x4aa0, 0);
         clks[IMX7D_CSI_MCLK_ROOT_CLK] = imx_clk_gate4("csi_mclk_root_clk", "csi_mclk_post_div", base + 0x4490, 0);
         clks[IMX7D_AUDIO_MCLK_ROOT_CLK] = imx_clk_gate4("audio_mclk_root_clk", "audio_mclk_post_div", base + 0x4790, 0);
         clks[IMX7D_WRCLK_ROOT_CLK] = imx_clk_gate4("wrclk_root_clk", "wrclk_post_div", base + 0x47a0, 0);
diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
index f2d8c3c53ea4..8bdaa9b43d49 100644
--- a/drivers/soc/amlogic/meson-gx-socinfo.c
+++ b/drivers/soc/amlogic/meson-gx-socinfo.c
@@ -41,6 +41,7 @@ static const struct meson_gx_package_id {
         unsigned int pack_id;
 } soc_packages[] = {
         { "S905", 0x1f, 0 },
+        { "S905H", 0x1f, 0x13 },
         { "S905M", 0x1f, 0x20 },
         { "S905D", 0x21, 0 },
         { "S905X", 0x21, 0x80 },
diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h
index e2f99ae72d5c..b2325d3e236a 100644
--- a/include/dt-bindings/clock/imx7d-clock.h
+++ b/include/dt-bindings/clock/imx7d-clock.h
@@ -452,5 +452,8 @@
 #define IMX7D_OCOTP_CLK                 439
 #define IMX7D_NAND_RAWNAND_CLK          440
 #define IMX7D_NAND_USDHC_BUS_RAWNAND_CLK 441
-#define IMX7D_CLK_END                   442
+#define IMX7D_SNVS_CLK                  442
+#define IMX7D_CAAM_CLK                  443
+#define IMX7D_KPP_ROOT_CLK              444
+#define IMX7D_CLK_END                   445
 #endif /* __DT_BINDINGS_CLOCK_IMX7D_H */
diff --git a/include/dt-bindings/clock/tegra194-clock.h b/include/dt-bindings/clock/tegra194-clock.h
new file mode 100644
index 000000000000..a2ff66342d69
--- /dev/null
+++ b/include/dt-bindings/clock/tegra194-clock.h
@@ -0,0 +1,321 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. */
+
+#ifndef __ABI_MACH_T194_CLOCK_H
+#define __ABI_MACH_T194_CLOCK_H
+
+#define TEGRA194_CLK_ACTMON                     1
+#define TEGRA194_CLK_ADSP                       2
+#define TEGRA194_CLK_ADSPNEON                   3
+#define TEGRA194_CLK_AHUB                       4
+#define TEGRA194_CLK_APB2APE                    5
+#define TEGRA194_CLK_APE                        6
+#define TEGRA194_CLK_AUD_MCLK                   7
+#define TEGRA194_CLK_AXI_CBB                    8
+#define TEGRA194_CLK_CAN1                       9
+#define TEGRA194_CLK_CAN1_HOST                  10
+#define TEGRA194_CLK_CAN2                       11
+#define TEGRA194_CLK_CAN2_HOST                  12
+#define TEGRA194_CLK_CEC                        13
+#define TEGRA194_CLK_CLK_M                      14
+#define TEGRA194_CLK_DMIC1                      15
+#define TEGRA194_CLK_DMIC2                      16
+#define TEGRA194_CLK_DMIC3                      17
+#define TEGRA194_CLK_DMIC4                      18
+#define TEGRA194_CLK_DPAUX                      19
+#define TEGRA194_CLK_DPAUX1                     20
+#define TEGRA194_CLK_ACLK                       21
+#define TEGRA194_CLK_MSS_ENCRYPT                22
+#define TEGRA194_CLK_EQOS_RX_INPUT              23
+#define TEGRA194_CLK_IQC2                       24
+#define TEGRA194_CLK_AON_APB                    25
+#define TEGRA194_CLK_AON_NIC                    26
+#define TEGRA194_CLK_AON_CPU_NIC                27
+#define TEGRA194_CLK_PLLA1                      28
+#define TEGRA194_CLK_DSPK1                      29
+#define TEGRA194_CLK_DSPK2                      30
+#define TEGRA194_CLK_EMC                        31
+#define TEGRA194_CLK_EQOS_AXI                   32
+#define TEGRA194_CLK_EQOS_PTP_REF               33
+#define TEGRA194_CLK_EQOS_RX                    34
+#define TEGRA194_CLK_EQOS_TX                    35
+#define TEGRA194_CLK_EXTPERIPH1                 36
+#define TEGRA194_CLK_EXTPERIPH2                 37
+#define TEGRA194_CLK_EXTPERIPH3                 38
+#define TEGRA194_CLK_EXTPERIPH4                 39
+#define TEGRA194_CLK_FUSE                       40
+#define TEGRA194_CLK_GPCCLK                     41
+#define TEGRA194_CLK_GPU_PWR                    42
+#define TEGRA194_CLK_HDA                        43
+#define TEGRA194_CLK_HDA2CODEC_2X               44
+#define TEGRA194_CLK_HDA2HDMICODEC              45
+#define TEGRA194_CLK_HOST1X                     46
+#define TEGRA194_CLK_HSIC_TRK                   47
+#define TEGRA194_CLK_I2C1                       48
+#define TEGRA194_CLK_I2C2                       49
+#define TEGRA194_CLK_I2C3                       50
+#define TEGRA194_CLK_I2C4                       51
+#define TEGRA194_CLK_I2C6                       52
+#define TEGRA194_CLK_I2C7                       53
+#define TEGRA194_CLK_I2C8                       54
+#define TEGRA194_CLK_I2C9                       55
+#define TEGRA194_CLK_I2S1                       56
+#define TEGRA194_CLK_I2S1_SYNC_INPUT            57
+#define TEGRA194_CLK_I2S2                       58
+#define TEGRA194_CLK_I2S2_SYNC_INPUT            59
+#define TEGRA194_CLK_I2S3                       60
+#define TEGRA194_CLK_I2S3_SYNC_INPUT            61
+#define TEGRA194_CLK_I2S4                       62
+#define TEGRA194_CLK_I2S4_SYNC_INPUT            63
+#define TEGRA194_CLK_I2S5                       64
+#define TEGRA194_CLK_I2S5_SYNC_INPUT            65
+#define TEGRA194_CLK_I2S6                       66
+#define TEGRA194_CLK_I2S6_SYNC_INPUT            67
+#define TEGRA194_CLK_IQC1                       68
+#define TEGRA194_CLK_ISP                        69
+#define TEGRA194_CLK_KFUSE                      70
+#define TEGRA194_CLK_MAUD                       71
+#define TEGRA194_CLK_MIPI_CAL                   72
+#define TEGRA194_CLK_MPHY_CORE_PLL_FIXED        73
+#define TEGRA194_CLK_MPHY_L0_RX_ANA             74
+#define TEGRA194_CLK_MPHY_L0_RX_LS_BIT          75
+#define TEGRA194_CLK_MPHY_L0_RX_SYMB            76
+#define TEGRA194_CLK_MPHY_L0_TX_LS_3XBIT        77
+#define TEGRA194_CLK_MPHY_L0_TX_SYMB            78
+#define TEGRA194_CLK_MPHY_L1_RX_ANA             79
+#define TEGRA194_CLK_MPHY_TX_1MHZ_REF           80
+#define TEGRA194_CLK_NVCSI                      81
+#define TEGRA194_CLK_NVCSILP                    82
+#define TEGRA194_CLK_NVDEC                      83
+#define TEGRA194_CLK_NVDISPLAYHUB               84
+#define TEGRA194_CLK_NVDISPLAY_DISP             85
+#define TEGRA194_CLK_NVDISPLAY_P0               86
+#define TEGRA194_CLK_NVDISPLAY_P1               87
+#define TEGRA194_CLK_NVDISPLAY_P2               88
+#define TEGRA194_CLK_NVENC                      89
+#define TEGRA194_CLK_NVJPG                      90
+#define TEGRA194_CLK_OSC                        91
+#define TEGRA194_CLK_AON_TOUCH                  92
+#define TEGRA194_CLK_PLLA                       93
+#define TEGRA194_CLK_PLLAON                     94
+#define TEGRA194_CLK_PLLD                       95
+#define TEGRA194_CLK_PLLD2                      96
+#define TEGRA194_CLK_PLLD3                      97
+#define TEGRA194_CLK_PLLDP                      98
+#define TEGRA194_CLK_PLLD4                      99
+#define TEGRA194_CLK_PLLE                       100
+#define TEGRA194_CLK_PLLP                       101
+#define TEGRA194_CLK_PLLP_OUT0                  102
+#define TEGRA194_CLK_UTMIPLL                    103
+#define TEGRA194_CLK_PLLA_OUT0                  104
+#define TEGRA194_CLK_PWM1                       105
+#define TEGRA194_CLK_PWM2                       106
+#define TEGRA194_CLK_PWM3                       107
+#define TEGRA194_CLK_PWM4                       108
+#define TEGRA194_CLK_PWM5                       109
+#define TEGRA194_CLK_PWM6                       110
+#define TEGRA194_CLK_PWM7                       111
+#define TEGRA194_CLK_PWM8                       112
+#define TEGRA194_CLK_RCE_CPU_NIC                113
+#define TEGRA194_CLK_RCE_NIC                    114
+#define TEGRA194_CLK_SATA                       115
+#define TEGRA194_CLK_SATA_OOB                   116
+#define TEGRA194_CLK_AON_I2C_SLOW               117
+#define TEGRA194_CLK_SCE_CPU_NIC                118
+#define TEGRA194_CLK_SCE_NIC                    119
+#define TEGRA194_CLK_SDMMC1                     120
+#define TEGRA194_CLK_UPHY_PLL3                  121
+#define TEGRA194_CLK_SDMMC3                     122
+#define TEGRA194_CLK_SDMMC4                     123
+#define TEGRA194_CLK_SE                         124
+#define TEGRA194_CLK_SOR0_OUT                   125
+#define TEGRA194_CLK_SOR0_REF                   126
+#define TEGRA194_CLK_SOR0_PAD_CLKOUT            127
+#define TEGRA194_CLK_SOR1_OUT                   128
+#define TEGRA194_CLK_SOR1_REF                   129
+#define TEGRA194_CLK_SOR1_PAD_CLKOUT            130
+#define TEGRA194_CLK_SOR_SAFE                   131
+#define TEGRA194_CLK_IQC1_IN                    132
+#define TEGRA194_CLK_IQC2_IN                    133
+#define TEGRA194_CLK_DMIC5                      134
+#define TEGRA194_CLK_SPI1                       135
+#define TEGRA194_CLK_SPI2                       136
+#define TEGRA194_CLK_SPI3                       137
+#define TEGRA194_CLK_I2C_SLOW                   138
+#define TEGRA194_CLK_SYNC_DMIC1                 139
+#define TEGRA194_CLK_SYNC_DMIC2                 140
+#define TEGRA194_CLK_SYNC_DMIC3                 141
+#define TEGRA194_CLK_SYNC_DMIC4                 142
+#define TEGRA194_CLK_SYNC_DSPK1                 143
+#define TEGRA194_CLK_SYNC_DSPK2                 144
+#define TEGRA194_CLK_SYNC_I2S1                  145
+#define TEGRA194_CLK_SYNC_I2S2                  146
+#define TEGRA194_CLK_SYNC_I2S3                  147
+#define TEGRA194_CLK_SYNC_I2S4                  148
+#define TEGRA194_CLK_SYNC_I2S5                  149
+#define TEGRA194_CLK_SYNC_I2S6                  150
+#define TEGRA194_CLK_MPHY_FORCE_LS_MODE         151
+#define TEGRA194_CLK_TACH                       152
+#define TEGRA194_CLK_TSEC                       153
+#define TEGRA194_CLK_TSECB                      154
+#define TEGRA194_CLK_UARTA                      155
+#define TEGRA194_CLK_UARTB                      156
+#define TEGRA194_CLK_UARTC                      157
+#define TEGRA194_CLK_UARTD                      158
+#define TEGRA194_CLK_UARTE                      159
+#define TEGRA194_CLK_UARTF                      160
+#define TEGRA194_CLK_UARTG                      161
+#define TEGRA194_CLK_UART_FST_MIPI_CAL          162
+#define TEGRA194_CLK_UFSDEV_REF                 163
+#define TEGRA194_CLK_UFSHC                      164
+#define TEGRA194_CLK_USB2_TRK                   165
+#define TEGRA194_CLK_VI                         166
+#define TEGRA194_CLK_VIC                        167
+#define TEGRA194_CLK_PVA0_AXI                   168
+#define TEGRA194_CLK_PVA0_VPS0                  169
+#define TEGRA194_CLK_PVA0_VPS1                  170
+#define TEGRA194_CLK_PVA1_AXI                   171
+#define TEGRA194_CLK_PVA1_VPS0                  172
+#define TEGRA194_CLK_PVA1_VPS1                  173
+#define TEGRA194_CLK_DLA0_FALCON                174
+#define TEGRA194_CLK_DLA0_CORE                  175
+#define TEGRA194_CLK_DLA1_FALCON                176
+#define TEGRA194_CLK_DLA1_CORE                  177
+#define TEGRA194_CLK_SOR2_OUT                   178
+#define TEGRA194_CLK_SOR2_REF                   179
+#define TEGRA194_CLK_SOR2_PAD_CLKOUT            180
+#define TEGRA194_CLK_SOR3_OUT                   181
+#define TEGRA194_CLK_SOR3_REF                   182
+#define TEGRA194_CLK_SOR3_PAD_CLKOUT            183
+#define TEGRA194_CLK_NVDISPLAY_P3               184
+#define TEGRA194_CLK_DPAUX2                     185
+#define TEGRA194_CLK_DPAUX3                     186
+#define TEGRA194_CLK_NVDEC1                     187
+#define TEGRA194_CLK_NVENC1                     188
+#define TEGRA194_CLK_SE_FREE                    189
+#define TEGRA194_CLK_UARTH                      190
+#define TEGRA194_CLK_FUSE_SERIAL                191
+#define TEGRA194_CLK_QSPI0                      192
+#define TEGRA194_CLK_QSPI1                      193
+#define TEGRA194_CLK_QSPI0_PM                   194
+#define TEGRA194_CLK_QSPI1_PM                   195
+#define TEGRA194_CLK_VI_CONST                   196
+#define TEGRA194_CLK_NAFLL_BPMP                 197
+#define TEGRA194_CLK_NAFLL_SCE                  198
+#define TEGRA194_CLK_NAFLL_NVDEC                199
+#define TEGRA194_CLK_NAFLL_NVJPG                200
+#define TEGRA194_CLK_NAFLL_TSEC                 201
+#define TEGRA194_CLK_NAFLL_TSECB                202
+#define TEGRA194_CLK_NAFLL_VI                   203
+#define TEGRA194_CLK_NAFLL_SE                   204
+#define TEGRA194_CLK_NAFLL_NVENC                205
+#define TEGRA194_CLK_NAFLL_ISP                  206
+#define TEGRA194_CLK_NAFLL_VIC                  207
+#define TEGRA194_CLK_NAFLL_NVDISPLAYHUB         208
+#define TEGRA194_CLK_NAFLL_AXICBB               209
+#define TEGRA194_CLK_NAFLL_DLA                  210
+#define TEGRA194_CLK_NAFLL_PVA_CORE             211
+#define TEGRA194_CLK_NAFLL_PVA_VPS              212
+#define TEGRA194_CLK_NAFLL_CVNAS                213
+#define TEGRA194_CLK_NAFLL_RCE                  214
+#define TEGRA194_CLK_NAFLL_NVENC1               215
+#define TEGRA194_CLK_NAFLL_DLA_FALCON           216
+#define TEGRA194_CLK_NAFLL_NVDEC1               217
+#define TEGRA194_CLK_NAFLL_GPU                  218
+#define TEGRA194_CLK_SDMMC_LEGACY_TM            219
+#define TEGRA194_CLK_PEX0_CORE_0                220
+#define TEGRA194_CLK_PEX0_CORE_1                221
+#define TEGRA194_CLK_PEX0_CORE_2                222
+#define TEGRA194_CLK_PEX0_CORE_3                223
+#define TEGRA194_CLK_PEX0_CORE_4                224
+#define TEGRA194_CLK_PEX1_CORE_5                225
+#define TEGRA194_CLK_PEX_REF1                   226
+#define TEGRA194_CLK_PEX_REF2                   227
+#define TEGRA194_CLK_CSI_A                      229
+#define TEGRA194_CLK_CSI_B                      230
+#define TEGRA194_CLK_CSI_C                      231
+#define TEGRA194_CLK_CSI_D                      232
+#define TEGRA194_CLK_CSI_E                      233
+#define TEGRA194_CLK_CSI_F                      234
+#define TEGRA194_CLK_CSI_G                      235
+#define TEGRA194_CLK_CSI_H                      236
+#define TEGRA194_CLK_PLLC4                      237
+#define TEGRA194_CLK_PLLC4_OUT                  238
+#define TEGRA194_CLK_PLLC4_OUT1                 239
+#define TEGRA194_CLK_PLLC4_OUT2                 240
+#define TEGRA194_CLK_PLLC4_MUXED                241
+#define TEGRA194_CLK_PLLC4_VCO_DIV2             242
+#define TEGRA194_CLK_CSI_A_PAD                  244
+#define TEGRA194_CLK_CSI_B_PAD                  245
+#define TEGRA194_CLK_CSI_C_PAD                  246
+#define TEGRA194_CLK_CSI_D_PAD                  247
+#define TEGRA194_CLK_CSI_E_PAD                  248
+#define TEGRA194_CLK_CSI_F_PAD                  249
+#define TEGRA194_CLK_CSI_G_PAD                  250
+#define TEGRA194_CLK_CSI_H_PAD                  251
+#define TEGRA194_CLK_PEX_SATA_USB_RX_BYP        254
+#define TEGRA194_CLK_PEX_USB_PAD_PLL0_MGMT      255
+#define TEGRA194_CLK_PEX_USB_PAD_PLL1_MGMT      256
+#define TEGRA194_CLK_PEX_USB_PAD_PLL2_MGMT      257
+#define TEGRA194_CLK_PEX_USB_PAD_PLL3_MGMT      258
+#define TEGRA194_CLK_XUSB_CORE_DEV              265
+#define TEGRA194_CLK_XUSB_CORE_MUX              266
+#define TEGRA194_CLK_XUSB_CORE_HOST             267
+#define TEGRA194_CLK_XUSB_CORE_SS               268
+#define TEGRA194_CLK_XUSB_FALCON                269
+#define TEGRA194_CLK_XUSB_FALCON_HOST           270
+#define TEGRA194_CLK_XUSB_FALCON_SS             271
+#define TEGRA194_CLK_XUSB_FS                    272
+#define TEGRA194_CLK_XUSB_FS_HOST               273
+#define TEGRA194_CLK_XUSB_FS_DEV                274
+#define TEGRA194_CLK_XUSB_SS                    275
+#define TEGRA194_CLK_XUSB_SS_DEV                276
+#define TEGRA194_CLK_XUSB_SS_SUPERSPEED         277
+#define TEGRA194_CLK_PLLDISPHUB                 278
+#define TEGRA194_CLK_PLLDISPHUB_DIV             279
+#define TEGRA194_CLK_NAFLL_CLUSTER0             280
+#define TEGRA194_CLK_NAFLL_CLUSTER1             281
+#define TEGRA194_CLK_NAFLL_CLUSTER2             282
+#define TEGRA194_CLK_NAFLL_CLUSTER3             283
+#define TEGRA194_CLK_CAN1_CORE                  284
+#define TEGRA194_CLK_CAN2_CORE                  285
+#define TEGRA194_CLK_PLLA1_OUT1                 286
+#define TEGRA194_CLK_PLLREFE_VCOOUT             288
+#define TEGRA194_CLK_CLK_32K                    289
+#define TEGRA194_CLK_SPDIFIN_SYNC_INPUT         290
+#define TEGRA194_CLK_UTMIPLL_CLKOUT48           291
+#define TEGRA194_CLK_UTMIPLL_CLKOUT480          292
+#define TEGRA194_CLK_CVNAS                      293
+#define TEGRA194_CLK_PLLNVCSI                   294
+#define TEGRA194_CLK_PVA0_CPU_AXI               295
+#define TEGRA194_CLK_PVA1_CPU_AXI               296
+#define TEGRA194_CLK_PVA0_VPS                   297
+#define TEGRA194_CLK_PVA1_VPS                   298
+#define TEGRA194_CLK_DLA0_FALCON_MUX            299
+#define TEGRA194_CLK_DLA1_FALCON_MUX            300
+#define TEGRA194_CLK_DLA0_CORE_MUX              301
+#define TEGRA194_CLK_DLA1_CORE_MUX              302
+#define TEGRA194_CLK_UTMIPLL_HPS                304
+#define TEGRA194_CLK_I2C5                       305
+#define TEGRA194_CLK_I2C10                      306
+#define TEGRA194_CLK_BPMP_CPU_NIC               307
+#define TEGRA194_CLK_BPMP_APB                   308
+#define TEGRA194_CLK_TSC                        309
+#define TEGRA194_CLK_EMCSA                      310
+#define TEGRA194_CLK_EMCSB                      311
+#define TEGRA194_CLK_EMCSC                      312
+#define TEGRA194_CLK_EMCSD                      313
+#define TEGRA194_CLK_PLLC                       314
+#define TEGRA194_CLK_PLLC2                      315
+#define TEGRA194_CLK_PLLC3                      316
+#define TEGRA194_CLK_TSC_REF                    317
+#define TEGRA194_CLK_FUSE_BURN                  318
+#define TEGRA194_CLK_PEX0_CORE_0M               319
+#define TEGRA194_CLK_PEX0_CORE_1M               320
+#define TEGRA194_CLK_PEX0_CORE_2M               321
+#define TEGRA194_CLK_PEX0_CORE_3M               322
+#define TEGRA194_CLK_PEX0_CORE_4M               323
+#define TEGRA194_CLK_PEX1_CORE_5M               324
+#define TEGRA194_CLK_PLLE_HPS                   326
+
+#endif
diff --git a/include/dt-bindings/gpio/tegra194-gpio.h b/include/dt-bindings/gpio/tegra194-gpio.h
new file mode 100644
index 000000000000..ede860225f6b
--- /dev/null
+++ b/include/dt-bindings/gpio/tegra194-gpio.h
@@ -0,0 +1,61 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. */
+
+/*
+ * This header provides constants for binding nvidia,tegra194-gpio*.
+ *
+ * The first cell in Tegra's GPIO specifier is the GPIO ID. The macros below
+ * provide names for this.
+ *
+ * The second cell contains standard flag values specified in gpio.h.
+ */
+
+#ifndef _DT_BINDINGS_GPIO_TEGRA194_GPIO_H
+#define _DT_BINDINGS_GPIO_TEGRA194_GPIO_H
+
+#include <dt-bindings/gpio/gpio.h>
+
+/* GPIOs implemented by main GPIO controller */
+#define TEGRA194_MAIN_GPIO_PORT_A 0
+#define TEGRA194_MAIN_GPIO_PORT_B 1
+#define TEGRA194_MAIN_GPIO_PORT_C 2
+#define TEGRA194_MAIN_GPIO_PORT_D 3
+#define TEGRA194_MAIN_GPIO_PORT_E 4
+#define TEGRA194_MAIN_GPIO_PORT_F 5
+#define TEGRA194_MAIN_GPIO_PORT_G 6
+#define TEGRA194_MAIN_GPIO_PORT_H 7
+#define TEGRA194_MAIN_GPIO_PORT_I 8
+#define TEGRA194_MAIN_GPIO_PORT_J 9
+#define TEGRA194_MAIN_GPIO_PORT_K 10
+#define TEGRA194_MAIN_GPIO_PORT_L 11
+#define TEGRA194_MAIN_GPIO_PORT_M 12
+#define TEGRA194_MAIN_GPIO_PORT_N 13
+#define TEGRA194_MAIN_GPIO_PORT_O 14
+#define TEGRA194_MAIN_GPIO_PORT_P 15
+#define TEGRA194_MAIN_GPIO_PORT_Q 16
+#define TEGRA194_MAIN_GPIO_PORT_R 17
+#define TEGRA194_MAIN_GPIO_PORT_S 18
+#define TEGRA194_MAIN_GPIO_PORT_T 19
+#define TEGRA194_MAIN_GPIO_PORT_U 20
+#define TEGRA194_MAIN_GPIO_PORT_V 21
+#define TEGRA194_MAIN_GPIO_PORT_W 22
+#define TEGRA194_MAIN_GPIO_PORT_X 23
+#define TEGRA194_MAIN_GPIO_PORT_Y 24
+#define TEGRA194_MAIN_GPIO_PORT_Z 25
+#define TEGRA194_MAIN_GPIO_PORT_FF 26
+#define TEGRA194_MAIN_GPIO_PORT_GG 27
+
+#define TEGRA194_MAIN_GPIO(port, offset) \
+        ((TEGRA194_MAIN_GPIO_PORT_##port * 8) + offset)
+
+/* GPIOs implemented by AON GPIO controller */
+#define TEGRA194_AON_GPIO_PORT_AA 0
+#define TEGRA194_AON_GPIO_PORT_BB 1
+#define TEGRA194_AON_GPIO_PORT_CC 2
+#define TEGRA194_AON_GPIO_PORT_DD 3
+#define TEGRA194_AON_GPIO_PORT_EE 4
+
+#define TEGRA194_AON_GPIO(port, offset) \
+        ((TEGRA194_AON_GPIO_PORT_##port * 8) + offset)
+
+#endif
diff --git a/include/dt-bindings/mfd/stm32f7-rcc.h b/include/dt-bindings/mfd/stm32f7-rcc.h
index 8b7b7197ffd7..a90f3613c584 100644
--- a/include/dt-bindings/mfd/stm32f7-rcc.h
+++ b/include/dt-bindings/mfd/stm32f7-rcc.h
@@ -91,6 +91,7 @@
 #define STM32F7_RCC_APB2_TIM8           1
 #define STM32F7_RCC_APB2_USART1         4
 #define STM32F7_RCC_APB2_USART6         5
+#define STM32F7_RCC_APB2_SDMMC2         7
 #define STM32F7_RCC_APB2_ADC1           8
 #define STM32F7_RCC_APB2_ADC2           9
 #define STM32F7_RCC_APB2_ADC3           10
diff --git a/include/dt-bindings/power/tegra194-powergate.h b/include/dt-bindings/power/tegra194-powergate.h
new file mode 100644
index 000000000000..82253742a493
--- /dev/null
+++ b/include/dt-bindings/power/tegra194-powergate.h
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. */
+
+#ifndef __ABI_MACH_T194_POWERGATE_T194_H_
+#define __ABI_MACH_T194_POWERGATE_T194_H_
+
+#define TEGRA194_POWER_DOMAIN_AUD       1
+#define TEGRA194_POWER_DOMAIN_DISP      2
+#define TEGRA194_POWER_DOMAIN_DISPB     3
+#define TEGRA194_POWER_DOMAIN_DISPC     4
+#define TEGRA194_POWER_DOMAIN_ISPA      5
+#define TEGRA194_POWER_DOMAIN_NVDECA    6
+#define TEGRA194_POWER_DOMAIN_NVJPG     7
+#define TEGRA194_POWER_DOMAIN_NVENCA    8
+#define TEGRA194_POWER_DOMAIN_NVENCB    9
+#define TEGRA194_POWER_DOMAIN_NVDECB    10
+#define TEGRA194_POWER_DOMAIN_SAX       11
+#define TEGRA194_POWER_DOMAIN_VE        12
+#define TEGRA194_POWER_DOMAIN_VIC       13
+#define TEGRA194_POWER_DOMAIN_XUSBA     14
+#define TEGRA194_POWER_DOMAIN_XUSBB     15
+#define TEGRA194_POWER_DOMAIN_XUSBC     16
+#define TEGRA194_POWER_DOMAIN_PCIEX8A   17
+#define TEGRA194_POWER_DOMAIN_PCIEX4A   18
+#define TEGRA194_POWER_DOMAIN_PCIEX1A   19
+#define TEGRA194_POWER_DOMAIN_PCIEX8B   21
+#define TEGRA194_POWER_DOMAIN_PVAA      22
+#define TEGRA194_POWER_DOMAIN_PVAB      23
+#define TEGRA194_POWER_DOMAIN_DLAA      24
+#define TEGRA194_POWER_DOMAIN_DLAB      25
+#define TEGRA194_POWER_DOMAIN_CV        26
+#define TEGRA194_POWER_DOMAIN_GPU       27
+#define TEGRA194_POWER_DOMAIN_MAX       27
+
+#endif
diff --git a/include/dt-bindings/reset/tegra194-reset.h b/include/dt-bindings/reset/tegra194-reset.h
new file mode 100644
index 000000000000..473afaa25bfb
--- /dev/null
+++ b/include/dt-bindings/reset/tegra194-reset.h
@@ -0,0 +1,152 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. */
+
+#ifndef __ABI_MACH_T194_RESET_H
+#define __ABI_MACH_T194_RESET_H
+
+#define TEGRA194_RESET_ACTMON                   1
+#define TEGRA194_RESET_ADSP_ALL                 2
+#define TEGRA194_RESET_AFI                      3
+#define TEGRA194_RESET_CAN1                     4
+#define TEGRA194_RESET_CAN2                     5
+#define TEGRA194_RESET_DLA0                     6
+#define TEGRA194_RESET_DLA1                     7
+#define TEGRA194_RESET_DPAUX                    8
+#define TEGRA194_RESET_DPAUX1                   9
+#define TEGRA194_RESET_DPAUX2                   10
+#define TEGRA194_RESET_DPAUX3                   11
+#define TEGRA194_RESET_EQOS                     17
+#define TEGRA194_RESET_GPCDMA                   18
+#define TEGRA194_RESET_GPU                      19
+#define TEGRA194_RESET_HDA                      20
+#define TEGRA194_RESET_HDA2CODEC_2X             21
+#define TEGRA194_RESET_HDA2HDMICODEC            22
+#define TEGRA194_RESET_HOST1X                   23
+#define TEGRA194_RESET_I2C1                     24
+#define TEGRA194_RESET_I2C10                    25
+#define TEGRA194_RESET_RSVD_26                  26
+#define TEGRA194_RESET_RSVD_27                  27
+#define TEGRA194_RESET_RSVD_28                  28
+#define TEGRA194_RESET_I2C2                     29
+#define TEGRA194_RESET_I2C3                     30
+#define TEGRA194_RESET_I2C4                     31
+#define TEGRA194_RESET_I2C6                     32
+#define TEGRA194_RESET_I2C7                     33
+#define TEGRA194_RESET_I2C8                     34
+#define TEGRA194_RESET_I2C9                     35
+#define TEGRA194_RESET_ISP                      36
+#define TEGRA194_RESET_MIPI_CAL                 37
+#define TEGRA194_RESET_MPHY_CLK_CTL             38
+#define TEGRA194_RESET_MPHY_L0_RX               39
+#define TEGRA194_RESET_MPHY_L0_TX               40
+#define TEGRA194_RESET_MPHY_L1_RX               41
+#define TEGRA194_RESET_MPHY_L1_TX               42
+#define TEGRA194_RESET_NVCSI                    43
+#define TEGRA194_RESET_NVDEC                    44
+#define TEGRA194_RESET_NVDISPLAY0_HEAD0         45
+#define TEGRA194_RESET_NVDISPLAY0_HEAD1         46
+#define TEGRA194_RESET_NVDISPLAY0_HEAD2         47
+#define TEGRA194_RESET_NVDISPLAY0_HEAD3         48
+#define TEGRA194_RESET_NVDISPLAY0_MISC          49
+#define TEGRA194_RESET_NVDISPLAY0_WGRP0         50
+#define TEGRA194_RESET_NVDISPLAY0_WGRP1         51
+#define TEGRA194_RESET_NVDISPLAY0_WGRP2         52
+#define TEGRA194_RESET_NVDISPLAY0_WGRP3         53
+#define TEGRA194_RESET_NVDISPLAY0_WGRP4         54
+#define TEGRA194_RESET_NVDISPLAY0_WGRP5         55
+#define TEGRA194_RESET_RSVD_56                  56
+#define TEGRA194_RESET_RSVD_57                  57
+#define TEGRA194_RESET_RSVD_58                  58
+#define TEGRA194_RESET_NVENC                    59
+#define TEGRA194_RESET_NVENC1                   60
+#define TEGRA194_RESET_NVJPG                    61
+#define TEGRA194_RESET_PCIE                     62
+#define TEGRA194_RESET_PCIEXCLK                 63
+#define TEGRA194_RESET_RSVD_64                  64
+#define TEGRA194_RESET_RSVD_65                  65
+#define TEGRA194_RESET_PVA0_ALL                 66
+#define TEGRA194_RESET_PVA1_ALL                 67
+#define TEGRA194_RESET_PWM1                     68
+#define TEGRA194_RESET_PWM2                     69
+#define TEGRA194_RESET_PWM3                     70
+#define TEGRA194_RESET_PWM4                     71
+#define TEGRA194_RESET_PWM5                     72
+#define TEGRA194_RESET_PWM6                     73
+#define TEGRA194_RESET_PWM7                     74
+#define TEGRA194_RESET_PWM8                     75
+#define TEGRA194_RESET_QSPI0                    76
+#define TEGRA194_RESET_QSPI1                    77
+#define TEGRA194_RESET_SATA                     78
+#define TEGRA194_RESET_SATACOLD                 79
+#define TEGRA194_RESET_SCE_ALL                  80
+#define TEGRA194_RESET_RCE_ALL                  81
+#define TEGRA194_RESET_SDMMC1                   82
+#define TEGRA194_RESET_RSVD_83                  83
+#define TEGRA194_RESET_SDMMC3                   84
+#define TEGRA194_RESET_SDMMC4                   85
+#define TEGRA194_RESET_SE                       86
+#define TEGRA194_RESET_SOR0                     87
+#define TEGRA194_RESET_SOR1                     88
+#define TEGRA194_RESET_SOR2                     89
+#define TEGRA194_RESET_SOR3                     90
+#define TEGRA194_RESET_SPI1                     91
+#define TEGRA194_RESET_SPI2                     92
+#define TEGRA194_RESET_SPI3                     93
+#define TEGRA194_RESET_SPI4                     94
+#define TEGRA194_RESET_TACH                     95
+#define TEGRA194_RESET_RSVD_96                  96
+#define TEGRA194_RESET_TSCTNVI                  97
+#define TEGRA194_RESET_TSEC                     98
+#define TEGRA194_RESET_TSECB                    99
+#define TEGRA194_RESET_UARTA                    100
+#define TEGRA194_RESET_UARTB                    101
+#define TEGRA194_RESET_UARTC                    102
+#define TEGRA194_RESET_UARTD                    103
+#define TEGRA194_RESET_UARTE                    104
+#define TEGRA194_RESET_UARTF                    105
+#define TEGRA194_RESET_UARTG                    106
+#define TEGRA194_RESET_UARTH                    107
+#define TEGRA194_RESET_UFSHC                    108
+#define TEGRA194_RESET_UFSHC_AXI_M              109
+#define TEGRA194_RESET_UFSHC_LP_SEQ             110
+#define TEGRA194_RESET_RSVD_111                 111
+#define TEGRA194_RESET_VI                       112
+#define TEGRA194_RESET_VIC                      113
+#define TEGRA194_RESET_XUSB_PADCTL              114
+#define TEGRA194_RESET_NVDEC1                   115
+#define TEGRA194_RESET_PEX0_CORE_0              116
+#define TEGRA194_RESET_PEX0_CORE_1              117
+#define TEGRA194_RESET_PEX0_CORE_2              118
+#define TEGRA194_RESET_PEX0_CORE_3              119
+#define TEGRA194_RESET_PEX0_CORE_4              120
+#define TEGRA194_RESET_PEX0_CORE_0_APB          121
+#define TEGRA194_RESET_PEX0_CORE_1_APB          122
+#define TEGRA194_RESET_PEX0_CORE_2_APB          123
+#define TEGRA194_RESET_PEX0_CORE_3_APB          124
+#define TEGRA194_RESET_PEX0_CORE_4_APB          125
+#define TEGRA194_RESET_PEX0_COMMON_APB          126
+#define TEGRA194_RESET_PEX1_CORE_5              129
+#define TEGRA194_RESET_PEX1_CORE_5_APB          130
+#define TEGRA194_RESET_CVNAS                    131
+#define TEGRA194_RESET_CVNAS_FCM                132
+#define TEGRA194_RESET_DMIC5                    144
+#define TEGRA194_RESET_APE                      145
+#define TEGRA194_RESET_PEX_USB_UPHY             146
+#define TEGRA194_RESET_PEX_USB_UPHY_L0          147
+#define TEGRA194_RESET_PEX_USB_UPHY_L1          148
+#define TEGRA194_RESET_PEX_USB_UPHY_L2          149
+#define TEGRA194_RESET_PEX_USB_UPHY_L3          150
+#define TEGRA194_RESET_PEX_USB_UPHY_L4          151
+#define TEGRA194_RESET_PEX_USB_UPHY_L5          152
+#define TEGRA194_RESET_PEX_USB_UPHY_L6          153
+#define TEGRA194_RESET_PEX_USB_UPHY_L7          154
+#define TEGRA194_RESET_PEX_USB_UPHY_L8          155
+#define TEGRA194_RESET_PEX_USB_UPHY_L9          156
+#define TEGRA194_RESET_PEX_USB_UPHY_L10         157
+#define TEGRA194_RESET_PEX_USB_UPHY_L11         158
+#define TEGRA194_RESET_PEX_USB_UPHY_PLL0        159
+#define TEGRA194_RESET_PEX_USB_UPHY_PLL1        160
+#define TEGRA194_RESET_PEX_USB_UPHY_PLL2        161
+#define TEGRA194_RESET_PEX_USB_UPHY_PLL3        162
+
+#endif