Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm-soc/for-6.17/devicetree' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM-based SoCs Device Tree updates
for 6.17, please pull the following:
- Linus makes a number of updates to the BCMBCA SoCs Device Tree files
to correct UART interrupt numbers, add interrupts to the RNG block,
and leverage the fact that all SoCs have the same peripherals at the
same aperture
- Uwe corrects the Merakia MX6X DTS file to have #pwm-cells = 3 as per
the binding
* tag 'arm-soc/for-6.17/devicetree' of https://github.com/Broadcom/stblinux:
ARM: dts: bcm958625-meraki-mx6x: Use #pwm-cells = <3>
ARM: dts: bcm63178: Add BCMBCA peripherals
ARM: dts: bcm63148: Add BCMBCA peripherals
ARM: dts: bcm63138: Add BCMBCA peripherals
ARM: dts: bcm6878: Add BCMBCA peripherals
ARM: dts: bcm6855: Add BCMBCA peripherals
ARM: dts: bcm6846: Add interrupt to RNG
dt-bindings: rng: r200: Add interrupt property
ARM: dts: bcm6878: Correct UART0 IRQ number
Link: https://lore.kernel.org/r/20250630190216.1518354-2-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+510
-6
+6
Documentation/devicetree/bindings/rng/brcm,iproc-rng200.yaml
+6
Documentation/devicetree/bindings/rng/brcm,iproc-rng200.yaml
···
20
20
reg:
21
21
maxItems: 1
22
22
23
+
interrupts:
24
+
maxItems: 1
25
+
23
26
additionalProperties: false
24
27
25
28
examples:
26
29
- |
30
+
#include <dt-bindings/interrupt-controller/arm-gic.h>
31
+
27
32
rng@18032000 {
28
33
compatible = "brcm,iproc-rng200";
29
34
reg = <0x18032000 0x28>;
35
+
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
30
36
};
+78
-1
arch/arm/boot/dts/broadcom/bcm63138.dtsi
+78
-1
arch/arm/boot/dts/broadcom/bcm63138.dtsi
···
184
184
compatible = "simple-bus";
185
185
#address-cells = <1>;
186
186
#size-cells = <1>;
187
-
ranges = <0 0xfffe8000 0x8100>;
187
+
ranges = <0 0xfffe8000 0x10000>;
188
188
189
189
timer: timer@80 {
190
190
compatible = "brcm,bcm6328-timer", "syscon";
191
191
reg = <0x80 0x3c>;
192
+
};
193
+
194
+
/* GPIOs 0 .. 31 */
195
+
gpio0: gpio@100 {
196
+
compatible = "brcm,bcm6345-gpio";
197
+
reg = <0x100 0x04>, <0x114 0x04>;
198
+
reg-names = "dirout", "dat";
199
+
gpio-controller;
200
+
#gpio-cells = <2>;
201
+
status = "disabled";
202
+
};
203
+
204
+
/* GPIOs 32 .. 63 */
205
+
gpio1: gpio@104 {
206
+
compatible = "brcm,bcm6345-gpio";
207
+
reg = <0x104 0x04>, <0x118 0x04>;
208
+
reg-names = "dirout", "dat";
209
+
gpio-controller;
210
+
#gpio-cells = <2>;
211
+
status = "disabled";
212
+
};
213
+
214
+
/* GPIOs 64 .. 95 */
215
+
gpio2: gpio@108 {
216
+
compatible = "brcm,bcm6345-gpio";
217
+
reg = <0x108 0x04>, <0x11c 0x04>;
218
+
reg-names = "dirout", "dat";
219
+
gpio-controller;
220
+
#gpio-cells = <2>;
221
+
status = "disabled";
222
+
};
223
+
224
+
/* GPIOs 96 .. 127 */
225
+
gpio3: gpio@10c {
226
+
compatible = "brcm,bcm6345-gpio";
227
+
reg = <0x10c 0x04>, <0x120 0x04>;
228
+
reg-names = "dirout", "dat";
229
+
gpio-controller;
230
+
#gpio-cells = <2>;
231
+
status = "disabled";
232
+
};
233
+
234
+
/* GPIOs 128 .. 159 */
235
+
gpio4: gpio@110 {
236
+
compatible = "brcm,bcm6345-gpio";
237
+
reg = <0x110 0x04>, <0x124 0x04>;
238
+
reg-names = "dirout", "dat";
239
+
gpio-controller;
240
+
#gpio-cells = <2>;
241
+
status = "disabled";
242
+
};
243
+
244
+
rng@300 {
245
+
compatible = "brcm,iproc-rng200";
246
+
reg = <0x300 0x28>;
247
+
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
192
248
};
193
249
194
250
serial0: serial@600 {
···
262
206
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
263
207
clocks = <&periph_clk>;
264
208
clock-names = "periph";
209
+
status = "disabled";
210
+
};
211
+
212
+
leds: led-controller@700 {
213
+
#address-cells = <1>;
214
+
#size-cells = <0>;
215
+
compatible = "brcm,bcm63138-leds";
216
+
reg = <0x700 0xdc>;
265
217
status = "disabled";
266
218
};
267
219
···
310
246
bootlut: bootlut@8000 {
311
247
compatible = "brcm,bcm63138-bootlut";
312
248
reg = <0x8000 0x50>;
249
+
};
250
+
251
+
pl081_dma: dma-controller@d000 {
252
+
compatible = "arm,pl081", "arm,primecell";
253
+
// The magic B105F00D info is missing
254
+
arm,primecell-periphid = <0x00041081>;
255
+
reg = <0xd000 0x1000>;
256
+
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
257
+
memcpy-burst-size = <256>;
258
+
memcpy-bus-width = <32>;
259
+
clocks = <&periph_clk>;
260
+
clock-names = "apb_pclk";
261
+
#dma-cells = <2>;
313
262
};
314
263
315
264
reboot {
+64
arch/arm/boot/dts/broadcom/bcm63148.dtsi
+64
arch/arm/boot/dts/broadcom/bcm63148.dtsi
···
99
99
#size-cells = <1>;
100
100
ranges = <0 0xfffe8000 0x8000>;
101
101
102
+
/* GPIOs 0 .. 31 */
103
+
gpio0: gpio@100 {
104
+
compatible = "brcm,bcm6345-gpio";
105
+
reg = <0x100 0x04>, <0x114 0x04>;
106
+
reg-names = "dirout", "dat";
107
+
gpio-controller;
108
+
#gpio-cells = <2>;
109
+
status = "disabled";
110
+
};
111
+
112
+
/* GPIOs 32 .. 63 */
113
+
gpio1: gpio@104 {
114
+
compatible = "brcm,bcm6345-gpio";
115
+
reg = <0x104 0x04>, <0x118 0x04>;
116
+
reg-names = "dirout", "dat";
117
+
gpio-controller;
118
+
#gpio-cells = <2>;
119
+
status = "disabled";
120
+
};
121
+
122
+
/* GPIOs 64 .. 95 */
123
+
gpio2: gpio@108 {
124
+
compatible = "brcm,bcm6345-gpio";
125
+
reg = <0x108 0x04>, <0x11c 0x04>;
126
+
reg-names = "dirout", "dat";
127
+
gpio-controller;
128
+
#gpio-cells = <2>;
129
+
status = "disabled";
130
+
};
131
+
132
+
/* GPIOs 96 .. 127 */
133
+
gpio3: gpio@10c {
134
+
compatible = "brcm,bcm6345-gpio";
135
+
reg = <0x10c 0x04>, <0x120 0x04>;
136
+
reg-names = "dirout", "dat";
137
+
gpio-controller;
138
+
#gpio-cells = <2>;
139
+
status = "disabled";
140
+
};
141
+
142
+
/* GPIOs 128 .. 159 */
143
+
gpio4: gpio@110 {
144
+
compatible = "brcm,bcm6345-gpio";
145
+
reg = <0x110 0x04>, <0x124 0x04>;
146
+
reg-names = "dirout", "dat";
147
+
gpio-controller;
148
+
#gpio-cells = <2>;
149
+
status = "disabled";
150
+
};
151
+
152
+
rng@300 {
153
+
compatible = "brcm,iproc-rng200";
154
+
reg = <0x300 0x28>;
155
+
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
156
+
};
157
+
102
158
uart0: serial@600 {
103
159
compatible = "brcm,bcm6345-uart";
104
160
reg = <0x600 0x20>;
105
161
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
106
162
clocks = <&periph_clk>;
107
163
clock-names = "refclk";
164
+
status = "disabled";
165
+
};
166
+
167
+
leds: led-controller@700 {
168
+
#address-cells = <1>;
169
+
#size-cells = <0>;
170
+
compatible = "brcm,bcm63138-leds";
171
+
reg = <0x700 0xdc>;
108
172
status = "disabled";
109
173
};
110
174
+112
arch/arm/boot/dts/broadcom/bcm63178.dtsi
+112
arch/arm/boot/dts/broadcom/bcm63178.dtsi
···
117
117
#size-cells = <1>;
118
118
ranges = <0 0xff800000 0x800000>;
119
119
120
+
watchdog@480 {
121
+
compatible = "brcm,bcm6345-wdt";
122
+
reg = <0x480 0x10>;
123
+
};
124
+
125
+
/* GPIOs 0 .. 31 */
126
+
gpio0: gpio@500 {
127
+
compatible = "brcm,bcm6345-gpio";
128
+
reg = <0x500 0x04>, <0x520 0x04>;
129
+
reg-names = "dirout", "dat";
130
+
gpio-controller;
131
+
#gpio-cells = <2>;
132
+
status = "disabled";
133
+
};
134
+
135
+
/* GPIOs 32 .. 63 */
136
+
gpio1: gpio@504 {
137
+
compatible = "brcm,bcm6345-gpio";
138
+
reg = <0x504 0x04>, <0x524 0x04>;
139
+
reg-names = "dirout", "dat";
140
+
gpio-controller;
141
+
#gpio-cells = <2>;
142
+
status = "disabled";
143
+
};
144
+
145
+
/* GPIOs 64 .. 95 */
146
+
gpio2: gpio@508 {
147
+
compatible = "brcm,bcm6345-gpio";
148
+
reg = <0x508 0x04>, <0x528 0x04>;
149
+
reg-names = "dirout", "dat";
150
+
gpio-controller;
151
+
#gpio-cells = <2>;
152
+
status = "disabled";
153
+
};
154
+
155
+
/* GPIOs 96 .. 127 */
156
+
gpio3: gpio@50c {
157
+
compatible = "brcm,bcm6345-gpio";
158
+
reg = <0x50c 0x04>, <0x52c 0x04>;
159
+
reg-names = "dirout", "dat";
160
+
gpio-controller;
161
+
#gpio-cells = <2>;
162
+
status = "disabled";
163
+
};
164
+
165
+
/* GPIOs 128 .. 159 */
166
+
gpio4: gpio@510 {
167
+
compatible = "brcm,bcm6345-gpio";
168
+
reg = <0x510 0x04>, <0x530 0x04>;
169
+
reg-names = "dirout", "dat";
170
+
gpio-controller;
171
+
#gpio-cells = <2>;
172
+
status = "disabled";
173
+
};
174
+
175
+
/* GPIOs 160 .. 191 */
176
+
gpio5: gpio@514 {
177
+
compatible = "brcm,bcm6345-gpio";
178
+
reg = <0x514 0x04>, <0x534 0x04>;
179
+
reg-names = "dirout", "dat";
180
+
gpio-controller;
181
+
#gpio-cells = <2>;
182
+
status = "disabled";
183
+
};
184
+
185
+
/* GPIOs 192 .. 223 */
186
+
gpio6: gpio@518 {
187
+
compatible = "brcm,bcm6345-gpio";
188
+
reg = <0x518 0x04>, <0x538 0x04>;
189
+
reg-names = "dirout", "dat";
190
+
gpio-controller;
191
+
#gpio-cells = <2>;
192
+
status = "disabled";
193
+
};
194
+
195
+
/* GPIOs 224 .. 255 */
196
+
gpio7: gpio@51c {
197
+
compatible = "brcm,bcm6345-gpio";
198
+
reg = <0x51c 0x04>, <0x53c 0x04>;
199
+
reg-names = "dirout", "dat";
200
+
gpio-controller;
201
+
#gpio-cells = <2>;
202
+
status = "disabled";
203
+
};
204
+
205
+
rng@b80 {
206
+
compatible = "brcm,iproc-rng200";
207
+
reg = <0xb80 0x28>;
208
+
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
209
+
};
210
+
120
211
hsspi: spi@1000 {
121
212
#address-cells = <1>;
122
213
#size-cells = <0>;
···
232
141
compatible = "brcm,nandcs";
233
142
reg = <0>;
234
143
};
144
+
};
145
+
146
+
leds: led-controller@3000 {
147
+
#address-cells = <1>;
148
+
#size-cells = <0>;
149
+
compatible = "brcm,bcm63138-leds";
150
+
reg = <0x3000 0xdc>;
151
+
status = "disabled";
152
+
};
153
+
154
+
pl081_dma: dma-controller@11000 {
155
+
compatible = "arm,pl081", "arm,primecell";
156
+
// The magic B105F00D info is missing
157
+
arm,primecell-periphid = <0x00041081>;
158
+
reg = <0x11000 0x1000>;
159
+
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
160
+
memcpy-burst-size = <256>;
161
+
memcpy-bus-width = <32>;
162
+
clocks = <&periph_clk>;
163
+
clock-names = "apb_pclk";
164
+
#dma-cells = <2>;
235
165
};
236
166
237
167
uart0: serial@12000 {
+1
arch/arm/boot/dts/broadcom/bcm6846.dtsi
+1
arch/arm/boot/dts/broadcom/bcm6846.dtsi
+127
arch/arm/boot/dts/broadcom/bcm6855.dtsi
+127
arch/arm/boot/dts/broadcom/bcm6855.dtsi
···
116
116
#size-cells = <1>;
117
117
ranges = <0 0xff800000 0x800000>;
118
118
119
+
watchdog@480 {
120
+
compatible = "brcm,bcm6345-wdt";
121
+
reg = <0x480 0x10>;
122
+
};
123
+
124
+
watchdog@4c0 {
125
+
compatible = "brcm,bcm6345-wdt";
126
+
reg = <0x4c0 0x10>;
127
+
status = "disabled";
128
+
};
129
+
130
+
/* GPIOs 0 .. 31 */
131
+
gpio0: gpio@500 {
132
+
compatible = "brcm,bcm6345-gpio";
133
+
reg = <0x500 0x04>, <0x520 0x04>;
134
+
reg-names = "dirout", "dat";
135
+
gpio-controller;
136
+
#gpio-cells = <2>;
137
+
status = "disabled";
138
+
};
139
+
140
+
/* GPIOs 32 .. 63 */
141
+
gpio1: gpio@504 {
142
+
compatible = "brcm,bcm6345-gpio";
143
+
reg = <0x504 0x04>, <0x524 0x04>;
144
+
reg-names = "dirout", "dat";
145
+
gpio-controller;
146
+
#gpio-cells = <2>;
147
+
status = "disabled";
148
+
};
149
+
150
+
/* GPIOs 64 .. 95 */
151
+
gpio2: gpio@508 {
152
+
compatible = "brcm,bcm6345-gpio";
153
+
reg = <0x508 0x04>, <0x528 0x04>;
154
+
reg-names = "dirout", "dat";
155
+
gpio-controller;
156
+
#gpio-cells = <2>;
157
+
status = "disabled";
158
+
};
159
+
160
+
/* GPIOs 96 .. 127 */
161
+
gpio3: gpio@50c {
162
+
compatible = "brcm,bcm6345-gpio";
163
+
reg = <0x50c 0x04>, <0x52c 0x04>;
164
+
reg-names = "dirout", "dat";
165
+
gpio-controller;
166
+
#gpio-cells = <2>;
167
+
status = "disabled";
168
+
};
169
+
170
+
/* GPIOs 128 .. 159 */
171
+
gpio4: gpio@510 {
172
+
compatible = "brcm,bcm6345-gpio";
173
+
reg = <0x510 0x04>, <0x530 0x04>;
174
+
reg-names = "dirout", "dat";
175
+
gpio-controller;
176
+
#gpio-cells = <2>;
177
+
status = "disabled";
178
+
};
179
+
180
+
/* GPIOs 160 .. 191 */
181
+
gpio5: gpio@514 {
182
+
compatible = "brcm,bcm6345-gpio";
183
+
reg = <0x514 0x04>, <0x534 0x04>;
184
+
reg-names = "dirout", "dat";
185
+
gpio-controller;
186
+
#gpio-cells = <2>;
187
+
status = "disabled";
188
+
};
189
+
190
+
/* GPIOs 192 .. 223 */
191
+
gpio6: gpio@518 {
192
+
compatible = "brcm,bcm6345-gpio";
193
+
reg = <0x518 0x04>, <0x538 0x04>;
194
+
reg-names = "dirout", "dat";
195
+
gpio-controller;
196
+
#gpio-cells = <2>;
197
+
status = "disabled";
198
+
};
199
+
200
+
/* GPIOs 224 .. 255 */
201
+
gpio7: gpio@51c {
202
+
compatible = "brcm,bcm6345-gpio";
203
+
reg = <0x51c 0x04>, <0x53c 0x04>;
204
+
reg-names = "dirout", "dat";
205
+
gpio-controller;
206
+
#gpio-cells = <2>;
207
+
status = "disabled";
208
+
};
209
+
210
+
rng@b80 {
211
+
compatible = "brcm,iproc-rng200";
212
+
reg = <0xb80 0x28>;
213
+
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
214
+
};
215
+
119
216
hsspi: spi@1000 {
120
217
#address-cells = <1>;
121
218
#size-cells = <0>;
···
240
143
};
241
144
};
242
145
146
+
leds: led-controller@3000 {
147
+
#address-cells = <1>;
148
+
#size-cells = <0>;
149
+
compatible = "brcm,bcm63138-leds";
150
+
reg = <0x3000 0xdc>;
151
+
status = "disabled";
152
+
};
153
+
154
+
pl081_dma: dma-controller@11000 {
155
+
compatible = "arm,pl081", "arm,primecell";
156
+
// The magic B105F00D info is missing
157
+
arm,primecell-periphid = <0x00041081>;
158
+
reg = <0x11000 0x1000>;
159
+
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
160
+
memcpy-burst-size = <256>;
161
+
memcpy-bus-width = <32>;
162
+
clocks = <&periph_clk>;
163
+
clock-names = "apb_pclk";
164
+
#dma-cells = <2>;
165
+
};
166
+
243
167
uart0: serial@12000 {
244
168
compatible = "arm,pl011", "arm,primecell";
245
169
reg = <0x12000 0x1000>;
246
170
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
171
+
clocks = <&uart_clk>, <&uart_clk>;
172
+
clock-names = "uartclk", "apb_pclk";
173
+
status = "disabled";
174
+
};
175
+
176
+
uart1: serial@13000 {
177
+
compatible = "arm,pl011", "arm,primecell";
178
+
reg = <0x13000 0x1000>;
179
+
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
247
180
clocks = <&uart_clk>, <&uart_clk>;
248
181
clock-names = "uartclk", "apb_pclk";
249
182
status = "disabled";
+119
-1
arch/arm/boot/dts/broadcom/bcm6878.dtsi
+119
-1
arch/arm/boot/dts/broadcom/bcm6878.dtsi
···
108
108
#size-cells = <1>;
109
109
ranges = <0 0xff800000 0x800000>;
110
110
111
+
watchdog@480 {
112
+
compatible = "brcm,bcm6345-wdt";
113
+
reg = <0x480 0x10>;
114
+
};
115
+
116
+
watchdog@4c0 {
117
+
compatible = "brcm,bcm6345-wdt";
118
+
reg = <0x4c0 0x10>;
119
+
status = "disabled";
120
+
};
121
+
122
+
/* GPIOs 0 .. 31 */
123
+
gpio0: gpio@500 {
124
+
compatible = "brcm,bcm6345-gpio";
125
+
reg = <0x500 0x04>, <0x520 0x04>;
126
+
reg-names = "dirout", "dat";
127
+
gpio-controller;
128
+
#gpio-cells = <2>;
129
+
status = "disabled";
130
+
};
131
+
132
+
/* GPIOs 32 .. 63 */
133
+
gpio1: gpio@504 {
134
+
compatible = "brcm,bcm6345-gpio";
135
+
reg = <0x504 0x04>, <0x524 0x04>;
136
+
reg-names = "dirout", "dat";
137
+
gpio-controller;
138
+
#gpio-cells = <2>;
139
+
status = "disabled";
140
+
};
141
+
142
+
/* GPIOs 64 .. 95 */
143
+
gpio2: gpio@508 {
144
+
compatible = "brcm,bcm6345-gpio";
145
+
reg = <0x508 0x04>, <0x528 0x04>;
146
+
reg-names = "dirout", "dat";
147
+
gpio-controller;
148
+
#gpio-cells = <2>;
149
+
status = "disabled";
150
+
};
151
+
152
+
/* GPIOs 96 .. 127 */
153
+
gpio3: gpio@50c {
154
+
compatible = "brcm,bcm6345-gpio";
155
+
reg = <0x50c 0x04>, <0x52c 0x04>;
156
+
reg-names = "dirout", "dat";
157
+
gpio-controller;
158
+
#gpio-cells = <2>;
159
+
status = "disabled";
160
+
};
161
+
162
+
/* GPIOs 128 .. 159 */
163
+
gpio4: gpio@510 {
164
+
compatible = "brcm,bcm6345-gpio";
165
+
reg = <0x510 0x04>, <0x530 0x04>;
166
+
reg-names = "dirout", "dat";
167
+
gpio-controller;
168
+
#gpio-cells = <2>;
169
+
status = "disabled";
170
+
};
171
+
172
+
/* GPIOs 160 .. 191 */
173
+
gpio5: gpio@514 {
174
+
compatible = "brcm,bcm6345-gpio";
175
+
reg = <0x514 0x04>, <0x534 0x04>;
176
+
reg-names = "dirout", "dat";
177
+
gpio-controller;
178
+
#gpio-cells = <2>;
179
+
status = "disabled";
180
+
};
181
+
182
+
/* GPIOs 192 .. 223 */
183
+
gpio6: gpio@518 {
184
+
compatible = "brcm,bcm6345-gpio";
185
+
reg = <0x518 0x04>, <0x538 0x04>;
186
+
reg-names = "dirout", "dat";
187
+
gpio-controller;
188
+
#gpio-cells = <2>;
189
+
status = "disabled";
190
+
};
191
+
192
+
/* GPIOs 224 .. 255 */
193
+
gpio7: gpio@51c {
194
+
compatible = "brcm,bcm6345-gpio";
195
+
reg = <0x51c 0x04>, <0x53c 0x04>;
196
+
reg-names = "dirout", "dat";
197
+
gpio-controller;
198
+
#gpio-cells = <2>;
199
+
status = "disabled";
200
+
};
201
+
202
+
rng@b80 {
203
+
compatible = "brcm,iproc-rng200";
204
+
reg = <0xb80 0x28>;
205
+
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
206
+
};
207
+
208
+
leds: led-controller@700 {
209
+
#address-cells = <1>;
210
+
#size-cells = <0>;
211
+
compatible = "brcm,bcm63138-leds";
212
+
reg = <0x700 0xdc>;
213
+
status = "disabled";
214
+
};
215
+
111
216
hsspi: spi@1000 {
112
217
#address-cells = <1>;
113
218
#size-cells = <0>;
···
239
134
};
240
135
};
241
136
137
+
pl081_dma: dma-controller@11000 {
138
+
compatible = "arm,pl081", "arm,primecell";
139
+
// The magic B105F00D info is missing
140
+
arm,primecell-periphid = <0x00041081>;
141
+
reg = <0x11000 0x1000>;
142
+
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
143
+
memcpy-burst-size = <256>;
144
+
memcpy-bus-width = <32>;
145
+
clocks = <&periph_clk>;
146
+
clock-names = "apb_pclk";
147
+
#dma-cells = <2>;
148
+
};
149
+
242
150
uart0: serial@12000 {
243
151
compatible = "arm,pl011", "arm,primecell";
244
152
reg = <0x12000 0x1000>;
245
-
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
153
+
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
246
154
clocks = <&uart_clk>, <&uart_clk>;
247
155
clock-names = "uartclk", "apb_pclk";
248
156
status = "disabled";
+3
-4
arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
+3
-4
arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
···
17
17
led-1 {
18
18
function = LED_FUNCTION_INDICATOR;
19
19
color = <LED_COLOR_ID_RED>;
20
-
pwms = <&pwm 1 50000>;
20
+
pwms = <&pwm 1 50000 0>;
21
21
max-brightness = <255>;
22
22
};
23
23
24
24
led-2 {
25
25
function = LED_FUNCTION_POWER;
26
26
color = <LED_COLOR_ID_GREEN>;
27
-
pwms = <&pwm 2 50000>;
27
+
pwms = <&pwm 2 50000 0>;
28
28
max-brightness = <255>;
29
29
};
30
30
31
31
led-3 {
32
32
function = LED_FUNCTION_INDICATOR;
33
33
color = <LED_COLOR_ID_BLUE>;
34
-
pwms = <&pwm 3 50000>;
34
+
pwms = <&pwm 3 50000 0>;
35
35
max-brightness = <255>;
36
36
};
37
37
};
···
132
132
133
133
&pwm {
134
134
status = "okay";
135
-
#pwm-cells = <2>;
136
135
};
137
136
138
137
&uart0 {