Merge tag 'imx-dt64-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64

Freescale arm64 device tree updates for 4.11:
 - Add support for LS1012A SoC which is an ARMv8 SoC with single
   Cortex-A53 core, and the corresponding board support: FRDM, QDS
   and RDB.
 - Enable TMU (Thermal Monitoring Unit) support for LS1046A SoC.
 - Enable PCA9547 device for ls2080a-rdb board by removing 'disabled'
   status setting.

* tag 'imx-dt64-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: clockgen: Add compatible string for LS1012A
  Documentation: DT: add LS1012A compatible for SCFG and DCFG
  Documentation: DT: Add entry for FSL LS1012A RDB, FRDM, QDS boards
  arm64: dts: ls1046a: Add TMU device tree support
  arm64: dts: Add support for FSL's LS1012A SoC
  arm64: dts: ls2080a-rdb: remove disable status of pca9547

Signed-off-by: Olof Johansson <olof@lixom.net>

9 files changed, 651 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index d6ee9c6e1dbb..c9c567ae227f 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -108,7 +108,7 @@ status.
   - compatible: Should contain a chip-specific compatible string,
         Chip-specific strings are of the form "fsl,<chip>-scfg",
         The following <chip>s are known to be supported:
-        ls1021a, ls1043a, ls1046a, ls2080a.
+        ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.
 
   - reg: should contain base address and length of SCFG memory-mapped registers
 
@@ -126,7 +126,7 @@ core start address and release the secondary core from holdoff and startup.
   - compatible: Should contain a chip-specific compatible string,
         Chip-specific strings are of the form "fsl,<chip>-dcfg",
         The following <chip>s are known to be supported:
-        ls1021a, ls1043a, ls1046a, ls2080a.
+        ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.
 
   - reg : should contain base address and length of DCFG memory-mapped registers
 
@@ -139,6 +139,22 @@ Example:
 Freescale ARMv8 based Layerscape SoC family Device Tree Bindings
 ----------------------------------------------------------------
 
+LS1012A SoC
+Required root node properties:
+    - compatible = "fsl,ls1012a";
+
+LS1012A ARMv8 based RDB Board
+Required root node properties:
+    - compatible = "fsl,ls1012a-rdb", "fsl,ls1012a";
+
+LS1012A ARMv8 based FRDM Board
+Required root node properties:
+    - compatible = "fsl,ls1012a-frdm", "fsl,ls1012a";
+
+LS1012A ARMv8 based QDS Board
+Required root node properties:
+    - compatible = "fsl,ls1012a-qds", "fsl,ls1012a";
+
 LS1043A SoC
 Required root node properties:
     - compatible = "fsl,ls1043a";
diff --git a/Documentation/devicetree/bindings/clock/qoriq-clock.txt b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
index df9cb5ac5f72..aa3526f229a7 100644
--- a/Documentation/devicetree/bindings/clock/qoriq-clock.txt
+++ b/Documentation/devicetree/bindings/clock/qoriq-clock.txt
@@ -31,6 +31,7 @@ Required properties:
         * "fsl,t4240-clockgen"
         * "fsl,b4420-clockgen"
         * "fsl,b4860-clockgen"
