Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"Only two patches came in over the last two weeks: Uniphier USB support
needs additional clocks enabled (on both 32-bit and 64-bit ARM), and a
Marvell MVEBU stability issue has been fixed"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: dts: mvebu: pl310-cache disable double-linefill
arm64: dts: uniphier: add STDMAC clock to EHCI nodes
ARM: dts: uniphier: add STDMAC clock to EHCI nodes
+28
-17
+2
-2
arch/arm/boot/dts/armada-375.dtsi
+2
-2
arch/arm/boot/dts/armada-375.dtsi
···
178
178
reg = <0x8000 0x1000>;
179
179
cache-unified;
180
180
cache-level = <2>;
181
-
arm,double-linefill-incr = <1>;
181
+
arm,double-linefill-incr = <0>;
182
182
arm,double-linefill-wrap = <0>;
183
-
arm,double-linefill = <1>;
183
+
arm,double-linefill = <0>;
184
184
prefetch-data = <1>;
185
185
};
186
186
+2
-2
arch/arm/boot/dts/armada-38x.dtsi
+2
-2
arch/arm/boot/dts/armada-38x.dtsi
···
143
143
reg = <0x8000 0x1000>;
144
144
cache-unified;
145
145
cache-level = <2>;
146
-
arm,double-linefill-incr = <1>;
146
+
arm,double-linefill-incr = <0>;
147
147
arm,double-linefill-wrap = <0>;
148
-
arm,double-linefill = <1>;
148
+
arm,double-linefill = <0>;
149
149
prefetch-data = <1>;
150
150
};
151
151
+2
-2
arch/arm/boot/dts/armada-39x.dtsi
+2
-2
arch/arm/boot/dts/armada-39x.dtsi
···
111
111
reg = <0x8000 0x1000>;
112
112
cache-unified;
113
113
cache-level = <2>;
114
-
arm,double-linefill-incr = <1>;
114
+
arm,double-linefill-incr = <0>;
115
115
arm,double-linefill-wrap = <0>;
116
-
arm,double-linefill = <1>;
116
+
arm,double-linefill = <0>;
117
117
prefetch-data = <1>;
118
118
};
119
119
+6
-3
arch/arm/boot/dts/uniphier-ld4.dtsi
+6
-3
arch/arm/boot/dts/uniphier-ld4.dtsi
···
209
209
interrupts = <0 80 4>;
210
210
pinctrl-names = "default";
211
211
pinctrl-0 = <&pinctrl_usb0>;
212
-
clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
212
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
213
+
<&mio_clk 12>;
213
214
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
214
215
<&mio_rst 12>;
215
216
};
···
222
221
interrupts = <0 81 4>;
223
222
pinctrl-names = "default";
224
223
pinctrl-0 = <&pinctrl_usb1>;
225
-
clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
224
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
225
+
<&mio_clk 13>;
226
226
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
227
227
<&mio_rst 13>;
228
228
};
···
235
233
interrupts = <0 82 4>;
236
234
pinctrl-names = "default";
237
235
pinctrl-0 = <&pinctrl_usb2>;
238
-
clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
236
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
237
+
<&mio_clk 14>;
239
238
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
240
239
<&mio_rst 14>;
241
240
};
+4
-2
arch/arm/boot/dts/uniphier-pro4.dtsi
+4
-2
arch/arm/boot/dts/uniphier-pro4.dtsi
···
241
241
interrupts = <0 80 4>;
242
242
pinctrl-names = "default";
243
243
pinctrl-0 = <&pinctrl_usb2>;
244
-
clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
244
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
245
+
<&mio_clk 12>;
245
246
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
246
247
<&mio_rst 12>;
247
248
};
···
254
253
interrupts = <0 81 4>;
255
254
pinctrl-names = "default";
256
255
pinctrl-0 = <&pinctrl_usb3>;
257
-
clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
256
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
257
+
<&mio_clk 13>;
258
258
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
259
259
<&mio_rst 13>;
260
260
};
+6
-3
arch/arm/boot/dts/uniphier-sld8.dtsi
+6
-3
arch/arm/boot/dts/uniphier-sld8.dtsi
···
209
209
interrupts = <0 80 4>;
210
210
pinctrl-names = "default";
211
211
pinctrl-0 = <&pinctrl_usb0>;
212
-
clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
212
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
213
+
<&mio_clk 12>;
213
214
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
214
215
<&mio_rst 12>;
215
216
};
···
222
221
interrupts = <0 81 4>;
223
222
pinctrl-names = "default";
224
223
pinctrl-0 = <&pinctrl_usb1>;
225
-
clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
224
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
225
+
<&mio_clk 13>;
226
226
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
227
227
<&mio_rst 13>;
228
228
};
···
235
233
interrupts = <0 82 4>;
236
234
pinctrl-names = "default";
237
235
pinctrl-0 = <&pinctrl_usb2>;
238
-
clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
236
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
237
+
<&mio_clk 14>;
239
238
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
240
239
<&mio_rst 14>;
241
240
};
+6
-3
arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+6
-3
arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
···
299
299
interrupts = <0 243 4>;
300
300
pinctrl-names = "default";
301
301
pinctrl-0 = <&pinctrl_usb0>;
302
-
clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
302
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
303
+
<&mio_clk 12>;
303
304
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
304
305
<&mio_rst 12>;
305
306
};
···
312
311
interrupts = <0 244 4>;
313
312
pinctrl-names = "default";
314
313
pinctrl-0 = <&pinctrl_usb1>;
315
-
clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
314
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
315
+
<&mio_clk 13>;
316
316
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
317
317
<&mio_rst 13>;
318
318
};
···
325
323
interrupts = <0 245 4>;
326
324
pinctrl-names = "default";
327
325
pinctrl-0 = <&pinctrl_usb2>;
328
-
clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
326
+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
327
+
<&mio_clk 14>;
329
328
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
330
329
<&mio_rst 14>;
331
330
};