Skip to content

Commit 8a11f81

Browse files
Phil Elwellpopcornmix
Phil Elwell
authored andcommitted
overlays: Update upstream overlay
The recent DT/overlay changes have had a corresponding effect on the upstream overlay, which is a composite of the vc4-kms-v3d and dwc2 overlays. Signed-off-by: Phil Elwell <[email protected]>
1 parent 97242d7 commit 8a11f81

File tree

1 file changed

+3
-38
lines changed

1 file changed

+3
-38
lines changed

arch/arm/boot/dts/overlays/upstream-overlay.dts

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -52,42 +52,36 @@
5252
fragment@7 {
5353
target = <&pixelvalve0>;
5454
__overlay__ {
55-
interrupts = <2 13>;
5655
status = "okay";
5756
};
5857
};
5958
fragment@8 {
6059
target = <&pixelvalve1>;
6160
__overlay__ {
62-
interrupts = <2 14>;
6361
status = "okay";
6462
};
6563
};
6664
fragment@9 {
6765
target = <&pixelvalve2>;
6866
__overlay__ {
69-
interrupts = <2 10>;
7067
status = "okay";
7168
};
7269
};
7370
fragment@10 {
7471
target = <&hvs>;
7572
__overlay__ {
76-
interrupts = <2 1>;
7773
status = "okay";
7874
};
7975
};
8076
fragment@11 {
8177
target = <&hdmi>;
8278
__overlay__ {
83-
interrupts = <2 8>, <2 9>;
8479
status = "okay";
8580
};
8681
};
8782
fragment@12 {
8883
target = <&v3d>;
8984
__overlay__ {
90-
interrupts = <1 10>;
9185
status = "okay";
9286
};
9387
};
@@ -98,63 +92,34 @@
9892
};
9993
};
10094
fragment@14 {
101-
target-path = "/soc/dma";
102-
__overlay__ {
103-
brcm,dma-channel-mask = <0x7f35>;
104-
};
105-
};
106-
fragment@15 {
10795
target = <&clocks>;
10896
__overlay__ {
10997
claim-clocks = <BCM2835_PLLD_DSI0 BCM2835_PLLD_DSI1 BCM2835_PLLH_AUX BCM2835_PLLH_PIX>;
11098
};
11199
};
112-
fragment@16 {
100+
fragment@15 {
113101
target = <&vec>;
114102
__overlay__ {
115103
status = "okay";
116104
};
117105
};
118-
fragment@17 {
106+
fragment@16 {
119107
target = <&txp>;
120108
__overlay__ {
121109
status = "okay";
122110
};
123111
};
124-
fragment@18 {
112+
fragment@17 {
125113
target = <&usb>;
126114
#address-cells = <1>;
127115
#size-cells = <1>;
128116
dwc2_usb: __overlay__ {
129117
compatible = "brcm,bcm2835-usb";
130-
reg = <0x7e980000 0x10000>;
131-
interrupts = <1 9>;
132118
dr_mode = "otg";
133119
g-np-tx-fifo-size = <32>;
134120
g-rx-fifo-size = <256>;
135121
g-tx-fifo-size = <512 512 512 512 512 256 256>;
136122
status = "okay";
137123
};
138124
};
139-
fragment@19 {
140-
target = <&uart1>;
141-
__overlay__ {
142-
interrupt-parent = <&intc>;
143-
interrupts = <0x1 0x1d>;
144-
};
145-
};
146-
fragment@20 {
147-
target = <&spi1>;
148-
__overlay__ {
149-
interrupt-parent = <&intc>;
150-
interrupts = <0x1 0x1d>;
151-
};
152-
};
153-
fragment@21 {
154-
target = <&spi2>;
155-
__overlay__ {
156-
interrupt-parent = <&intc>;
157-
interrupts = <0x1 0x1d>;
158-
};
159-
};
160125
};

0 commit comments

Comments
 (0)