--- /dev/null
+From 47cf40af64c35a69ef6a193c47768ad1bda29db2 Mon Sep 17 00:00:00 2001
+From: Miquel Raynal <miquel.raynal@bootlin.com>
+Date: Fri, 4 Oct 2019 16:27:29 +0200
+Subject: [PATCH] arm64: dts: marvell: Prepare the introduction of CP115
+
+CP110 and CP115 are almost the same in terms of features and have a
+very limited set of differences. Let's create an armada-cp11x.dtsi
+file which will be used to instantiate both CP110 and CP115
+nodes.
+
+The only changes between the two armada-cp11{0,x}.dtsi files are the
+following naming in macros: s/CP110/CP11X/.
+
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+---
+ arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 28 +-
+ arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 56 +-
+ .../arm64/boot/dts/marvell/armada-common.dtsi | 4 +-
+ arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 575 +----------------
+ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 579 ++++++++++++++++++
+ 5 files changed, 627 insertions(+), 615 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+
+--- a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
++++ b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
+@@ -17,23 +17,23 @@
+ /*
+ * Instantiate the CP110
+ */
+-#define CP110_NAME cp0
+-#define CP110_BASE f2000000
+-#define CP110_PCIE_IO_BASE 0xf9000000
+-#define CP110_PCIE_MEM_BASE 0xf6000000
+-#define CP110_PCIE0_BASE f2600000
+-#define CP110_PCIE1_BASE f2620000
+-#define CP110_PCIE2_BASE f2640000
++#define CP11X_NAME cp0
++#define CP11X_BASE f2000000
++#define CP11X_PCIE_IO_BASE 0xf9000000
++#define CP11X_PCIE_MEM_BASE 0xf6000000
++#define CP11X_PCIE0_BASE f2600000
++#define CP11X_PCIE1_BASE f2620000
++#define CP11X_PCIE2_BASE f2640000
+
+ #include "armada-cp110.dtsi"
+
+-#undef CP110_NAME
+-#undef CP110_BASE
+-#undef CP110_PCIE_IO_BASE
+-#undef CP110_PCIE_MEM_BASE
+-#undef CP110_PCIE0_BASE
+-#undef CP110_PCIE1_BASE
+-#undef CP110_PCIE2_BASE
++#undef CP11X_NAME
++#undef CP11X_BASE
++#undef CP11X_PCIE_IO_BASE
++#undef CP11X_PCIE_MEM_BASE
++#undef CP11X_PCIE0_BASE
++#undef CP11X_PCIE1_BASE
++#undef CP11X_PCIE2_BASE
+
+ &cp0_gpio1 {
+ status = "okay";
+--- a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
++++ b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
+@@ -19,44 +19,44 @@
+ /*
+ * Instantiate the master CP110
+ */
+-#define CP110_NAME cp0
+-#define CP110_BASE f2000000
+-#define CP110_PCIE_IO_BASE 0xf9000000
+-#define CP110_PCIE_MEM_BASE 0xf6000000
+-#define CP110_PCIE0_BASE f2600000
+-#define CP110_PCIE1_BASE f2620000
+-#define CP110_PCIE2_BASE f2640000
++#define CP11X_NAME cp0
++#define CP11X_BASE f2000000
++#define CP11X_PCIE_IO_BASE 0xf9000000
++#define CP11X_PCIE_MEM_BASE 0xf6000000
++#define CP11X_PCIE0_BASE f2600000
++#define CP11X_PCIE1_BASE f2620000
++#define CP11X_PCIE2_BASE f2640000
+
+ #include "armada-cp110.dtsi"
+
+-#undef CP110_NAME
+-#undef CP110_BASE
+-#undef CP110_PCIE_IO_BASE
+-#undef CP110_PCIE_MEM_BASE
+-#undef CP110_PCIE0_BASE
+-#undef CP110_PCIE1_BASE
+-#undef CP110_PCIE2_BASE
++#undef CP11X_NAME
++#undef CP11X_BASE
++#undef CP11X_PCIE_IO_BASE
++#undef CP11X_PCIE_MEM_BASE
++#undef CP11X_PCIE0_BASE
++#undef CP11X_PCIE1_BASE
++#undef CP11X_PCIE2_BASE
+
+ /*
+ * Instantiate the slave CP110
+ */
+-#define CP110_NAME cp1
+-#define CP110_BASE f4000000
+-#define CP110_PCIE_IO_BASE 0xfd000000
+-#define CP110_PCIE_MEM_BASE 0xfa000000
+-#define CP110_PCIE0_BASE f4600000
+-#define CP110_PCIE1_BASE f4620000
+-#define CP110_PCIE2_BASE f4640000
++#define CP11X_NAME cp1
++#define CP11X_BASE f4000000
++#define CP11X_PCIE_IO_BASE 0xfd000000
++#define CP11X_PCIE_MEM_BASE 0xfa000000
++#define CP11X_PCIE0_BASE f4600000
++#define CP11X_PCIE1_BASE f4620000
++#define CP11X_PCIE2_BASE f4640000
+
+ #include "armada-cp110.dtsi"
+
+-#undef CP110_NAME
+-#undef CP110_BASE
+-#undef CP110_PCIE_IO_BASE
+-#undef CP110_PCIE_MEM_BASE
+-#undef CP110_PCIE0_BASE
+-#undef CP110_PCIE1_BASE
+-#undef CP110_PCIE2_BASE
++#undef CP11X_NAME
++#undef CP11X_BASE
++#undef CP11X_PCIE_IO_BASE
++#undef CP11X_PCIE_MEM_BASE
++#undef CP11X_PCIE0_BASE
++#undef CP11X_PCIE1_BASE
++#undef CP11X_PCIE2_BASE
+
+ /* The 80x0 has two CP blocks, but uses only one block from each. */
+ &cp1_gpio1 {
+--- a/arch/arm64/boot/dts/marvell/armada-common.dtsi
++++ b/arch/arm64/boot/dts/marvell/armada-common.dtsi
+@@ -6,6 +6,6 @@
+ /* Common definitions used by Armada 7K/8K DTs */
+ #define PASTER(x, y) x ## y
+ #define EVALUATOR(x, y) PASTER(x, y)
+-#define CP110_LABEL(name) EVALUATOR(CP110_NAME, EVALUATOR(_, name))
+-#define CP110_NODE_NAME(name) EVALUATOR(CP110_NAME, EVALUATOR(-, name))
++#define CP11X_LABEL(name) EVALUATOR(CP11X_NAME, EVALUATOR(_, name))
++#define CP11X_NODE_NAME(name) EVALUATOR(CP11X_NAME, EVALUATOR(-, name))
+ #define ADDRESSIFY(addr) EVALUATOR(0x, addr)
+--- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
++++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
+@@ -1,579 +1,12 @@
+ // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ /*
+- * Copyright (C) 2016 Marvell Technology Group Ltd.
++ * Copyright (C) 2019 Marvell Technology Group Ltd.
+ *
+ * Device Tree file for Marvell Armada CP110.
+ */
+
+-#include <dt-bindings/interrupt-controller/mvebu-icu.h>
+-#include <dt-bindings/thermal/thermal.h>
++#define CP11X_TYPE cp110
+
+-#include "armada-common.dtsi"
++#include "armada-cp11x.dtsi"
+
+-#define CP110_PCIEx_IO_BASE(iface) (CP110_PCIE_IO_BASE + (iface * 0x10000))
+-#define CP110_PCIEx_MEM_BASE(iface) (CP110_PCIE_MEM_BASE + (iface * 0x1000000))
+-#define CP110_PCIEx_CONF_BASE(iface) (CP110_PCIEx_MEM_BASE(iface) + 0xf00000)
+-
+-/ {
+- /*
+- * The contents of the node are defined below, in order to
+- * save one indentation level
+- */
+- CP110_NAME: CP110_NAME { };
+-
+- /*
+- * CPs only have one sensor in the thermal IC.
+- *
+- * The cooling maps are empty as there are no cooling devices.
+- */
+- thermal-zones {
+- CP110_LABEL(thermal_ic): CP110_NODE_NAME(thermal-ic) {
+- polling-delay-passive = <0>; /* Interrupt driven */
+- polling-delay = <0>; /* Interrupt driven */
+-
+- thermal-sensors = <&CP110_LABEL(thermal) 0>;
+-
+- trips {
+- CP110_LABEL(crit): crit {
+- temperature = <100000>; /* mC degrees */
+- hysteresis = <2000>; /* mC degrees */
+- type = "critical";
+- };
+- };
+-
+- cooling-maps { };
+- };
+- };
+-};
+-
+-&CP110_NAME {
+- #address-cells = <2>;
+- #size-cells = <2>;
+- compatible = "simple-bus";
+- interrupt-parent = <&CP110_LABEL(icu_nsr)>;
+- ranges;
+-
+- config-space@CP110_BASE {
+- #address-cells = <1>;
+- #size-cells = <1>;
+- compatible = "simple-bus";
+- ranges = <0x0 0x0 ADDRESSIFY(CP110_BASE) 0x2000000>;
+-
+- CP110_LABEL(ethernet): ethernet@0 {
+- compatible = "marvell,armada-7k-pp22";
+- reg = <0x0 0x100000>, <0x129000 0xb000>;
+- clocks = <&CP110_LABEL(clk) 1 3>, <&CP110_LABEL(clk) 1 9>,
+- <&CP110_LABEL(clk) 1 5>, <&CP110_LABEL(clk) 1 6>,
+- <&CP110_LABEL(clk) 1 18>;
+- clock-names = "pp_clk", "gop_clk",
+- "mg_clk", "mg_core_clk", "axi_clk";
+- marvell,system-controller = <&CP110_LABEL(syscon0)>;
+- status = "disabled";
+- dma-coherent;
+-
+- CP110_LABEL(eth0): eth0 {
+- interrupts = <39 IRQ_TYPE_LEVEL_HIGH>,
+- <43 IRQ_TYPE_LEVEL_HIGH>,
+- <47 IRQ_TYPE_LEVEL_HIGH>,
+- <51 IRQ_TYPE_LEVEL_HIGH>,
+- <55 IRQ_TYPE_LEVEL_HIGH>,
+- <59 IRQ_TYPE_LEVEL_HIGH>,
+- <63 IRQ_TYPE_LEVEL_HIGH>,
+- <67 IRQ_TYPE_LEVEL_HIGH>,
+- <71 IRQ_TYPE_LEVEL_HIGH>,
+- <129 IRQ_TYPE_LEVEL_HIGH>;
+- interrupt-names = "hif0", "hif1", "hif2",
+- "hif3", "hif4", "hif5", "hif6", "hif7",
+- "hif8", "link";
+- port-id = <0>;
+- gop-port-id = <0>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(eth1): eth1 {
+- interrupts = <40 IRQ_TYPE_LEVEL_HIGH>,
+- <44 IRQ_TYPE_LEVEL_HIGH>,
+- <48 IRQ_TYPE_LEVEL_HIGH>,
+- <52 IRQ_TYPE_LEVEL_HIGH>,
+- <56 IRQ_TYPE_LEVEL_HIGH>,
+- <60 IRQ_TYPE_LEVEL_HIGH>,
+- <64 IRQ_TYPE_LEVEL_HIGH>,
+- <68 IRQ_TYPE_LEVEL_HIGH>,
+- <72 IRQ_TYPE_LEVEL_HIGH>,
+- <128 IRQ_TYPE_LEVEL_HIGH>;
+- interrupt-names = "hif0", "hif1", "hif2",
+- "hif3", "hif4", "hif5", "hif6", "hif7",
+- "hif8", "link";
+- port-id = <1>;
+- gop-port-id = <2>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(eth2): eth2 {
+- interrupts = <41 IRQ_TYPE_LEVEL_HIGH>,
+- <45 IRQ_TYPE_LEVEL_HIGH>,
+- <49 IRQ_TYPE_LEVEL_HIGH>,
+- <53 IRQ_TYPE_LEVEL_HIGH>,
+- <57 IRQ_TYPE_LEVEL_HIGH>,
+- <61 IRQ_TYPE_LEVEL_HIGH>,
+- <65 IRQ_TYPE_LEVEL_HIGH>,
+- <69 IRQ_TYPE_LEVEL_HIGH>,
+- <73 IRQ_TYPE_LEVEL_HIGH>,
+- <127 IRQ_TYPE_LEVEL_HIGH>;
+- interrupt-names = "hif0", "hif1", "hif2",
+- "hif3", "hif4", "hif5", "hif6", "hif7",
+- "hif8", "link";
+- port-id = <2>;
+- gop-port-id = <3>;
+- status = "disabled";
+- };
+- };
+-
+- CP110_LABEL(comphy): phy@120000 {
+- compatible = "marvell,comphy-cp110";
+- reg = <0x120000 0x6000>;
+- marvell,system-controller = <&CP110_LABEL(syscon0)>;
+- clocks = <&CP110_LABEL(clk) 1 5>, <&CP110_LABEL(clk) 1 6>,
+- <&CP110_LABEL(clk) 1 18>;
+- clock-names = "mg_clk", "mg_core_clk", "axi_clk";
+- #address-cells = <1>;
+- #size-cells = <0>;
+-
+- CP110_LABEL(comphy0): phy@0 {
+- reg = <0>;
+- #phy-cells = <1>;
+- };
+-
+- CP110_LABEL(comphy1): phy@1 {
+- reg = <1>;
+- #phy-cells = <1>;
+- };
+-
+- CP110_LABEL(comphy2): phy@2 {
+- reg = <2>;
+- #phy-cells = <1>;
+- };
+-
+- CP110_LABEL(comphy3): phy@3 {
+- reg = <3>;
+- #phy-cells = <1>;
+- };
+-
+- CP110_LABEL(comphy4): phy@4 {
+- reg = <4>;
+- #phy-cells = <1>;
+- };
+-
+- CP110_LABEL(comphy5): phy@5 {
+- reg = <5>;
+- #phy-cells = <1>;
+- };
+- };
+-
+- CP110_LABEL(mdio): mdio@12a200 {
+- #address-cells = <1>;
+- #size-cells = <0>;
+- compatible = "marvell,orion-mdio";
+- reg = <0x12a200 0x10>;
+- clocks = <&CP110_LABEL(clk) 1 9>, <&CP110_LABEL(clk) 1 5>,
+- <&CP110_LABEL(clk) 1 6>, <&CP110_LABEL(clk) 1 18>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(xmdio): mdio@12a600 {
+- #address-cells = <1>;
+- #size-cells = <0>;
+- compatible = "marvell,xmdio";
+- reg = <0x12a600 0x10>;
+- clocks = <&CP110_LABEL(clk) 1 5>,
+- <&CP110_LABEL(clk) 1 6>, <&CP110_LABEL(clk) 1 18>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(icu): interrupt-controller@1e0000 {
+- compatible = "marvell,cp110-icu";
+- reg = <0x1e0000 0x440>;
+- #address-cells = <1>;
+- #size-cells = <1>;
+-
+- CP110_LABEL(icu_nsr): interrupt-controller@10 {
+- compatible = "marvell,cp110-icu-nsr";
+- reg = <0x10 0x20>;
+- #interrupt-cells = <2>;
+- interrupt-controller;
+- msi-parent = <&gicp>;
+- };
+-
+- CP110_LABEL(icu_sei): interrupt-controller@50 {
+- compatible = "marvell,cp110-icu-sei";
+- reg = <0x50 0x10>;
+- #interrupt-cells = <2>;
+- interrupt-controller;
+- msi-parent = <&sei>;
+- };
+- };
+-
+- CP110_LABEL(rtc): rtc@284000 {
+- compatible = "marvell,armada-8k-rtc";
+- reg = <0x284000 0x20>, <0x284080 0x24>;
+- reg-names = "rtc", "rtc-soc";
+- interrupts = <77 IRQ_TYPE_LEVEL_HIGH>;
+- };
+-
+- CP110_LABEL(syscon0): system-controller@440000 {
+- compatible = "syscon", "simple-mfd";
+- reg = <0x440000 0x2000>;
+-
+- CP110_LABEL(clk): clock {
+- compatible = "marvell,cp110-clock";
+- #clock-cells = <2>;
+- };
+-
+- CP110_LABEL(gpio1): gpio@100 {
+- compatible = "marvell,armada-8k-gpio";
+- offset = <0x100>;
+- ngpios = <32>;
+- gpio-controller;
+- #gpio-cells = <2>;
+- gpio-ranges = <&CP110_LABEL(pinctrl) 0 0 32>;
+- interrupt-controller;
+- interrupts = <86 IRQ_TYPE_LEVEL_HIGH>,
+- <85 IRQ_TYPE_LEVEL_HIGH>,
+- <84 IRQ_TYPE_LEVEL_HIGH>,
+- <83 IRQ_TYPE_LEVEL_HIGH>;
+- #interrupt-cells = <2>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(gpio2): gpio@140 {
+- compatible = "marvell,armada-8k-gpio";
+- offset = <0x140>;
+- ngpios = <31>;
+- gpio-controller;
+- #gpio-cells = <2>;
+- gpio-ranges = <&CP110_LABEL(pinctrl) 0 32 31>;
+- interrupt-controller;
+- interrupts = <82 IRQ_TYPE_LEVEL_HIGH>,
+- <81 IRQ_TYPE_LEVEL_HIGH>,
+- <80 IRQ_TYPE_LEVEL_HIGH>,
+- <79 IRQ_TYPE_LEVEL_HIGH>;
+- #interrupt-cells = <2>;
+- status = "disabled";
+- };
+- };
+-
+- CP110_LABEL(syscon1): system-controller@400000 {
+- compatible = "syscon", "simple-mfd";
+- reg = <0x400000 0x1000>;
+- #address-cells = <1>;
+- #size-cells = <1>;
+-
+- CP110_LABEL(thermal): thermal-sensor@70 {
+- compatible = "marvell,armada-cp110-thermal";
+- reg = <0x70 0x10>;
+- interrupts-extended =
+- <&CP110_LABEL(icu_sei) 116 IRQ_TYPE_LEVEL_HIGH>;
+- #thermal-sensor-cells = <1>;
+- };
+- };
+-
+- CP110_LABEL(usb3_0): usb3@500000 {
+- compatible = "marvell,armada-8k-xhci",
+- "generic-xhci";
+- reg = <0x500000 0x4000>;
+- dma-coherent;
+- interrupts = <106 IRQ_TYPE_LEVEL_HIGH>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 22>,
+- <&CP110_LABEL(clk) 1 16>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(usb3_1): usb3@510000 {
+- compatible = "marvell,armada-8k-xhci",
+- "generic-xhci";
+- reg = <0x510000 0x4000>;
+- dma-coherent;
+- interrupts = <105 IRQ_TYPE_LEVEL_HIGH>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 23>,
+- <&CP110_LABEL(clk) 1 16>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(sata0): sata@540000 {
+- compatible = "marvell,armada-8k-ahci",
+- "generic-ahci";
+- reg = <0x540000 0x30000>;
+- dma-coherent;
+- interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
+- clocks = <&CP110_LABEL(clk) 1 15>,
+- <&CP110_LABEL(clk) 1 16>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+- status = "disabled";
+-
+- sata-port@0 {
+- reg = <0>;
+- };
+-
+- sata-port@1 {
+- reg = <1>;
+- };
+- };
+-
+- CP110_LABEL(xor0): xor@6a0000 {
+- compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
+- reg = <0x6a0000 0x1000>, <0x6b0000 0x1000>;
+- dma-coherent;
+- msi-parent = <&gic_v2m0>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 8>,
+- <&CP110_LABEL(clk) 1 14>;
+- };
+-
+- CP110_LABEL(xor1): xor@6c0000 {
+- compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
+- reg = <0x6c0000 0x1000>, <0x6d0000 0x1000>;
+- dma-coherent;
+- msi-parent = <&gic_v2m0>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 7>,
+- <&CP110_LABEL(clk) 1 14>;
+- };
+-
+- CP110_LABEL(spi0): spi@700600 {
+- compatible = "marvell,armada-380-spi";
+- reg = <0x700600 0x50>;
+- #address-cells = <0x1>;
+- #size-cells = <0x0>;
+- clock-names = "core", "axi";
+- clocks = <&CP110_LABEL(clk) 1 21>,
+- <&CP110_LABEL(clk) 1 17>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(spi1): spi@700680 {
+- compatible = "marvell,armada-380-spi";
+- reg = <0x700680 0x50>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+- clock-names = "core", "axi";
+- clocks = <&CP110_LABEL(clk) 1 21>,
+- <&CP110_LABEL(clk) 1 17>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(i2c0): i2c@701000 {
+- compatible = "marvell,mv78230-i2c";
+- reg = <0x701000 0x20>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+- interrupts = <120 IRQ_TYPE_LEVEL_HIGH>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 21>,
+- <&CP110_LABEL(clk) 1 17>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(i2c1): i2c@701100 {
+- compatible = "marvell,mv78230-i2c";
+- reg = <0x701100 0x20>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+- interrupts = <121 IRQ_TYPE_LEVEL_HIGH>;
+- 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 = <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 = <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 = <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(uart3): serial@702300 {
+- compatible = "snps,dw-apb-uart";
+- reg = <0x702300 0x100>;
+- reg-shift = <2>;
+- interrupts = <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-controller",
+- "marvell,armada370-nand-controller";
+- reg = <0x720000 0x54>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+- interrupts = <115 IRQ_TYPE_LEVEL_HIGH>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 2>,
+- <&CP110_LABEL(clk) 1 17>;
+- marvell,system-controller = <&CP110_LABEL(syscon0)>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(trng): trng@760000 {
+- compatible = "marvell,armada-8k-rng",
+- "inside-secure,safexcel-eip76";
+- reg = <0x760000 0x7d>;
+- interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 25>,
+- <&CP110_LABEL(clk) 1 17>;
+- status = "okay";
+- };
+-
+- CP110_LABEL(sdhci0): sdhci@780000 {
+- compatible = "marvell,armada-cp110-sdhci";
+- reg = <0x780000 0x300>;
+- interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;
+- clock-names = "core", "axi";
+- clocks = <&CP110_LABEL(clk) 1 4>, <&CP110_LABEL(clk) 1 18>;
+- dma-coherent;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(crypto): crypto@800000 {
+- compatible = "inside-secure,safexcel-eip197b";
+- reg = <0x800000 0x200000>;
+- interrupts = <87 IRQ_TYPE_LEVEL_HIGH>,
+- <88 IRQ_TYPE_LEVEL_HIGH>,
+- <89 IRQ_TYPE_LEVEL_HIGH>,
+- <90 IRQ_TYPE_LEVEL_HIGH>,
+- <91 IRQ_TYPE_LEVEL_HIGH>,
+- <92 IRQ_TYPE_LEVEL_HIGH>;
+- interrupt-names = "mem", "ring0", "ring1",
+- "ring2", "ring3", "eip";
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 26>,
+- <&CP110_LABEL(clk) 1 17>;
+- dma-coherent;
+- };
+- };
+-
+- CP110_LABEL(pcie0): pcie@CP110_PCIE0_BASE {
+- compatible = "marvell,armada8k-pcie", "snps,dw-pcie";
+- reg = <0 ADDRESSIFY(CP110_PCIE0_BASE) 0 0x10000>,
+- <0 CP110_PCIEx_CONF_BASE(0) 0 0x80000>;
+- reg-names = "ctrl", "config";
+- #address-cells = <3>;
+- #size-cells = <2>;
+- #interrupt-cells = <1>;
+- device_type = "pci";
+- dma-coherent;
+- msi-parent = <&gic_v2m0>;
+-
+- bus-range = <0 0xff>;
+- ranges =
+- /* downstream I/O */
+- <0x81000000 0 CP110_PCIEx_IO_BASE(0) 0 CP110_PCIEx_IO_BASE(0) 0 0x10000
+- /* non-prefetchable memory */
+- 0x82000000 0 CP110_PCIEx_MEM_BASE(0) 0 CP110_PCIEx_MEM_BASE(0) 0 0xf00000>;
+- interrupt-map-mask = <0 0 0 0>;
+- interrupt-map = <0 0 0 0 &CP110_LABEL(icu_nsr) 22 IRQ_TYPE_LEVEL_HIGH>;
+- interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
+- num-lanes = <1>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 13>, <&CP110_LABEL(clk) 1 14>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(pcie1): pcie@CP110_PCIE1_BASE {
+- compatible = "marvell,armada8k-pcie", "snps,dw-pcie";
+- reg = <0 ADDRESSIFY(CP110_PCIE1_BASE) 0 0x10000>,
+- <0 CP110_PCIEx_CONF_BASE(1) 0 0x80000>;
+- reg-names = "ctrl", "config";
+- #address-cells = <3>;
+- #size-cells = <2>;
+- #interrupt-cells = <1>;
+- device_type = "pci";
+- dma-coherent;
+- msi-parent = <&gic_v2m0>;
+-
+- bus-range = <0 0xff>;
+- ranges =
+- /* downstream I/O */
+- <0x81000000 0 CP110_PCIEx_IO_BASE(1) 0 CP110_PCIEx_IO_BASE(1) 0 0x10000
+- /* non-prefetchable memory */
+- 0x82000000 0 CP110_PCIEx_MEM_BASE(1) 0 CP110_PCIEx_MEM_BASE(1) 0 0xf00000>;
+- interrupt-map-mask = <0 0 0 0>;
+- interrupt-map = <0 0 0 0 &CP110_LABEL(icu_nsr) 24 IRQ_TYPE_LEVEL_HIGH>;
+- interrupts = <24 IRQ_TYPE_LEVEL_HIGH>;
+-
+- num-lanes = <1>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 11>, <&CP110_LABEL(clk) 1 14>;
+- status = "disabled";
+- };
+-
+- CP110_LABEL(pcie2): pcie@CP110_PCIE2_BASE {
+- compatible = "marvell,armada8k-pcie", "snps,dw-pcie";
+- reg = <0 ADDRESSIFY(CP110_PCIE2_BASE) 0 0x10000>,
+- <0 CP110_PCIEx_CONF_BASE(2) 0 0x80000>;
+- reg-names = "ctrl", "config";
+- #address-cells = <3>;
+- #size-cells = <2>;
+- #interrupt-cells = <1>;
+- device_type = "pci";
+- dma-coherent;
+- msi-parent = <&gic_v2m0>;
+-
+- bus-range = <0 0xff>;
+- ranges =
+- /* downstream I/O */
+- <0x81000000 0 CP110_PCIEx_IO_BASE(2) 0 CP110_PCIEx_IO_BASE(2) 0 0x10000
+- /* non-prefetchable memory */
+- 0x82000000 0 CP110_PCIEx_MEM_BASE(2) 0 CP110_PCIEx_MEM_BASE(2) 0 0xf00000>;
+- interrupt-map-mask = <0 0 0 0>;
+- interrupt-map = <0 0 0 0 &CP110_LABEL(icu_nsr) 23 IRQ_TYPE_LEVEL_HIGH>;
+- interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
+-
+- num-lanes = <1>;
+- clock-names = "core", "reg";
+- clocks = <&CP110_LABEL(clk) 1 12>, <&CP110_LABEL(clk) 1 14>;
+- status = "disabled";
+- };
+-};
++#undef CP11X_TYPE
+--- /dev/null
++++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+@@ -0,0 +1,579 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (C) 2016 Marvell Technology Group Ltd.
++ *
++ * Device Tree file for Marvell Armada CP11x.
++ */
++
++#include <dt-bindings/interrupt-controller/mvebu-icu.h>
++#include <dt-bindings/thermal/thermal.h>
++
++#include "armada-common.dtsi"
++
++#define CP11X_PCIEx_IO_BASE(iface) (CP11X_PCIE_IO_BASE + (iface * 0x10000))
++#define CP11X_PCIEx_MEM_BASE(iface) (CP11X_PCIE_MEM_BASE + (iface * 0x1000000))
++#define CP11X_PCIEx_CONF_BASE(iface) (CP11X_PCIEx_MEM_BASE(iface) + 0xf00000)
++
++/ {
++ /*
++ * The contents of the node are defined below, in order to
++ * save one indentation level
++ */
++ CP11X_NAME: CP11X_NAME { };
++
++ /*
++ * CPs only have one sensor in the thermal IC.
++ *
++ * The cooling maps are empty as there are no cooling devices.
++ */
++ thermal-zones {
++ CP11X_LABEL(thermal_ic): CP11X_NODE_NAME(thermal-ic) {
++ polling-delay-passive = <0>; /* Interrupt driven */
++ polling-delay = <0>; /* Interrupt driven */
++
++ thermal-sensors = <&CP11X_LABEL(thermal) 0>;
++
++ trips {
++ CP11X_LABEL(crit): crit {
++ temperature = <100000>; /* mC degrees */
++ hysteresis = <2000>; /* mC degrees */
++ type = "critical";
++ };
++ };
++
++ cooling-maps { };
++ };
++ };
++};
++
++&CP11X_NAME {
++ #address-cells = <2>;
++ #size-cells = <2>;
++ compatible = "simple-bus";
++ interrupt-parent = <&CP11X_LABEL(icu_nsr)>;
++ ranges;
++
++ config-space@CP11X_BASE {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "simple-bus";
++ ranges = <0x0 0x0 ADDRESSIFY(CP11X_BASE) 0x2000000>;
++
++ CP11X_LABEL(ethernet): ethernet@0 {
++ compatible = "marvell,armada-7k-pp22";
++ reg = <0x0 0x100000>, <0x129000 0xb000>;
++ clocks = <&CP11X_LABEL(clk) 1 3>, <&CP11X_LABEL(clk) 1 9>,
++ <&CP11X_LABEL(clk) 1 5>, <&CP11X_LABEL(clk) 1 6>,
++ <&CP11X_LABEL(clk) 1 18>;
++ clock-names = "pp_clk", "gop_clk",
++ "mg_clk", "mg_core_clk", "axi_clk";
++ marvell,system-controller = <&CP11X_LABEL(syscon0)>;
++ status = "disabled";
++ dma-coherent;
++
++ CP11X_LABEL(eth0): eth0 {
++ interrupts = <39 IRQ_TYPE_LEVEL_HIGH>,
++ <43 IRQ_TYPE_LEVEL_HIGH>,
++ <47 IRQ_TYPE_LEVEL_HIGH>,
++ <51 IRQ_TYPE_LEVEL_HIGH>,
++ <55 IRQ_TYPE_LEVEL_HIGH>,
++ <59 IRQ_TYPE_LEVEL_HIGH>,
++ <63 IRQ_TYPE_LEVEL_HIGH>,
++ <67 IRQ_TYPE_LEVEL_HIGH>,
++ <71 IRQ_TYPE_LEVEL_HIGH>,
++ <129 IRQ_TYPE_LEVEL_HIGH>;
++ interrupt-names = "hif0", "hif1", "hif2",
++ "hif3", "hif4", "hif5", "hif6", "hif7",
++ "hif8", "link";
++ port-id = <0>;
++ gop-port-id = <0>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(eth1): eth1 {
++ interrupts = <40 IRQ_TYPE_LEVEL_HIGH>,
++ <44 IRQ_TYPE_LEVEL_HIGH>,
++ <48 IRQ_TYPE_LEVEL_HIGH>,
++ <52 IRQ_TYPE_LEVEL_HIGH>,
++ <56 IRQ_TYPE_LEVEL_HIGH>,
++ <60 IRQ_TYPE_LEVEL_HIGH>,
++ <64 IRQ_TYPE_LEVEL_HIGH>,
++ <68 IRQ_TYPE_LEVEL_HIGH>,
++ <72 IRQ_TYPE_LEVEL_HIGH>,
++ <128 IRQ_TYPE_LEVEL_HIGH>;
++ interrupt-names = "hif0", "hif1", "hif2",
++ "hif3", "hif4", "hif5", "hif6", "hif7",
++ "hif8", "link";
++ port-id = <1>;
++ gop-port-id = <2>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(eth2): eth2 {
++ interrupts = <41 IRQ_TYPE_LEVEL_HIGH>,
++ <45 IRQ_TYPE_LEVEL_HIGH>,
++ <49 IRQ_TYPE_LEVEL_HIGH>,
++ <53 IRQ_TYPE_LEVEL_HIGH>,
++ <57 IRQ_TYPE_LEVEL_HIGH>,
++ <61 IRQ_TYPE_LEVEL_HIGH>,
++ <65 IRQ_TYPE_LEVEL_HIGH>,
++ <69 IRQ_TYPE_LEVEL_HIGH>,
++ <73 IRQ_TYPE_LEVEL_HIGH>,
++ <127 IRQ_TYPE_LEVEL_HIGH>;
++ interrupt-names = "hif0", "hif1", "hif2",
++ "hif3", "hif4", "hif5", "hif6", "hif7",
++ "hif8", "link";
++ port-id = <2>;
++ gop-port-id = <3>;
++ status = "disabled";
++ };
++ };
++
++ CP11X_LABEL(comphy): phy@120000 {
++ compatible = "marvell,comphy-cp110";
++ reg = <0x120000 0x6000>;
++ marvell,system-controller = <&CP11X_LABEL(syscon0)>;
++ clocks = <&CP11X_LABEL(clk) 1 5>, <&CP11X_LABEL(clk) 1 6>,
++ <&CP11X_LABEL(clk) 1 18>;
++ clock-names = "mg_clk", "mg_core_clk", "axi_clk";
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ CP11X_LABEL(comphy0): phy@0 {
++ reg = <0>;
++ #phy-cells = <1>;
++ };
++
++ CP11X_LABEL(comphy1): phy@1 {
++ reg = <1>;
++ #phy-cells = <1>;
++ };
++
++ CP11X_LABEL(comphy2): phy@2 {
++ reg = <2>;
++ #phy-cells = <1>;
++ };
++
++ CP11X_LABEL(comphy3): phy@3 {
++ reg = <3>;
++ #phy-cells = <1>;
++ };
++
++ CP11X_LABEL(comphy4): phy@4 {
++ reg = <4>;
++ #phy-cells = <1>;
++ };
++
++ CP11X_LABEL(comphy5): phy@5 {
++ reg = <5>;
++ #phy-cells = <1>;
++ };
++ };
++
++ CP11X_LABEL(mdio): mdio@12a200 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "marvell,orion-mdio";
++ reg = <0x12a200 0x10>;
++ clocks = <&CP11X_LABEL(clk) 1 9>, <&CP11X_LABEL(clk) 1 5>,
++ <&CP11X_LABEL(clk) 1 6>, <&CP11X_LABEL(clk) 1 18>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(xmdio): mdio@12a600 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ compatible = "marvell,xmdio";
++ reg = <0x12a600 0x10>;
++ clocks = <&CP11X_LABEL(clk) 1 5>,
++ <&CP11X_LABEL(clk) 1 6>, <&CP11X_LABEL(clk) 1 18>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(icu): interrupt-controller@1e0000 {
++ compatible = "marvell,cp110-icu";
++ reg = <0x1e0000 0x440>;
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ CP11X_LABEL(icu_nsr): interrupt-controller@10 {
++ compatible = "marvell,cp110-icu-nsr";
++ reg = <0x10 0x20>;
++ #interrupt-cells = <2>;
++ interrupt-controller;
++ msi-parent = <&gicp>;
++ };
++
++ CP11X_LABEL(icu_sei): interrupt-controller@50 {
++ compatible = "marvell,cp110-icu-sei";
++ reg = <0x50 0x10>;
++ #interrupt-cells = <2>;
++ interrupt-controller;
++ msi-parent = <&sei>;
++ };
++ };
++
++ CP11X_LABEL(rtc): rtc@284000 {
++ compatible = "marvell,armada-8k-rtc";
++ reg = <0x284000 0x20>, <0x284080 0x24>;
++ reg-names = "rtc", "rtc-soc";
++ interrupts = <77 IRQ_TYPE_LEVEL_HIGH>;
++ };
++
++ CP11X_LABEL(syscon0): system-controller@440000 {
++ compatible = "syscon", "simple-mfd";
++ reg = <0x440000 0x2000>;
++
++ CP11X_LABEL(clk): clock {
++ compatible = "marvell,cp110-clock";
++ #clock-cells = <2>;
++ };
++
++ CP11X_LABEL(gpio1): gpio@100 {
++ compatible = "marvell,armada-8k-gpio";
++ offset = <0x100>;
++ ngpios = <32>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ gpio-ranges = <&CP11X_LABEL(pinctrl) 0 0 32>;
++ interrupt-controller;
++ interrupts = <86 IRQ_TYPE_LEVEL_HIGH>,
++ <85 IRQ_TYPE_LEVEL_HIGH>,
++ <84 IRQ_TYPE_LEVEL_HIGH>,
++ <83 IRQ_TYPE_LEVEL_HIGH>;
++ #interrupt-cells = <2>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(gpio2): gpio@140 {
++ compatible = "marvell,armada-8k-gpio";
++ offset = <0x140>;
++ ngpios = <31>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ gpio-ranges = <&CP11X_LABEL(pinctrl) 0 32 31>;
++ interrupt-controller;
++ interrupts = <82 IRQ_TYPE_LEVEL_HIGH>,
++ <81 IRQ_TYPE_LEVEL_HIGH>,
++ <80 IRQ_TYPE_LEVEL_HIGH>,
++ <79 IRQ_TYPE_LEVEL_HIGH>;
++ #interrupt-cells = <2>;
++ status = "disabled";
++ };
++ };
++
++ CP11X_LABEL(syscon1): system-controller@400000 {
++ compatible = "syscon", "simple-mfd";
++ reg = <0x400000 0x1000>;
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ CP11X_LABEL(thermal): thermal-sensor@70 {
++ compatible = "marvell,armada-cp110-thermal";
++ reg = <0x70 0x10>;
++ interrupts-extended =
++ <&CP11X_LABEL(icu_sei) 116 IRQ_TYPE_LEVEL_HIGH>;
++ #thermal-sensor-cells = <1>;
++ };
++ };
++
++ CP11X_LABEL(usb3_0): usb3@500000 {
++ compatible = "marvell,armada-8k-xhci",
++ "generic-xhci";
++ reg = <0x500000 0x4000>;
++ dma-coherent;
++ interrupts = <106 IRQ_TYPE_LEVEL_HIGH>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 22>,
++ <&CP11X_LABEL(clk) 1 16>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(usb3_1): usb3@510000 {
++ compatible = "marvell,armada-8k-xhci",
++ "generic-xhci";
++ reg = <0x510000 0x4000>;
++ dma-coherent;
++ interrupts = <105 IRQ_TYPE_LEVEL_HIGH>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 23>,
++ <&CP11X_LABEL(clk) 1 16>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(sata0): sata@540000 {
++ compatible = "marvell,armada-8k-ahci",
++ "generic-ahci";
++ reg = <0x540000 0x30000>;
++ dma-coherent;
++ interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
++ clocks = <&CP11X_LABEL(clk) 1 15>,
++ <&CP11X_LABEL(clk) 1 16>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++ status = "disabled";
++
++ sata-port@0 {
++ reg = <0>;
++ };
++
++ sata-port@1 {
++ reg = <1>;
++ };
++ };
++
++ CP11X_LABEL(xor0): xor@6a0000 {
++ compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
++ reg = <0x6a0000 0x1000>, <0x6b0000 0x1000>;
++ dma-coherent;
++ msi-parent = <&gic_v2m0>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 8>,
++ <&CP11X_LABEL(clk) 1 14>;
++ };
++
++ CP11X_LABEL(xor1): xor@6c0000 {
++ compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
++ reg = <0x6c0000 0x1000>, <0x6d0000 0x1000>;
++ dma-coherent;
++ msi-parent = <&gic_v2m0>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 7>,
++ <&CP11X_LABEL(clk) 1 14>;
++ };
++
++ CP11X_LABEL(spi0): spi@700600 {
++ compatible = "marvell,armada-380-spi";
++ reg = <0x700600 0x50>;
++ #address-cells = <0x1>;
++ #size-cells = <0x0>;
++ clock-names = "core", "axi";
++ clocks = <&CP11X_LABEL(clk) 1 21>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(spi1): spi@700680 {
++ compatible = "marvell,armada-380-spi";
++ reg = <0x700680 0x50>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++ clock-names = "core", "axi";
++ clocks = <&CP11X_LABEL(clk) 1 21>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(i2c0): i2c@701000 {
++ compatible = "marvell,mv78230-i2c";
++ reg = <0x701000 0x20>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++ interrupts = <120 IRQ_TYPE_LEVEL_HIGH>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 21>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(i2c1): i2c@701100 {
++ compatible = "marvell,mv78230-i2c";
++ reg = <0x701100 0x20>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++ interrupts = <121 IRQ_TYPE_LEVEL_HIGH>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 21>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(uart0): serial@702000 {
++ compatible = "snps,dw-apb-uart";
++ reg = <0x702000 0x100>;
++ reg-shift = <2>;
++ interrupts = <122 IRQ_TYPE_LEVEL_HIGH>;
++ reg-io-width = <1>;
++ clock-names = "baudclk", "apb_pclk";
++ clocks = <&CP11X_LABEL(clk) 1 21>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(uart1): serial@702100 {
++ compatible = "snps,dw-apb-uart";
++ reg = <0x702100 0x100>;
++ reg-shift = <2>;
++ interrupts = <123 IRQ_TYPE_LEVEL_HIGH>;
++ reg-io-width = <1>;
++ clock-names = "baudclk", "apb_pclk";
++ clocks = <&CP11X_LABEL(clk) 1 21>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(uart2): serial@702200 {
++ compatible = "snps,dw-apb-uart";
++ reg = <0x702200 0x100>;
++ reg-shift = <2>;
++ interrupts = <124 IRQ_TYPE_LEVEL_HIGH>;
++ reg-io-width = <1>;
++ clock-names = "baudclk", "apb_pclk";
++ clocks = <&CP11X_LABEL(clk) 1 21>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(uart3): serial@702300 {
++ compatible = "snps,dw-apb-uart";
++ reg = <0x702300 0x100>;
++ reg-shift = <2>;
++ interrupts = <125 IRQ_TYPE_LEVEL_HIGH>;
++ reg-io-width = <1>;
++ clock-names = "baudclk", "apb_pclk";
++ clocks = <&CP11X_LABEL(clk) 1 21>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "disabled";
++ };
++
++ CP11X_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-controller",
++ "marvell,armada370-nand-controller";
++ reg = <0x720000 0x54>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++ interrupts = <115 IRQ_TYPE_LEVEL_HIGH>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 2>,
++ <&CP11X_LABEL(clk) 1 17>;
++ marvell,system-controller = <&CP11X_LABEL(syscon0)>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(trng): trng@760000 {
++ compatible = "marvell,armada-8k-rng",
++ "inside-secure,safexcel-eip76";
++ reg = <0x760000 0x7d>;
++ interrupts = <95 IRQ_TYPE_LEVEL_HIGH>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 25>,
++ <&CP11X_LABEL(clk) 1 17>;
++ status = "okay";
++ };
++
++ CP11X_LABEL(sdhci0): sdhci@780000 {
++ compatible = "marvell,armada-cp110-sdhci";
++ reg = <0x780000 0x300>;
++ interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;
++ clock-names = "core", "axi";
++ clocks = <&CP11X_LABEL(clk) 1 4>, <&CP11X_LABEL(clk) 1 18>;
++ dma-coherent;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(crypto): crypto@800000 {
++ compatible = "inside-secure,safexcel-eip197b";
++ reg = <0x800000 0x200000>;
++ interrupts = <87 IRQ_TYPE_LEVEL_HIGH>,
++ <88 IRQ_TYPE_LEVEL_HIGH>,
++ <89 IRQ_TYPE_LEVEL_HIGH>,
++ <90 IRQ_TYPE_LEVEL_HIGH>,
++ <91 IRQ_TYPE_LEVEL_HIGH>,
++ <92 IRQ_TYPE_LEVEL_HIGH>;
++ interrupt-names = "mem", "ring0", "ring1",
++ "ring2", "ring3", "eip";
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 26>,
++ <&CP11X_LABEL(clk) 1 17>;
++ dma-coherent;
++ };
++ };
++
++ CP11X_LABEL(pcie0): pcie@CP11X_PCIE0_BASE {
++ compatible = "marvell,armada8k-pcie", "snps,dw-pcie";
++ reg = <0 ADDRESSIFY(CP11X_PCIE0_BASE) 0 0x10000>,
++ <0 CP11X_PCIEx_CONF_BASE(0) 0 0x80000>;
++ reg-names = "ctrl", "config";
++ #address-cells = <3>;
++ #size-cells = <2>;
++ #interrupt-cells = <1>;
++ device_type = "pci";
++ dma-coherent;
++ msi-parent = <&gic_v2m0>;
++
++ bus-range = <0 0xff>;
++ ranges =
++ /* downstream I/O */
++ <0x81000000 0 CP11X_PCIEx_IO_BASE(0) 0 CP11X_PCIEx_IO_BASE(0) 0 0x10000
++ /* non-prefetchable memory */
++ 0x82000000 0 CP11X_PCIEx_MEM_BASE(0) 0 CP11X_PCIEx_MEM_BASE(0) 0 0xf00000>;
++ interrupt-map-mask = <0 0 0 0>;
++ interrupt-map = <0 0 0 0 &CP11X_LABEL(icu_nsr) 22 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <22 IRQ_TYPE_LEVEL_HIGH>;
++ num-lanes = <1>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 13>, <&CP11X_LABEL(clk) 1 14>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(pcie1): pcie@CP11X_PCIE1_BASE {
++ compatible = "marvell,armada8k-pcie", "snps,dw-pcie";
++ reg = <0 ADDRESSIFY(CP11X_PCIE1_BASE) 0 0x10000>,
++ <0 CP11X_PCIEx_CONF_BASE(1) 0 0x80000>;
++ reg-names = "ctrl", "config";
++ #address-cells = <3>;
++ #size-cells = <2>;
++ #interrupt-cells = <1>;
++ device_type = "pci";
++ dma-coherent;
++ msi-parent = <&gic_v2m0>;
++
++ bus-range = <0 0xff>;
++ ranges =
++ /* downstream I/O */
++ <0x81000000 0 CP11X_PCIEx_IO_BASE(1) 0 CP11X_PCIEx_IO_BASE(1) 0 0x10000
++ /* non-prefetchable memory */
++ 0x82000000 0 CP11X_PCIEx_MEM_BASE(1) 0 CP11X_PCIEx_MEM_BASE(1) 0 0xf00000>;
++ interrupt-map-mask = <0 0 0 0>;
++ interrupt-map = <0 0 0 0 &CP11X_LABEL(icu_nsr) 24 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <24 IRQ_TYPE_LEVEL_HIGH>;
++
++ num-lanes = <1>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 11>, <&CP11X_LABEL(clk) 1 14>;
++ status = "disabled";
++ };
++
++ CP11X_LABEL(pcie2): pcie@CP11X_PCIE2_BASE {
++ compatible = "marvell,armada8k-pcie", "snps,dw-pcie";
++ reg = <0 ADDRESSIFY(CP11X_PCIE2_BASE) 0 0x10000>,
++ <0 CP11X_PCIEx_CONF_BASE(2) 0 0x80000>;
++ reg-names = "ctrl", "config";
++ #address-cells = <3>;
++ #size-cells = <2>;
++ #interrupt-cells = <1>;
++ device_type = "pci";
++ dma-coherent;
++ msi-parent = <&gic_v2m0>;
++
++ bus-range = <0 0xff>;
++ ranges =
++ /* downstream I/O */
++ <0x81000000 0 CP11X_PCIEx_IO_BASE(2) 0 CP11X_PCIEx_IO_BASE(2) 0 0x10000
++ /* non-prefetchable memory */
++ 0x82000000 0 CP11X_PCIEx_MEM_BASE(2) 0 CP11X_PCIEx_MEM_BASE(2) 0 0xf00000>;
++ interrupt-map-mask = <0 0 0 0>;
++ interrupt-map = <0 0 0 0 &CP11X_LABEL(icu_nsr) 23 IRQ_TYPE_LEVEL_HIGH>;
++ interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
++
++ num-lanes = <1>;
++ clock-names = "core", "reg";
++ clocks = <&CP11X_LABEL(clk) 1 12>, <&CP11X_LABEL(clk) 1 14>;
++ status = "disabled";
++ };
++};
--- /dev/null
+From 7409b155562cc19b929b57692b334c5758ffc75d Mon Sep 17 00:00:00 2001
+From: Konstantin Porotchkin <kostap@marvell.com>
+Date: Fri, 4 Oct 2019 16:27:22 +0200
+Subject: [PATCH] arm64: dts: marvell: Prepare the introduction of AP807 based
+ SoCs
+
+Prepare the support for Marvell AP807 die. This die is very similar to
+AP806 but uses different DDR PHY. AP807 is a major component of CN9130
+SoC series.
+
+Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+---
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 448 +----------------
+ arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 456 ++++++++++++++++++
+ 2 files changed, 458 insertions(+), 446 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
+
+--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
++++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+@@ -5,454 +5,10 @@
+ * Device Tree file for Marvell Armada AP806.
+ */
+
+-#include <dt-bindings/interrupt-controller/arm-gic.h>
+-#include <dt-bindings/thermal/thermal.h>
+-
+-/dts-v1/;
++#define AP_NAME ap806
++#include "armada-ap80x.dtsi"
+
+ / {
+ model = "Marvell Armada AP806";
+ compatible = "marvell,armada-ap806";
+- #address-cells = <2>;
+- #size-cells = <2>;
+-
+- aliases {
+- serial0 = &uart0;
+- serial1 = &uart1;
+- gpio0 = &ap_gpio;
+- spi0 = &spi0;
+- };
+-
+- psci {
+- compatible = "arm,psci-0.2";
+- method = "smc";
+- };
+-
+- reserved-memory {
+- #address-cells = <2>;
+- #size-cells = <2>;
+- ranges;
+-
+- /*
+- * This area matches the mapping done with a
+- * mainline U-Boot, and should be updated by the
+- * bootloader.
+- */
+-
+- psci-area@4000000 {
+- reg = <0x0 0x4000000 0x0 0x200000>;
+- no-map;
+- };
+- };
+-
+- ap806 {
+- #address-cells = <2>;
+- #size-cells = <2>;
+- compatible = "simple-bus";
+- interrupt-parent = <&gic>;
+- ranges;
+-
+- config-space@f0000000 {
+- #address-cells = <1>;
+- #size-cells = <1>;
+- compatible = "simple-bus";
+- ranges = <0x0 0x0 0xf0000000 0x1000000>;
+-
+- gic: interrupt-controller@210000 {
+- compatible = "arm,gic-400";
+- #interrupt-cells = <3>;
+- #address-cells = <1>;
+- #size-cells = <1>;
+- ranges;
+- interrupt-controller;
+- interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+- reg = <0x210000 0x10000>,
+- <0x220000 0x20000>,
+- <0x240000 0x20000>,
+- <0x260000 0x20000>;
+-
+- gic_v2m0: v2m@280000 {
+- compatible = "arm,gic-v2m-frame";
+- msi-controller;
+- reg = <0x280000 0x1000>;
+- arm,msi-base-spi = <160>;
+- arm,msi-num-spis = <32>;
+- };
+- gic_v2m1: v2m@290000 {
+- compatible = "arm,gic-v2m-frame";
+- msi-controller;
+- reg = <0x290000 0x1000>;
+- arm,msi-base-spi = <192>;
+- arm,msi-num-spis = <32>;
+- };
+- gic_v2m2: v2m@2a0000 {
+- compatible = "arm,gic-v2m-frame";
+- msi-controller;
+- reg = <0x2a0000 0x1000>;
+- arm,msi-base-spi = <224>;
+- arm,msi-num-spis = <32>;
+- };
+- gic_v2m3: v2m@2b0000 {
+- compatible = "arm,gic-v2m-frame";
+- msi-controller;
+- reg = <0x2b0000 0x1000>;
+- arm,msi-base-spi = <256>;
+- arm,msi-num-spis = <32>;
+- };
+- };
+-
+- 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)>;
+- };
+-
+- pmu {
+- compatible = "arm,cortex-a72-pmu";
+- interrupt-parent = <&pic>;
+- interrupts = <17>;
+- };
+-
+- odmi: odmi@300000 {
+- compatible = "marvell,odmi-controller";
+- interrupt-controller;
+- msi-controller;
+- marvell,odmi-frames = <4>;
+- reg = <0x300000 0x4000>,
+- <0x304000 0x4000>,
+- <0x308000 0x4000>,
+- <0x30C000 0x4000>;
+- marvell,spi-base = <128>, <136>, <144>, <152>;
+- };
+-
+- gicp: gicp@3f0040 {
+- compatible = "marvell,ap806-gicp";
+- reg = <0x3f0040 0x10>;
+- marvell,spi-ranges = <64 64>, <288 64>;
+- msi-controller;
+- };
+-
+- pic: interrupt-controller@3f0100 {
+- compatible = "marvell,armada-8k-pic";
+- reg = <0x3f0100 0x10>;
+- #interrupt-cells = <1>;
+- interrupt-controller;
+- interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>;
+- };
+-
+- sei: interrupt-controller@3f0200 {
+- compatible = "marvell,ap806-sei";
+- reg = <0x3f0200 0x40>;
+- interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
+- #interrupt-cells = <1>;
+- interrupt-controller;
+- msi-controller;
+- };
+-
+- xor@400000 {
+- compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
+- reg = <0x400000 0x1000>,
+- <0x410000 0x1000>;
+- msi-parent = <&gic_v2m0>;
+- clocks = <&ap_clk 3>;
+- dma-coherent;
+- };
+-
+- xor@420000 {
+- compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
+- reg = <0x420000 0x1000>,
+- <0x430000 0x1000>;
+- msi-parent = <&gic_v2m0>;
+- clocks = <&ap_clk 3>;
+- dma-coherent;
+- };
+-
+- xor@440000 {
+- compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
+- reg = <0x440000 0x1000>,
+- <0x450000 0x1000>;
+- msi-parent = <&gic_v2m0>;
+- clocks = <&ap_clk 3>;
+- dma-coherent;
+- };
+-
+- xor@460000 {
+- compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
+- reg = <0x460000 0x1000>,
+- <0x470000 0x1000>;
+- msi-parent = <&gic_v2m0>;
+- clocks = <&ap_clk 3>;
+- dma-coherent;
+- };
+-
+- spi0: spi@510600 {
+- compatible = "marvell,armada-380-spi";
+- reg = <0x510600 0x50>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+- interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+- clocks = <&ap_clk 3>;
+- status = "disabled";
+- };
+-
+- i2c0: i2c@511000 {
+- compatible = "marvell,mv78230-i2c";
+- reg = <0x511000 0x20>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+- interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+- timeout-ms = <1000>;
+- clocks = <&ap_clk 3>;
+- status = "disabled";
+- };
+-
+- uart0: serial@512000 {
+- compatible = "snps,dw-apb-uart";
+- reg = <0x512000 0x100>;
+- reg-shift = <2>;
+- interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+- reg-io-width = <1>;
+- clocks = <&ap_clk 3>;
+- status = "disabled";
+- };
+-
+- uart1: serial@512100 {
+- compatible = "snps,dw-apb-uart";
+- reg = <0x512100 0x100>;
+- reg-shift = <2>;
+- interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+- reg-io-width = <1>;
+- clocks = <&ap_clk 3>;
+- status = "disabled";
+-
+- };
+-
+- watchdog: watchdog@610000 {
+- compatible = "arm,sbsa-gwdt";
+- reg = <0x610000 0x1000>, <0x600000 0x1000>;
+- interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
+- };
+-
+- ap_sdhci0: sdhci@6e0000 {
+- compatible = "marvell,armada-ap806-sdhci";
+- reg = <0x6e0000 0x300>;
+- interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+- clock-names = "core";
+- clocks = <&ap_clk 4>;
+- dma-coherent;
+- marvell,xenon-phy-slow-mode;
+- status = "disabled";
+- };
+-
+- ap_syscon0: system-controller@6f4000 {
+- compatible = "syscon", "simple-mfd";
+- reg = <0x6f4000 0x2000>;
+-
+- ap_clk: clock {
+- compatible = "marvell,ap806-clock";
+- #clock-cells = <1>;
+- };
+-
+- ap_pinctrl: pinctrl {
+- compatible = "marvell,ap806-pinctrl";
+-
+- uart0_pins: uart0-pins {
+- marvell,pins = "mpp11", "mpp19";
+- marvell,function = "uart0";
+- };
+- };
+-
+- ap_gpio: gpio@1040 {
+- compatible = "marvell,armada-8k-gpio";
+- offset = <0x1040>;
+- ngpios = <20>;
+- gpio-controller;
+- #gpio-cells = <2>;
+- gpio-ranges = <&ap_pinctrl 0 0 20>;
+- };
+- };
+-
+- ap_syscon1: system-controller@6f8000 {
+- compatible = "syscon", "simple-mfd";
+- reg = <0x6f8000 0x1000>;
+- #address-cells = <1>;
+- #size-cells = <1>;
+-
+- cpu_clk: clock-cpu@278 {
+- compatible = "marvell,ap806-cpu-clock";
+- clocks = <&ap_clk 0>, <&ap_clk 1>;
+- #clock-cells = <1>;
+- reg = <0x278 0xa30>;
+- };
+-
+- ap_thermal: thermal-sensor@80 {
+- compatible = "marvell,armada-ap806-thermal";
+- reg = <0x80 0x10>;
+- interrupt-parent = <&sei>;
+- interrupts = <18>;
+- #thermal-sensor-cells = <1>;
+- };
+- };
+- };
+- };
+-
+- /*
+- * The thermal IP features one internal sensor plus, if applicable, one
+- * remote channel wired to one sensor per CPU.
+- *
+- * Only one thermal zone per AP/CP may trigger interrupts at a time, the
+- * first one that will have a critical trip point will be chosen.
+- */
+- thermal-zones {
+- ap_thermal_ic: ap-thermal-ic {
+- polling-delay-passive = <0>; /* Interrupt driven */
+- polling-delay = <0>; /* Interrupt driven */
+-
+- thermal-sensors = <&ap_thermal 0>;
+-
+- trips {
+- ap_crit: ap-crit {
+- temperature = <100000>; /* mC degrees */
+- hysteresis = <2000>; /* mC degrees */
+- type = "critical";
+- };
+- };
+-
+- cooling-maps { };
+- };
+-
+- ap_thermal_cpu0: ap-thermal-cpu0 {
+- polling-delay-passive = <1000>;
+- polling-delay = <1000>;
+-
+- thermal-sensors = <&ap_thermal 1>;
+-
+- trips {
+- cpu0_hot: cpu0-hot {
+- temperature = <85000>;
+- hysteresis = <2000>;
+- type = "passive";
+- };
+- cpu0_emerg: cpu0-emerg {
+- temperature = <95000>;
+- hysteresis = <2000>;
+- type = "passive";
+- };
+- };
+-
+- cooling-maps {
+- map0_hot: map0-hot {
+- trip = <&cpu0_hot>;
+- cooling-device = <&cpu0 1 2>,
+- <&cpu1 1 2>;
+- };
+- map0_emerg: map0-ermerg {
+- trip = <&cpu0_emerg>;
+- cooling-device = <&cpu0 3 3>,
+- <&cpu1 3 3>;
+- };
+- };
+- };
+-
+- ap_thermal_cpu1: ap-thermal-cpu1 {
+- polling-delay-passive = <1000>;
+- polling-delay = <1000>;
+-
+- thermal-sensors = <&ap_thermal 2>;
+-
+- trips {
+- cpu1_hot: cpu1-hot {
+- temperature = <85000>;
+- hysteresis = <2000>;
+- type = "passive";
+- };
+- cpu1_emerg: cpu1-emerg {
+- temperature = <95000>;
+- hysteresis = <2000>;
+- type = "passive";
+- };
+- };
+-
+- cooling-maps {
+- map1_hot: map1-hot {
+- trip = <&cpu1_hot>;
+- cooling-device = <&cpu0 1 2>,
+- <&cpu1 1 2>;
+- };
+- map1_emerg: map1-emerg {
+- trip = <&cpu1_emerg>;
+- cooling-device = <&cpu0 3 3>,
+- <&cpu1 3 3>;
+- };
+- };
+- };
+-
+- ap_thermal_cpu2: ap-thermal-cpu2 {
+- polling-delay-passive = <1000>;
+- polling-delay = <1000>;
+-
+- thermal-sensors = <&ap_thermal 3>;
+-
+- trips {
+- cpu2_hot: cpu2-hot {
+- temperature = <85000>;
+- hysteresis = <2000>;
+- type = "passive";
+- };
+- cpu2_emerg: cpu2-emerg {
+- temperature = <95000>;
+- hysteresis = <2000>;
+- type = "passive";
+- };
+- };
+-
+- cooling-maps {
+- map2_hot: map2-hot {
+- trip = <&cpu2_hot>;
+- cooling-device = <&cpu2 1 2>,
+- <&cpu3 1 2>;
+- };
+- map2_emerg: map2-emerg {
+- trip = <&cpu2_emerg>;
+- cooling-device = <&cpu2 3 3>,
+- <&cpu3 3 3>;
+- };
+- };
+- };
+-
+- ap_thermal_cpu3: ap-thermal-cpu3 {
+- polling-delay-passive = <1000>;
+- polling-delay = <1000>;
+-
+- thermal-sensors = <&ap_thermal 4>;
+-
+- trips {
+- cpu3_hot: cpu3-hot {
+- temperature = <85000>;
+- hysteresis = <2000>;
+- type = "passive";
+- };
+- cpu3_emerg: cpu3-emerg {
+- temperature = <95000>;
+- hysteresis = <2000>;
+- type = "passive";
+- };
+- };
+-
+- cooling-maps {
+- map3_hot: map3-bhot {
+- trip = <&cpu3_hot>;
+- cooling-device = <&cpu2 1 2>,
+- <&cpu3 1 2>;
+- };
+- map3_emerg: map3-emerg {
+- trip = <&cpu3_emerg>;
+- cooling-device = <&cpu2 3 3>,
+- <&cpu3 3 3>;
+- };
+- };
+- };
+- };
+ };
+--- /dev/null
++++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
+@@ -0,0 +1,456 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (C) 2019 Marvell Technology Group Ltd.
++ *
++ * Device Tree file for Marvell Armada AP80x.
++ */
++
++#include <dt-bindings/interrupt-controller/arm-gic.h>
++#include <dt-bindings/thermal/thermal.h>
++
++/dts-v1/;
++
++/ {
++ #address-cells = <2>;
++ #size-cells = <2>;
++
++ aliases {
++ serial0 = &uart0;
++ serial1 = &uart1;
++ gpio0 = &ap_gpio;
++ spi0 = &spi0;
++ };
++
++ psci {
++ compatible = "arm,psci-0.2";
++ method = "smc";
++ };
++
++ reserved-memory {
++ #address-cells = <2>;
++ #size-cells = <2>;
++ ranges;
++
++ /*
++ * This area matches the mapping done with a
++ * mainline U-Boot, and should be updated by the
++ * bootloader.
++ */
++
++ psci-area@4000000 {
++ reg = <0x0 0x4000000 0x0 0x200000>;
++ no-map;
++ };
++ };
++
++ AP_NAME {
++ #address-cells = <2>;
++ #size-cells = <2>;
++ compatible = "simple-bus";
++ interrupt-parent = <&gic>;
++ ranges;
++
++ config-space@f0000000 {
++ #address-cells = <1>;
++ #size-cells = <1>;
++ compatible = "simple-bus";
++ ranges = <0x0 0x0 0xf0000000 0x1000000>;
++
++ gic: interrupt-controller@210000 {
++ compatible = "arm,gic-400";
++ #interrupt-cells = <3>;
++ #address-cells = <1>;
++ #size-cells = <1>;
++ ranges;
++ interrupt-controller;
++ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
++ reg = <0x210000 0x10000>,
++ <0x220000 0x20000>,
++ <0x240000 0x20000>,
++ <0x260000 0x20000>;
++
++ gic_v2m0: v2m@280000 {
++ compatible = "arm,gic-v2m-frame";
++ msi-controller;
++ reg = <0x280000 0x1000>;
++ arm,msi-base-spi = <160>;
++ arm,msi-num-spis = <32>;
++ };
++ gic_v2m1: v2m@290000 {
++ compatible = "arm,gic-v2m-frame";
++ msi-controller;
++ reg = <0x290000 0x1000>;
++ arm,msi-base-spi = <192>;
++ arm,msi-num-spis = <32>;
++ };
++ gic_v2m2: v2m@2a0000 {
++ compatible = "arm,gic-v2m-frame";
++ msi-controller;
++ reg = <0x2a0000 0x1000>;
++ arm,msi-base-spi = <224>;
++ arm,msi-num-spis = <32>;
++ };
++ gic_v2m3: v2m@2b0000 {
++ compatible = "arm,gic-v2m-frame";
++ msi-controller;
++ reg = <0x2b0000 0x1000>;
++ arm,msi-base-spi = <256>;
++ arm,msi-num-spis = <32>;
++ };
++ };
++
++ 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)>;
++ };
++
++ pmu {
++ compatible = "arm,cortex-a72-pmu";
++ interrupt-parent = <&pic>;
++ interrupts = <17>;
++ };
++
++ odmi: odmi@300000 {
++ compatible = "marvell,odmi-controller";
++ interrupt-controller;
++ msi-controller;
++ marvell,odmi-frames = <4>;
++ reg = <0x300000 0x4000>,
++ <0x304000 0x4000>,
++ <0x308000 0x4000>,
++ <0x30C000 0x4000>;
++ marvell,spi-base = <128>, <136>, <144>, <152>;
++ };
++
++ gicp: gicp@3f0040 {
++ compatible = "marvell,ap806-gicp";
++ reg = <0x3f0040 0x10>;
++ marvell,spi-ranges = <64 64>, <288 64>;
++ msi-controller;
++ };
++
++ pic: interrupt-controller@3f0100 {
++ compatible = "marvell,armada-8k-pic";
++ reg = <0x3f0100 0x10>;
++ #interrupt-cells = <1>;
++ interrupt-controller;
++ interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>;
++ };
++
++ sei: interrupt-controller@3f0200 {
++ compatible = "marvell,ap806-sei";
++ reg = <0x3f0200 0x40>;
++ interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
++ #interrupt-cells = <1>;
++ interrupt-controller;
++ msi-controller;
++ };
++
++ xor@400000 {
++ compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
++ reg = <0x400000 0x1000>,
++ <0x410000 0x1000>;
++ msi-parent = <&gic_v2m0>;
++ clocks = <&ap_clk 3>;
++ dma-coherent;
++ };
++
++ xor@420000 {
++ compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
++ reg = <0x420000 0x1000>,
++ <0x430000 0x1000>;
++ msi-parent = <&gic_v2m0>;
++ clocks = <&ap_clk 3>;
++ dma-coherent;
++ };
++
++ xor@440000 {
++ compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
++ reg = <0x440000 0x1000>,
++ <0x450000 0x1000>;
++ msi-parent = <&gic_v2m0>;
++ clocks = <&ap_clk 3>;
++ dma-coherent;
++ };
++
++ xor@460000 {
++ compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
++ reg = <0x460000 0x1000>,
++ <0x470000 0x1000>;
++ msi-parent = <&gic_v2m0>;
++ clocks = <&ap_clk 3>;
++ dma-coherent;
++ };
++
++ spi0: spi@510600 {
++ compatible = "marvell,armada-380-spi";
++ reg = <0x510600 0x50>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
++ clocks = <&ap_clk 3>;
++ status = "disabled";
++ };
++
++ i2c0: i2c@511000 {
++ compatible = "marvell,mv78230-i2c";
++ reg = <0x511000 0x20>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
++ timeout-ms = <1000>;
++ clocks = <&ap_clk 3>;
++ status = "disabled";
++ };
++
++ uart0: serial@512000 {
++ compatible = "snps,dw-apb-uart";
++ reg = <0x512000 0x100>;
++ reg-shift = <2>;
++ interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
++ reg-io-width = <1>;
++ clocks = <&ap_clk 3>;
++ status = "disabled";
++ };
++
++ uart1: serial@512100 {
++ compatible = "snps,dw-apb-uart";
++ reg = <0x512100 0x100>;
++ reg-shift = <2>;
++ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
++ reg-io-width = <1>;
++ clocks = <&ap_clk 3>;
++ status = "disabled";
++
++ };
++
++ watchdog: watchdog@610000 {
++ compatible = "arm,sbsa-gwdt";
++ reg = <0x610000 0x1000>, <0x600000 0x1000>;
++ interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
++ };
++
++ ap_sdhci0: sdhci@6e0000 {
++ compatible = "marvell,armada-ap806-sdhci";
++ reg = <0x6e0000 0x300>;
++ interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
++ clock-names = "core";
++ clocks = <&ap_clk 4>;
++ dma-coherent;
++ marvell,xenon-phy-slow-mode;
++ status = "disabled";
++ };
++
++ ap_syscon0: system-controller@6f4000 {
++ compatible = "syscon", "simple-mfd";
++ reg = <0x6f4000 0x2000>;
++
++ ap_clk: clock {
++ compatible = "marvell,ap806-clock";
++ #clock-cells = <1>;
++ };
++
++ ap_pinctrl: pinctrl {
++ compatible = "marvell,ap806-pinctrl";
++
++ uart0_pins: uart0-pins {
++ marvell,pins = "mpp11", "mpp19";
++ marvell,function = "uart0";
++ };
++ };
++
++ ap_gpio: gpio@1040 {
++ compatible = "marvell,armada-8k-gpio";
++ offset = <0x1040>;
++ ngpios = <20>;
++ gpio-controller;
++ #gpio-cells = <2>;
++ gpio-ranges = <&ap_pinctrl 0 0 20>;
++ };
++ };
++
++ ap_syscon1: system-controller@6f8000 {
++ compatible = "syscon", "simple-mfd";
++ reg = <0x6f8000 0x1000>;
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ cpu_clk: clock-cpu@278 {
++ compatible = "marvell,ap806-cpu-clock";
++ clocks = <&ap_clk 0>, <&ap_clk 1>;
++ #clock-cells = <1>;
++ reg = <0x278 0xa30>;
++ };
++
++ ap_thermal: thermal-sensor@80 {
++ compatible = "marvell,armada-ap806-thermal";
++ reg = <0x80 0x10>;
++ interrupt-parent = <&sei>;
++ interrupts = <18>;
++ #thermal-sensor-cells = <1>;
++ };
++ };
++ };
++ };
++
++ /*
++ * The thermal IP features one internal sensor plus, if applicable, one
++ * remote channel wired to one sensor per CPU.
++ *
++ * Only one thermal zone per AP/CP may trigger interrupts at a time, the
++ * first one that will have a critical trip point will be chosen.
++ */
++ thermal-zones {
++ ap_thermal_ic: ap-thermal-ic {
++ polling-delay-passive = <0>; /* Interrupt driven */
++ polling-delay = <0>; /* Interrupt driven */
++
++ thermal-sensors = <&ap_thermal 0>;
++
++ trips {
++ ap_crit: ap-crit {
++ temperature = <100000>; /* mC degrees */
++ hysteresis = <2000>; /* mC degrees */
++ type = "critical";
++ };
++ };
++
++ cooling-maps { };
++ };
++
++ ap_thermal_cpu0: ap-thermal-cpu0 {
++ polling-delay-passive = <1000>;
++ polling-delay = <1000>;
++
++ thermal-sensors = <&ap_thermal 1>;
++
++ trips {
++ cpu0_hot: cpu0-hot {
++ temperature = <85000>;
++ hysteresis = <2000>;
++ type = "passive";
++ };
++ cpu0_emerg: cpu0-emerg {
++ temperature = <95000>;
++ hysteresis = <2000>;
++ type = "passive";
++ };
++ };
++
++ cooling-maps {
++ map0_hot: map0-hot {
++ trip = <&cpu0_hot>;
++ cooling-device = <&cpu0 1 2>,
++ <&cpu1 1 2>;
++ };
++ map0_emerg: map0-ermerg {
++ trip = <&cpu0_emerg>;
++ cooling-device = <&cpu0 3 3>,
++ <&cpu1 3 3>;
++ };
++ };
++ };
++
++ ap_thermal_cpu1: ap-thermal-cpu1 {
++ polling-delay-passive = <1000>;
++ polling-delay = <1000>;
++
++ thermal-sensors = <&ap_thermal 2>;
++
++ trips {
++ cpu1_hot: cpu1-hot {
++ temperature = <85000>;
++ hysteresis = <2000>;
++ type = "passive";
++ };
++ cpu1_emerg: cpu1-emerg {
++ temperature = <95000>;
++ hysteresis = <2000>;
++ type = "passive";
++ };
++ };
++
++ cooling-maps {
++ map1_hot: map1-hot {
++ trip = <&cpu1_hot>;
++ cooling-device = <&cpu0 1 2>,
++ <&cpu1 1 2>;
++ };
++ map1_emerg: map1-emerg {
++ trip = <&cpu1_emerg>;
++ cooling-device = <&cpu0 3 3>,
++ <&cpu1 3 3>;
++ };
++ };
++ };
++
++ ap_thermal_cpu2: ap-thermal-cpu2 {
++ polling-delay-passive = <1000>;
++ polling-delay = <1000>;
++
++ thermal-sensors = <&ap_thermal 3>;
++
++ trips {
++ cpu2_hot: cpu2-hot {
++ temperature = <85000>;
++ hysteresis = <2000>;
++ type = "passive";
++ };
++ cpu2_emerg: cpu2-emerg {
++ temperature = <95000>;
++ hysteresis = <2000>;
++ type = "passive";
++ };
++ };
++
++ cooling-maps {
++ map2_hot: map2-hot {
++ trip = <&cpu2_hot>;
++ cooling-device = <&cpu2 1 2>,
++ <&cpu3 1 2>;
++ };
++ map2_emerg: map2-emerg {
++ trip = <&cpu2_emerg>;
++ cooling-device = <&cpu2 3 3>,
++ <&cpu3 3 3>;
++ };
++ };
++ };
++
++ ap_thermal_cpu3: ap-thermal-cpu3 {
++ polling-delay-passive = <1000>;
++ polling-delay = <1000>;
++
++ thermal-sensors = <&ap_thermal 4>;
++
++ trips {
++ cpu3_hot: cpu3-hot {
++ temperature = <85000>;
++ hysteresis = <2000>;
++ type = "passive";
++ };
++ cpu3_emerg: cpu3-emerg {
++ temperature = <95000>;
++ hysteresis = <2000>;
++ type = "passive";
++ };
++ };
++
++ cooling-maps {
++ map3_hot: map3-bhot {
++ trip = <&cpu3_hot>;
++ cooling-device = <&cpu2 1 2>,
++ <&cpu3 1 2>;
++ };
++ map3_emerg: map3-emerg {
++ trip = <&cpu3_emerg>;
++ cooling-device = <&cpu2 3 3>,
++ <&cpu3 3 3>;
++ };
++ };
++ };
++ };
++};
projects / openwrt / staging / ynezz.git / commitdiff