From 10f7562d7ce7ea6fe6324df059c865ff660811fc Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 11 Jun 2020 16:34:00 +0100 Subject: [PATCH] SQUASH: dts: Fix firmware clocks support Commit [1] touched a lot of files and still missed some platforms. In particular, Pi 2 was left with no clock scaling. Simplify the firmware clocks DTS support and extend it to all platforms that use the raspberrypi-cpufreq driver. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2709-rpi.dtsi | 7 +++++++ arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 5 ----- arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 5 ----- arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 5 ----- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 5 ----- arch/arm/boot/dts/bcm2711-rpi.dtsi | 7 +++++++ arch/arm/boot/dts/bcm2836-rpi.dtsi | 7 +++++++ arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 5 ----- arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 5 ----- arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 5 ----- arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 5 ----- 11 files changed, 21 insertions(+), 40 deletions(-) --- a/arch/arm/boot/dts/bcm2709-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi @@ -3,3 +3,10 @@ &vchiq { compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq"; }; + +&firmware { + firmware_clocks: clocks { + compatible = "raspberrypi,firmware-clocks"; + #clock-cells = <1>; + }; +}; --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -85,11 +85,6 @@ }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: expgpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -96,11 +96,6 @@ }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: expgpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -58,11 +58,6 @@ }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: expgpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -54,11 +54,6 @@ }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: gpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -170,3 +170,10 @@ &genet { compatible = "brcm,bcm2711-genet-v5", "brcm,genet-v5"; }; + +&firmware { + firmware_clocks: clocks { + compatible = "raspberrypi,firmware-clocks"; + #clock-cells = <1>; + }; +}; --- a/arch/arm/boot/dts/bcm2836-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi @@ -4,3 +4,10 @@ &vchiq { compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq"; }; + +&firmware { + firmware_clocks: clocks { + compatible = "raspberrypi,firmware-clocks"; + #clock-cells = <1>; + }; +}; --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts @@ -31,11 +31,6 @@ }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: gpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -37,11 +37,6 @@ }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: gpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -32,11 +32,6 @@ }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: gpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller; --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi @@ -35,11 +35,6 @@ }; &firmware { - firmware_clocks: clocks { - compatible = "raspberrypi,firmware-clocks"; - #clock-cells = <1>; - }; - expgpio: gpio { compatible = "raspberrypi,firmware-gpio"; gpio-controller;