arm64: dts: marvell: Move clocks to AP806 specific file

Regular clocks and CPU clocks are specific to AP806, move them out of
the generic AP80x file so that AP807 can use its own clocks.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index cdadb28f287e1136106838a888c8f85f5e6f0ad3..866628679ac7c5b6f216642048d4eeff161b7652 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -12,3 +12,19 @@ / {
        model = "Marvell Armada AP806";
        compatible = "marvell,armada-ap806";
 };
+
+&ap_syscon0 {
+       ap_clk: clock {
+               compatible = "marvell,ap806-clock";
+               #clock-cells = <1>;
+       };
+};
+
+&ap_syscon1 {
+       cpu_clk: clock-cpu@278 {
+               compatible = "marvell,ap806-cpu-clock";
+               clocks = <&ap_clk 0>, <&ap_clk 1>;
+               #clock-cells = <1>;
+               reg = <0x278 0xa30>;
+       };
+};

diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
index 0dc1365e5758608da66e13b899eb530938858a97..e7438c21ccee4165a37cd359a1089f8054bbc8c1 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
@@ -248,11 +248,6 @@ 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";
 
@@ -278,13 +273,6 @@ ap_syscon1: system-controller@6f8000 {
                                #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>;