Skip to content

Commit b1878b8

Browse files
committed
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
2 parents dab30d5 + da984d7 commit b1878b8

7 files changed

Lines changed: 28 additions & 17 deletions

File tree

arch/arm/boot/dts/armada-375.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@
178178
reg = <0x8000 0x1000>;
179179
cache-unified;
180180
cache-level = <2>;
181-
arm,double-linefill-incr = <1>;
181+
arm,double-linefill-incr = <0>;
182182
arm,double-linefill-wrap = <0>;
183-
arm,double-linefill = <1>;
183+
arm,double-linefill = <0>;
184184
prefetch-data = <1>;
185185
};
186186

arch/arm/boot/dts/armada-38x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@
143143
reg = <0x8000 0x1000>;
144144
cache-unified;
145145
cache-level = <2>;
146-
arm,double-linefill-incr = <1>;
146+
arm,double-linefill-incr = <0>;
147147
arm,double-linefill-wrap = <0>;
148-
arm,double-linefill = <1>;
148+
arm,double-linefill = <0>;
149149
prefetch-data = <1>;
150150
};
151151

arch/arm/boot/dts/armada-39x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@
111111
reg = <0x8000 0x1000>;
112112
cache-unified;
113113
cache-level = <2>;
114-
arm,double-linefill-incr = <1>;
114+
arm,double-linefill-incr = <0>;
115115
arm,double-linefill-wrap = <0>;
116-
arm,double-linefill = <1>;
116+
arm,double-linefill = <0>;
117117
prefetch-data = <1>;
118118
};
119119

arch/arm/boot/dts/uniphier-ld4.dtsi

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@
209209
interrupts = <0 80 4>;
210210
pinctrl-names = "default";
211211
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>;
213214
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
214215
<&mio_rst 12>;
215216
};
@@ -221,7 +222,8 @@
221222
interrupts = <0 81 4>;
222223
pinctrl-names = "default";
223224
pinctrl-0 = <&pinctrl_usb1>;
224-
clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
225+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
226+
<&mio_clk 13>;
225227
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
226228
<&mio_rst 13>;
227229
};
@@ -233,7 +235,8 @@
233235
interrupts = <0 82 4>;
234236
pinctrl-names = "default";
235237
pinctrl-0 = <&pinctrl_usb2>;
236-
clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
238+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
239+
<&mio_clk 14>;
237240
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
238241
<&mio_rst 14>;
239242
};

arch/arm/boot/dts/uniphier-pro4.dtsi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,8 @@
241241
interrupts = <0 80 4>;
242242
pinctrl-names = "default";
243243
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>;
245246
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
246247
<&mio_rst 12>;
247248
};
@@ -253,7 +254,8 @@
253254
interrupts = <0 81 4>;
254255
pinctrl-names = "default";
255256
pinctrl-0 = <&pinctrl_usb3>;
256-
clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
257+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
258+
<&mio_clk 13>;
257259
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
258260
<&mio_rst 13>;
259261
};

arch/arm/boot/dts/uniphier-sld8.dtsi

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@
209209
interrupts = <0 80 4>;
210210
pinctrl-names = "default";
211211
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>;
213214
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
214215
<&mio_rst 12>;
215216
};
@@ -221,7 +222,8 @@
221222
interrupts = <0 81 4>;
222223
pinctrl-names = "default";
223224
pinctrl-0 = <&pinctrl_usb1>;
224-
clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
225+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
226+
<&mio_clk 13>;
225227
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
226228
<&mio_rst 13>;
227229
};
@@ -233,7 +235,8 @@
233235
interrupts = <0 82 4>;
234236
pinctrl-names = "default";
235237
pinctrl-0 = <&pinctrl_usb2>;
236-
clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
238+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
239+
<&mio_clk 14>;
237240
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
238241
<&mio_rst 14>;
239242
};

arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,8 @@
299299
interrupts = <0 243 4>;
300300
pinctrl-names = "default";
301301
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>;
303304
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
304305
<&mio_rst 12>;
305306
};
@@ -311,7 +312,8 @@
311312
interrupts = <0 244 4>;
312313
pinctrl-names = "default";
313314
pinctrl-0 = <&pinctrl_usb1>;
314-
clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
315+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
316+
<&mio_clk 13>;
315317
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
316318
<&mio_rst 13>;
317319
};
@@ -323,7 +325,8 @@
323325
interrupts = <0 245 4>;
324326
pinctrl-names = "default";
325327
pinctrl-0 = <&pinctrl_usb2>;
326-
clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
328+
clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
329+
<&mio_clk 14>;
327330
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
328331
<&mio_rst 14>;
329332
};

0 commit comments

Comments
 (0)