target/linux/mvebu/patches-5.4/009-v5.5-arm64-dts-marvell-Move-clocks-to-AP806-specific-file.patch

   1 From 4f267f2a806b556678b84c4d80c2f4bff8d000d9 Mon Sep 17 00:00:00 2001
   2 From: Miquel Raynal <miquel.raynal@bootlin.com>
   3 Date: Fri, 4 Oct 2019 16:27:23 +0200
   4 Subject: [PATCH] arm64: dts: marvell: Move clocks to AP806 specific file
   5
   6 Regular clocks and CPU clocks are specific to AP806, move them out of
   7 the generic AP80x file so that AP807 can use its own clocks.
   8
   9 Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
  10 Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
  11 ---
  12  arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 16 ++++++++++++++++
  13  arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 12 ------------
  14  2 files changed, 16 insertions(+), 12 deletions(-)
  15
  16 --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
  17 +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
  18 @@ -12,3 +12,19 @@
  19         model = "Marvell Armada AP806";
  20         compatible = "marvell,armada-ap806";
  21  };
  22 +
  23 +&ap_syscon0 {
  24 +       ap_clk: clock {
  25 +               compatible = "marvell,ap806-clock";
  26 +               #clock-cells = <1>;
  27 +       };
  28 +};
  29 +
  30 +&ap_syscon1 {
  31 +       cpu_clk: clock-cpu@278 {
  32 +               compatible = "marvell,ap806-cpu-clock";
  33 +               clocks = <&ap_clk 0>, <&ap_clk 1>;
  34 +               #clock-cells = <1>;
  35 +               reg = <0x278 0xa30>;
  36 +       };
  37 +};
  38 --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
  39 +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
  40 @@ -248,11 +248,6 @@
  41                                 compatible = "syscon", "simple-mfd";
  42                                 reg = <0x6f4000 0x2000>;
  43
  44 -                               ap_clk: clock {
  45 -                                       compatible = "marvell,ap806-clock";
  46 -                                       #clock-cells = <1>;
  47 -                               };
  48 -
  49                                 ap_pinctrl: pinctrl {
  50                                         compatible = "marvell,ap806-pinctrl";
  51
  52 @@ -278,13 +273,6 @@
  53                                 #address-cells = <1>;
  54                                 #size-cells = <1>;
  55
  56 -                               cpu_clk: clock-cpu@278 {
  57 -                                       compatible = "marvell,ap806-cpu-clock";
  58 -                                       clocks = <&ap_clk 0>, <&ap_clk 1>;
  59 -                                       #clock-cells = <1>;
  60 -                                       reg = <0x278 0xa30>;
  61 -                               };
  62 -
  63                                 ap_thermal: thermal-sensor@80 {
  64                                         compatible = "marvell,armada-ap806-thermal";
  65                                         reg = <0x80 0x10>;