+        * "fsl,ls1012a-clockgen"
         * "fsl,ls1021a-clockgen"
         * "fsl,ls1043a-clockgen"
         * "fsl,ls1046a-clockgen"
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 66027181fba4..39db645b268e 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -1,3 +1,6 @@
+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb
+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb
+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-qds.dtb
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
new file mode 100644
index 000000000000..a619f6496a4c
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
@@ -0,0 +1,115 @@
+/*
+ * Device Tree file for Freescale LS1012A Freedom Board.
+ *
+ * Copyright 2016, Freescale Semiconductor
+ *
+ * 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.
+ */
+/dts-v1/;
+
+#include "fsl-ls1012a.dtsi"
+
+/ {
+        model = "LS1012A Freedom Board";
+        compatible = "fsl,ls1012a-frdm", "fsl,ls1012a";
+
+        sys_mclk: clock-mclk {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <25000000>;
+        };
+
+        reg_1p8v: regulator-1p8v {
+                compatible = "regulator-fixed";
+                regulator-name = "1P8V";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                regulator-always-on;
+        };
+
+        sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,format = "i2s";
+                simple-audio-card,widgets =
+                        "Microphone", "Microphone Jack",
+                        "Headphone", "Headphone Jack",
+                        "Speaker", "Speaker Ext",
+                        "Line", "Line In Jack";
+                simple-audio-card,routing =
+                        "MIC_IN", "Microphone Jack",
+                        "Microphone Jack", "Mic Bias",
+                        "LINE_IN", "Line In Jack",
+                        "Headphone Jack", "HP_OUT",
+                        "Speaker Ext", "LINE_OUT";
+
+                simple-audio-card,cpu {
+                        sound-dai = <&sai2>;
+                        frame-master;
+                        bitclock-master;
+                };
+
+                simple-audio-card,codec {
+                        sound-dai = <&codec>;
+                        frame-master;
+                        bitclock-master;
+                        system-clock-frequency = <25000000>;
+                };
+        };
+};
+
+&duart0 {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+
+        codec: sgtl5000@a {
+                #sound-dai-cells = <0>;
+                compatible = "fsl,sgtl5000";
+                reg = <0xa>;
+                VDDA-supply = <&reg_1p8v>;
+                VDDIO-supply = <&reg_1p8v>;
+                clocks = <&sys_mclk>;
+        };
+};
+
+&sai2 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
new file mode 100644
index 000000000000..14a67f1709e7
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
@@ -0,0 +1,128 @@
+/*
+ * Device Tree file for Freescale LS1012A QDS Board.
+ *
+ * Copyright 2016, Freescale Semiconductor
+ *
+ * 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.
+ */
+/dts-v1/;
+
+#include "fsl-ls1012a.dtsi"
+
+/ {
+        model = "LS1012A QDS Board";
+        compatible = "fsl,ls1012a-qds", "fsl,ls1012a";
+
+        sys_mclk: clock-mclk {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <24576000>;
+        };
+
+        reg_3p3v: regulator-3p3v {
+                compatible = "regulator-fixed";
+                regulator-name = "3P3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+        };
+
+        sound {
+                compatible = "simple-audio-card";
+                simple-audio-card,format = "i2s";
+                simple-audio-card,widgets =
+                        "Microphone", "Microphone Jack",
+                        "Headphone", "Headphone Jack",
+                        "Speaker", "Speaker Ext",
+                        "Line", "Line In Jack";
+                simple-audio-card,routing =
+                        "MIC_IN", "Microphone Jack",
+                        "Microphone Jack", "Mic Bias",
+                        "LINE_IN", "Line In Jack",
+                        "Headphone Jack", "HP_OUT",
+                        "Speaker Ext", "LINE_OUT";
+
+                simple-audio-card,cpu {
+                        sound-dai = <&sai2>;
+                        frame-master;
+                        bitclock-master;
+                };
+
+                simple-audio-card,codec {
+                        sound-dai = <&codec>;
+                        frame-master;
+                        bitclock-master;
+                        system-clock-frequency = <24576000>;
+                };
+        };
+};
+
+&duart0 {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+
+        pca9547@77 {
+                compatible = "nxp,pca9547";
+                reg = <0x77>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                i2c@4 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x4>;
+
+                        codec: sgtl5000@a {
+                                #sound-dai-cells = <0>;
+                                compatible = "fsl,sgtl5000";
+                                reg = <0xa>;
+                                VDDA-supply = <&reg_3p3v>;
+                                VDDIO-supply = <&reg_3p3v>;
+                                clocks = <&sys_mclk>;
+                        };
+                };
+        };
+};
+
+&sai2 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
new file mode 100644
index 000000000000..62c5c7123a15
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
@@ -0,0 +1,59 @@
+/*
+ * Device Tree file for Freescale LS1012A RDB Board.
+ *
+ * Copyright 2016, Freescale Semiconductor
+ *
+ * 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.
+ */
+/dts-v1/;
+
+#include "fsl-ls1012a.dtsi"
+
+/ {
+        model = "LS1012A RDB Board";
+        compatible = "fsl,ls1012a-rdb", "fsl,ls1012a";
+};
+
+&duart0 {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
new file mode 100644
index 000000000000..cffebb4b3df1
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -0,0 +1,247 @@
+/*
+ * Device Tree Include file for Freescale Layerscape-1012A family SoC.
+ *
+ * Copyright 2016, Freescale Semiconductor
+ *
+ * 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.
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+        compatible = "fsl,ls1012a";
+        interrupt-parent = <&gic>;
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu0: cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a53";
+                        reg = <0x0>;
+                        clocks = <&clockgen 1 0>;
+                        #cooling-cells = <2>;
+                };
+        };
+
+        sysclk: sysclk {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <100000000>;
+                clock-output-names = "sysclk";
+        };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                interrupts = <1 13 IRQ_TYPE_LEVEL_LOW>,/* Physical Secure PPI */
+                             <1 14 IRQ_TYPE_LEVEL_LOW>,/* Physical Non-Secure PPI */
+                             <1 11 IRQ_TYPE_LEVEL_LOW>,/* Virtual PPI */
+                             <1 10 IRQ_TYPE_LEVEL_LOW>;/* Hypervisor PPI */
+        };
+
+        pmu {
+                compatible = "arm,armv8-pmuv3";
+                interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
+        gic: interrupt-controller@1400000 {
+                compatible = "arm,gic-400";
+                #interrupt-cells = <3>;
+                interrupt-controller;
+                reg = <0x0 0x1401000 0 0x1000>, /* GICD */
+                      <0x0 0x1402000 0 0x2000>, /* GICC */
+                      <0x0 0x1404000 0 0x2000>, /* GICH */
+                      <0x0 0x1406000 0 0x2000>; /* GICV */
+                interrupts = <1 9 IRQ_TYPE_LEVEL_LOW>;
+        };
+
+        reboot {
+                compatible = "syscon-reboot";
+                regmap = <&dcfg>;
+                offset = <0xb0>;
+                mask = <0x02>;
+        };
+
+        soc {
+                compatible = "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                scfg: scfg@1570000 {
+                        compatible = "fsl,ls1012a-scfg", "syscon";
+                        reg = <0x0 0x1570000 0x0 0x10000>;
+                        big-endian;
+                };
+
+                dcfg: dcfg@1ee0000 {
+                        compatible = "fsl,ls1012a-dcfg",
+                                     "syscon";
+                        reg = <0x0 0x1ee0000 0x0 0x10000>;
+                        big-endian;
+                };
+
+                clockgen: clocking@1ee1000 {
+                        compatible = "fsl,ls1012a-clockgen";
+                        reg = <0x0 0x1ee1000 0x0 0x1000>;
+                        #clock-cells = <2>;
+                        clocks = <&sysclk>;
+                };
+
+                i2c0: i2c@2180000 {
+                        compatible = "fsl,vf610-i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x0 0x2180000 0x0 0x10000>;
+                        interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clockgen 4 0>;
+                        status = "disabled";
+                };
+
+                i2c1: i2c@2190000 {
+                        compatible = "fsl,vf610-i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x0 0x2190000 0x0 0x10000>;
+                        interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clockgen 4 0>;
+                        status = "disabled";
+                };
+
+                duart0: serial@21c0500 {
+                        compatible = "fsl,ns16550", "ns16550a";
+                        reg = <0x00 0x21c0500 0x0 0x100>;
+                        interrupts = <0 54 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clockgen 4 0>;
+                        status = "disabled";
+                };
+
+                duart1: serial@21c0600 {
+                        compatible = "fsl,ns16550", "ns16550a";
+                        reg = <0x00 0x21c0600 0x0 0x100>;
+                        interrupts = <0 54 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clockgen 4 0>;
+                        status = "disabled";
+                };
+
+                gpio0: gpio@2300000 {
+                        compatible = "fsl,qoriq-gpio";
+                        reg = <0x0 0x2300000 0x0 0x10000>;
+                        interrupts = <0 66 IRQ_TYPE_LEVEL_HIGH>;
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio1: gpio@2310000 {
+                        compatible = "fsl,qoriq-gpio";
+                        reg = <0x0 0x2310000 0x0 0x10000>;
+                        interrupts = <0 67 IRQ_TYPE_LEVEL_HIGH>;
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                wdog0: wdog@2ad0000 {
+                        compatible = "fsl,ls1012a-wdt",
+                                     "fsl,imx21-wdt";
+                        reg = <0x0 0x2ad0000 0x0 0x10000>;
+                        interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clockgen 4 0>;
+                        big-endian;
+                };
+
+                sai1: sai@2b50000 {
+                        #sound-dai-cells = <0>;
+                        compatible = "fsl,vf610-sai";
+                        reg = <0x0 0x2b50000 0x0 0x10000>;
+                        interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>,
+                                 <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                        dma-names = "tx", "rx";
+                        dmas = <&edma0 1 47>,
+                               <&edma0 1 46>;
+                        status = "disabled";
+                };
+
+                sai2: sai@2b60000 {
+                        #sound-dai-cells = <0>;
+                        compatible = "fsl,vf610-sai";
+                        reg = <0x0 0x2b60000 0x0 0x10000>;
+                        interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clockgen 4 3>, <&clockgen 4 3>,
+                                 <&clockgen 4 3>, <&clockgen 4 3>;
+                        clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                        dma-names = "tx", "rx";
+                        dmas = <&edma0 1 45>,
+                               <&edma0 1 44>;
+                        status = "disabled";
+                };
+
+                edma0: edma@2c00000 {
+                        #dma-cells = <2>;
+                        compatible = "fsl,vf610-edma";
+                        reg = <0x0 0x2c00000 0x0 0x10000>,
+                              <0x0 0x2c10000 0x0 0x10000>,
+                              <0x0 0x2c20000 0x0 0x10000>;
+                        interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>,
+                                     <0 103 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "edma-tx", "edma-err";
+                        dma-channels = <32>;
+                        big-endian;
+                        clock-names = "dmamux0", "dmamux1";
+                        clocks = <&clockgen 4 3>,
+                                 <&clockgen 4 3>;
+                };
+
+                sata: sata@3200000 {
+                        compatible = "fsl,ls1012a-ahci", "fsl,ls1043a-ahci";
+                        reg = <0x0 0x3200000 0x0 0x10000>;
+                        interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clockgen 4 0>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 38806ca53829..4a164b801882 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -45,6 +45,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
         compatible = "fsl,ls1046a";
@@ -67,6 +68,7 @@
                         clocks = <&clockgen 1 0>;
                         next-level-cache = <&l2>;
                         cpu-idle-states = <&CPU_PH20>;
+                        #cooling-cells = <2>;
                 };
 
                 cpu1: cpu@1 {
@@ -279,6 +281,84 @@
                         clocks = <&sysclk>;
                 };
 
+                tmu: tmu@1f00000 {
+                        compatible = "fsl,qoriq-tmu";
+                        reg = <0x0 0x1f00000 0x0 0x10000>;
+                        interrupts = <0 33 0x4>;
+                        fsl,tmu-range = <0xb0000 0x9002a 0x6004c 0x30062>;
+                        fsl,tmu-calibration =
+                                /* Calibration data group 1 */
+                                <0x00000000 0x00000026
+                                0x00000001 0x0000002d
+                                0x00000002 0x00000032
+                                0x00000003 0x00000039
+                                0x00000004 0x0000003f
+                                0x00000005 0x00000046
+                                0x00000006 0x0000004d
+                                0x00000007 0x00000054
+                                0x00000008 0x0000005a
+                                0x00000009 0x00000061
+                                0x0000000a 0x0000006a
+                                0x0000000b 0x00000071
+                                /* Calibration data group 2 */
+                                0x00010000 0x00000025
+                                0x00010001 0x0000002c
+                                0x00010002 0x00000035
+                                0x00010003 0x0000003d
+                                0x00010004 0x00000045
+                                0x00010005 0x0000004e
+                                0x00010006 0x00000057
+                                0x00010007 0x00000061
+                                0x00010008 0x0000006b
+                                0x00010009 0x00000076
+                                /* Calibration data group 3 */
+                                0x00020000 0x00000029
+                                0x00020001 0x00000033
+                                0x00020002 0x0000003d
+                                0x00020003 0x00000049
+                                0x00020004 0x00000056
+                                0x00020005 0x00000061
+                                0x00020006 0x0000006d
+                                /* Calibration data group 4 */
+                                0x00030000 0x00000021
+                                0x00030001 0x0000002a
+                                0x00030002 0x0000003c
+                                0x00030003 0x0000004e>;
+                        big-endian;
+                        #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-ls2080a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts
index 265e0a8b107b..2ff46ca450b1 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts
@@ -102,7 +102,6 @@
                 reg = <0x75>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                status = "disabled";
                 i2c@1 {
                         #address-cells = <1>;
                         #size-cells = <0>;