Skip to content

Commit f702475

Browse files
pinchartlffainelli
authored andcommitted
ARM: dts: bcm2835-rpi: Move duplicate firmware-clocks to bcm2835-rpi.dtsi
The Raspberry Pi firmware handles clocks on all BCM2835-derived SoCs. It is currently defined identically in both bcm2711-rpi.dtsi and bcm2835-rpi-common.dtsi. Move the definitions to the common bcm2835-rpi.dtsi file. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Link: https://lore.kernel.org/r/20240402000424.4650-6-laurent.pinchart@ideasonboard.com Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
1 parent e54c32f commit f702475

3 files changed

Lines changed: 5 additions & 12 deletions

File tree

arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
};
2121

2222
&firmware {
23-
firmware_clocks: clocks {
24-
compatible = "raspberrypi,firmware-clocks";
25-
#clock-cells = <1>;
26-
};
27-
2823
expgpio: gpio {
2924
compatible = "raspberrypi,firmware-gpio";
3025
gpio-controller;

arch/arm/boot/dts/broadcom/bcm2835-rpi-common.dtsi

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77

88
#include <dt-bindings/power/raspberrypi-power.h>
99

10-
&firmware {
11-
firmware_clocks: clocks {
12-
compatible = "raspberrypi,firmware-clocks";
13-
#clock-cells = <1>;
14-
};
15-
};
16-
1710
&hdmi {
1811
clocks = <&firmware_clocks 9>,
1912
<&firmware_clocks 13>;

arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
firmware: firmware {
66
compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
77
mboxes = <&mailbox>;
8+
9+
firmware_clocks: clocks {
10+
compatible = "raspberrypi,firmware-clocks";
11+
#clock-cells = <1>;
12+
};
813
};
914

1015
power: power {

0 commit comments

Comments
 (0)