target/linux/bcm27xx/patches-5.4/950-0784-SQUASH-dts-Fix-firmware-clocks-support.patch

   1 From 10f7562d7ce7ea6fe6324df059c865ff660811fc Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Thu, 11 Jun 2020 16:34:00 +0100
   4 Subject: [PATCH] SQUASH: dts: Fix firmware clocks support
   5
   6 Commit [1] touched a lot of files and still missed some platforms.
   7 In particular, Pi 2 was left with no clock scaling. Simplify the
   8 firmware clocks DTS support and extend it to all platforms that
   9 use the raspberrypi-cpufreq driver.
  10
  11 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  12 ---
  13  arch/arm/boot/dts/bcm2709-rpi.dtsi         | 7 +++++++
  14  arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 5 -----
  15  arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 5 -----
  16  arch/arm/boot/dts/bcm2710-rpi-cm3.dts      | 5 -----
  17  arch/arm/boot/dts/bcm2711-rpi-4-b.dts      | 5 -----
  18  arch/arm/boot/dts/bcm2711-rpi.dtsi         | 7 +++++++
  19  arch/arm/boot/dts/bcm2836-rpi.dtsi         | 7 +++++++
  20  arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 5 -----
  21  arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 5 -----
  22  arch/arm/boot/dts/bcm2837-rpi-3-b.dts      | 5 -----
  23  arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi     | 5 -----
  24  11 files changed, 21 insertions(+), 40 deletions(-)
  25
  26 --- a/arch/arm/boot/dts/bcm2709-rpi.dtsi
  27 +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
  28 @@ -3,3 +3,10 @@
  29  &vchiq {
  30         compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
  31  };
  32 +
  33 +&firmware {
  34 +       firmware_clocks: clocks {
  35 +               compatible = "raspberrypi,firmware-clocks";
  36 +               #clock-cells = <1>;
  37 +       };
  38 +};
  39 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
  40 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
  41 @@ -85,11 +85,6 @@
  42  };
  43
  44  &firmware {
  45 -       firmware_clocks: clocks {
  46 -               compatible = "raspberrypi,firmware-clocks";
  47 -               #clock-cells = <1>;
  48 -       };
  49 -
  50         expgpio: expgpio {
  51                 compatible = "raspberrypi,firmware-gpio";
  52                 gpio-controller;
  53 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  54 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  55 @@ -96,11 +96,6 @@
  56  };
  57
  58  &firmware {
  59 -       firmware_clocks: clocks {
  60 -               compatible = "raspberrypi,firmware-clocks";
  61 -               #clock-cells = <1>;
  62 -       };
  63 -
  64         expgpio: expgpio {
  65                 compatible = "raspberrypi,firmware-gpio";
  66                 gpio-controller;
  67 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
  68 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
  69 @@ -58,11 +58,6 @@
  70  };
  71
  72  &firmware {
  73 -       firmware_clocks: clocks {
  74 -               compatible = "raspberrypi,firmware-clocks";
  75 -               #clock-cells = <1>;
  76 -       };
  77 -
  78         expgpio: expgpio {
  79                 compatible = "raspberrypi,firmware-gpio";
  80                 gpio-controller;
  81 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  82 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  83 @@ -54,11 +54,6 @@
  84  };
  85
  86  &firmware {
  87 -       firmware_clocks: clocks {
  88 -               compatible = "raspberrypi,firmware-clocks";
  89 -               #clock-cells = <1>;
  90 -       };
  91 -
  92         expgpio: gpio {
  93                 compatible = "raspberrypi,firmware-gpio";
  94                 gpio-controller;
  95 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
  96 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
  97 @@ -170,3 +170,10 @@
  98  &genet {
  99         compatible = "brcm,bcm2711-genet-v5", "brcm,genet-v5";
 100  };
 101 +
 102 +&firmware {
 103 +       firmware_clocks: clocks {
 104 +               compatible = "raspberrypi,firmware-clocks";
 105 +               #clock-cells = <1>;
 106 +       };
 107 +};
 108 --- a/arch/arm/boot/dts/bcm2836-rpi.dtsi
 109 +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi
 110 @@ -4,3 +4,10 @@
 111  &vchiq {
 112         compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
 113  };
 114 +
 115 +&firmware {
 116 +       firmware_clocks: clocks {
 117 +               compatible = "raspberrypi,firmware-clocks";
 118 +               #clock-cells = <1>;
 119 +       };
 120 +};
 121 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 122 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 123 @@ -31,11 +31,6 @@
 124  };
 125
 126  &firmware {
 127 -       firmware_clocks: clocks {
 128 -               compatible = "raspberrypi,firmware-clocks";
 129 -               #clock-cells = <1>;
 130 -       };
 131 -
 132         expgpio: gpio {
 133                 compatible = "raspberrypi,firmware-gpio";
 134                 gpio-controller;
 135 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 136 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 137 @@ -37,11 +37,6 @@
 138  };
 139
 140  &firmware {
 141 -       firmware_clocks: clocks {
 142 -               compatible = "raspberrypi,firmware-clocks";
 143 -               #clock-cells = <1>;
 144 -       };
 145 -
 146         expgpio: gpio {
 147                 compatible = "raspberrypi,firmware-gpio";
 148                 gpio-controller;
 149 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 150 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 151 @@ -32,11 +32,6 @@
 152  };
 153
 154  &firmware {
 155 -       firmware_clocks: clocks {
 156 -               compatible = "raspberrypi,firmware-clocks";
 157 -               #clock-cells = <1>;
 158 -       };
 159 -
 160         expgpio: gpio {
 161                 compatible = "raspberrypi,firmware-gpio";
 162                 gpio-controller;
 163 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
 164 +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
 165 @@ -35,11 +35,6 @@
 166  };
 167
 168  &firmware {
 169 -       firmware_clocks: clocks {
 170 -               compatible = "raspberrypi,firmware-clocks";
 171 -               #clock-cells = <1>;
 172 -       };
 173 -
 174         expgpio: gpio {
 175                 compatible = "raspberrypi,firmware-gpio";
 176                 gpio-controller;