1 From 6f6916802d79d16acd3339f96a2d87da52fa1ad1 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Tue, 6 Feb 2018 13:10:09 +0000
4 Subject: [PATCH 195/454] BCM270X_DT: More cosmetic DT changes
6 Remove unnecessary duplicate labels (but keep spi0).
8 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
10 arch/arm/boot/dts/bcm2708-rpi.dtsi | 5 ----
11 arch/arm/boot/dts/bcm270x.dtsi | 15 ++++------
12 .../dts/overlays/vc4-fkms-v3d-overlay.dts | 2 +-
13 .../boot/dts/overlays/vc4-kms-v3d-overlay.dts | 29 +++++++------------
14 4 files changed, 17 insertions(+), 34 deletions(-)
16 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
17 +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
22 - thermal: thermal@7e212000 {
23 - #thermal-sensor-cells = <0>;
29 compatible = "brcm,bcm2835-audio";
30 --- a/arch/arm/boot/dts/bcm270x.dtsi
31 +++ b/arch/arm/boot/dts/bcm270x.dtsi
36 - cprman: cprman@7e101000 {
40 random: rng@7e104000 {
44 reg = <0x7e600000 0x100>;
46 clocks = <&clocks BCM2835_CLOCK_SMI>;
47 - assigned-clocks = <&cprman BCM2835_CLOCK_SMI>;
48 + assigned-clocks = <&clocks BCM2835_CLOCK_SMI>;
49 assigned-clock-rates = <125000000>;
58 - status = "disabled";
62 compatible = "brcm,bcm2835-axiperf";
63 reg = <0x7e009800 0x100>,
65 interrupt-parent = <&aux>;
70 + status = "disabled";
72 --- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
73 +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
83 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
84 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
104 target = <&pixelvalve0>;
106 interrupts = <2 13>; /* pwa0 */
113 target = <&pixelvalve1>;
115 interrupts = <2 14>; /* pwa1 */
122 target = <&pixelvalve2>;
124 interrupts = <2 10>; /* pixelvalve */
142 interrupts = <2 8>, <2 9>;
152 @@ -114,14 +107,14 @@
167 target-path = "/soc/dma";
169 brcm,dma-channel-mask = <0x7f35>;