Merge tag 'mvebu-dt64-4.16-1' of git://git.infradead.org/linux-mvebu into next/dt

mvebu dt64 for 4.16 (part 1)

Add the NAND support on the Marvell 8040-DB board
Add the thermal support for Martvell A7K/A8K Socs
Add nodes allowing cpufreq support on Aramda 3700 SoCs

* tag 'mvebu-dt64-4.16-1' of git://git.infradead.org/linux-mvebu:
  ARM64: dts: marvell: Add thermal support for A7K/A8K
  arm64: dts: marvell: armada-37xx: add nodes allowing cpufreq support
  arm64: dts: marvell: add NAND support on the 8040-DB board

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

7 files changed, 73 insertions, 1 deletions

diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
index 59d7557d3b1b..2554e0baea6b 100644
--- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
@@ -56,6 +56,7 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a53","arm,armv8";
                         reg = <0x1>;
+                        clocks = <&nb_periph_clk 16>;
                         enable-method = "psci";
                 };
         };
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 90c26d616a54..3056d7168e0b 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -65,6 +65,7 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a53", "arm,armv8";
                         reg = <0>;
+                        clocks = <&nb_periph_clk 16>;
                         enable-method = "psci";
                 };
         };
@@ -234,6 +235,12 @@
                                 };
                         };
 
+                        nb_pm: syscon@14000 {
+                                compatible = "marvell,armada-3700-nb-pm",
+                                             "syscon";
+                                reg = <0x14000 0x60>;
+                        };
+
                         pinctrl_sb: pinctrl@18800 {
                                 compatible = "marvell,armada3710-sb-pinctrl",
                                              "syscon", "simple-mfd";
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index d97b72bed662..b1f6cccc5081 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -268,6 +268,34 @@
         };
 };
 
+/*
+ * Proper NAND usage will require DPR-76 to be in position 1-2, which disables
+ * MDIO signal of CP1.
+ */
+&cps_nand {
+        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;
+        marvell,system-controller = <&cps_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>;
+        };
+};
+
 /* CON4 on CP1 expansion */
 &cps_sata0 {
         status = "okay";
diff --git a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
index 666ebe96ba0d..b280ddd3c397 100644
--- a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
@@ -72,5 +72,22 @@
 &cps_syscon0 {
         cps_pinctrl: pinctrl {
                 compatible = "marvell,armada-8k-cps-pinctrl";
+
+                nand_pins: nand-pins {
+                        marvell,pins =
+                        "mpp0", "mpp1", "mpp2", "mpp3",
+                        "mpp4", "mpp5", "mpp6", "mpp7",
+                        "mpp8", "mpp9", "mpp10", "mpp11",
+                        "mpp15", "mpp16", "mpp17", "mpp18",
+                        "mpp19", "mpp20", "mpp21", "mpp22",
+                        "mpp23", "mpp24", "mpp25", "mpp26",
+                        "mpp27";
+                        marvell,function = "dev";
+                };
+
+                nand_rb: nand-rb {
+                        marvell,pins = "mpp13", "mpp12";
+                        marvell,function = "nf";
+                };
         };
 };
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 1c4dd8ab9ad5..bbc5a4d3acac 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -285,6 +285,12 @@
                                         gpio-ranges = <&ap_pinctrl 0 0 20>;
                                 };
                         };
+
+                        ap_thermal: thermal@6f808C {
+                                compatible = "marvell,armada-ap806-thermal";
+                                reg = <0x6f808C 0x4>,
+                                      <0x6f8084 0x8>;
+                        };
                 };
         };
 };
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index e3b64d03fbd8..ecbc76d26dff 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -182,6 +182,12 @@
                                 interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
                         };
 
+                        cpm_thermal: thermal@400078 {
+                                compatible = "marvell,armada-cp110-thermal";
+                                reg = <0x400078 0x4>,
+                                      <0x400070 0x8>;
+                        };
+
                         cpm_syscon0: system-controller@440000 {
                                 compatible = "syscon", "simple-mfd";
                                 reg = <0x440000 0x2000>;
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 0d51096c69f8..6a07c786b788 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -182,6 +182,12 @@
                                 interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
                         };
 
+                        cps_thermal: thermal@400078 {
+                                compatible = "marvell,armada-cp110-thermal";
+                                reg = <0x400078 0x4>,
+                                      <0x400070 0x8>;
+                        };
+
                         cps_syscon0: system-controller@440000 {
                                 compatible = "syscon", "simple-mfd";
                                 reg = <0x440000 0x2000>;
@@ -317,12 +323,13 @@
                                  * for A7K and on the CPS for A8K.
                                  */
                                 compatible = "marvell,armada370-nand",
-                                             "marvell,armada370-nand";
+                                             "marvell,armada-8k-nand";
                                 reg = <0x720000 0x54>;
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 interrupts = <ICU_GRP_NSR 115 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&cps_clk 1 2>;
+                                marvell,system-controller = <&cpm_syscon0>;
                                 status = "disabled";
                         };