Skip to content

Commit ff68b68

Browse files
pelwellpopcornmix
authored andcommitted
SQUASH: dts: Further simplify firmware clocks
All Pi platforms will use the firmware clocks driver, so declare it in the most common place - bcm2835-rpi.dtsi. Signed-off-by: Phil Elwell <[email protected]>
1 parent a6010b6 commit ff68b68

File tree

4 files changed

+5
-21
lines changed

4 files changed

+5
-21
lines changed

arch/arm/boot/dts/bcm2709-rpi.dtsi

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,3 @@
33
&vchiq {
44
compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
55
};
6-
7-
&firmware {
8-
firmware_clocks: clocks {
9-
compatible = "raspberrypi,firmware-clocks";
10-
#clock-cells = <1>;
11-
};
12-
};

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,3 @@
309309
&hvs {
310310
clocks = <&firmware_clocks 4>;
311311
};
312-
313-
&firmware {
314-
firmware_clocks: clocks {
315-
compatible = "raspberrypi,firmware-clocks";
316-
#clock-cells = <1>;
317-
};
318-
};

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
1717
mboxes = <&mailbox>;
1818
dma-ranges;
19+
20+
firmware_clocks: clocks {
21+
compatible = "raspberrypi,firmware-clocks";
22+
#clock-cells = <1>;
23+
};
1924
};
2025

2126
power: power {

arch/arm/boot/dts/bcm2836-rpi.dtsi

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,3 @@
44
&vchiq {
55
compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
66
};
7-
8-
&firmware {
9-
firmware_clocks: clocks {
10-
compatible = "raspberrypi,firmware-clocks";
11-
#clock-cells = <1>;
12-
};
13-
};

0 commit comments

Comments
 (0)