[PATCH v5.1 1/2] ARM: dts: bcm2835-rpi: Move the firmware clocks

Jean-Michel Hautbois
2022-02-23T14:35:00Z

The bcm2835-rpi.dtsi is used by all Raspberry Pi generations. Move the
firmware clocks from bcm2711 specific dtsi to the general dtsi.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
---
arch/arm/boot/dts/bcm2711-rpi.dtsi | 5 -----
arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
index ca266c5d9f9b..93b96cebe949 100644
--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
@@ -19,11 +19,6 @@ aliases {
};

&firmware {
- firmware_clocks: clocks {
- compatible = "raspberrypi,firmware-clocks";
- #clock-cells = <1>;
- };
-
expgpio: gpio {
compatible = "raspberrypi,firmware-gpio";
gpio-controller;
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 87ddcad76083..8f988dd253fc 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -21,6 +21,11 @@ firmware: firmware {
dma-ranges;
};

+ firmware_clocks: clocks {
+ compatible = "raspberrypi,firmware-clocks";
+ #clock-cells = <1>;
+ };
+
power: power {
compatible = "raspberrypi,bcm2835-power";
firmware = <&firmware>;
--
2.32.0