aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-04 14:33:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-04 14:33:28 -0400
commitb1878b857c732830ec38204196f99e4236b57b6e (patch)
treecba470db1414739f5b3c967c0ea21fdee14ad2f9
parentdab30d5531c9ee7c42c4448afa0030c86e55df19 (diff)
parentda984d754069818090511fc3b36ea2f9a0b538b5 (diff)
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
Diffstat
-rw-r--r--arch/arm/boot/dts/armada-375.dtsi4
-rw-r--r--arch/arm/boot/dts/armada-38x.dtsi4
-rw-r--r--arch/arm/boot/dts/armada-39x.dtsi4
-rw-r--r--arch/arm/boot/dts/uniphier-ld4.dtsi9
-rw-r--r--arch/arm/boot/dts/uniphier-pro4.dtsi6
-rw-r--r--arch/arm/boot/dts/uniphier-sld8.dtsi9
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi9
7 files changed, 28 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index 7225c7ce9a8d..2cb1bcd30976 100644
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -178,9 +178,9 @@
178 reg = <0x8000 0x1000>; 178 reg = <0x8000 0x1000>;
179 cache-unified; 179 cache-unified;
180 cache-level = <2>; 180 cache-level = <2>;
181 arm,double-linefill-incr = <1>; 181 arm,double-linefill-incr = <0>;
182 arm,double-linefill-wrap = <0>; 182 arm,double-linefill-wrap = <0>;
183 arm,double-linefill = <1>; 183 arm,double-linefill = <0>;
184 prefetch-data = <1>; 184 prefetch-data = <1>;
185 }; 185 };
186 186
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 4960722aab32..00ff549d4e39 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -143,9 +143,9 @@
143 reg = <0x8000 0x1000>; 143 reg = <0x8000 0x1000>;
144 cache-unified; 144 cache-unified;
145 cache-level = <2>; 145 cache-level = <2>;
146 arm,double-linefill-incr = <1>; 146 arm,double-linefill-incr = <0>;
147 arm,double-linefill-wrap = <0>; 147 arm,double-linefill-wrap = <0>;
148 arm,double-linefill = <1>; 148 arm,double-linefill = <0>;
149 prefetch-data = <1>; 149 prefetch-data = <1>;
150 }; 150 };
151 151
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index ea657071e278..5218bd2a248d 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -111,9 +111,9 @@
111 reg = <0x8000 0x1000>; 111 reg = <0x8000 0x1000>;
112 cache-unified; 112 cache-unified;
113 cache-level = <2>; 113 cache-level = <2>;
114 arm,double-linefill-incr = <1>; 114 arm,double-linefill-incr = <0>;
115 arm,double-linefill-wrap = <0>; 115 arm,double-linefill-wrap = <0>;
116 arm,double-linefill = <1>; 116 arm,double-linefill = <0>;
117 prefetch-data = <1>; 117 prefetch-data = <1>;
118 }; 118 };
119 119
diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index 79183db5b386..93586faf950f 100644
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -209,7 +209,8 @@
209 interrupts = <0 80 4>; 209 interrupts = <0 80 4>;
210 pinctrl-names = "default"; 210 pinctrl-names = "default";
211 pinctrl-0 = <&pinctrl_usb0>; 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 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>, 214 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
214 <&mio_rst 12>; 215 <&mio_rst 12>;
215 }; 216 };
@@ -221,7 +222,8 @@
221 interrupts = <0 81 4>; 222 interrupts = <0 81 4>;
222 pinctrl-names = "default"; 223 pinctrl-names = "default";
223 pinctrl-0 = <&pinctrl_usb1>; 224 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>;
225 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>, 227 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
226 <&mio_rst 13>; 228 <&mio_rst 13>;
227 }; 229 };
@@ -233,7 +235,8 @@
233 interrupts = <0 82 4>; 235 interrupts = <0 82 4>;
234 pinctrl-names = "default"; 236 pinctrl-names = "default";
235 pinctrl-0 = <&pinctrl_usb2>; 237 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>;
237 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>, 240 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
238 <&mio_rst 14>; 241 <&mio_rst 14>;
239 }; 242 };
diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index b3dbbd9b6e39..2a9bd7f9f5db 100644
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -241,7 +241,8 @@
241 interrupts = <0 80 4>; 241 interrupts = <0 80 4>;
242 pinctrl-names = "default"; 242 pinctrl-names = "default";
243 pinctrl-0 = <&pinctrl_usb2>; 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 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>, 246 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
246 <&mio_rst 12>; 247 <&mio_rst 12>;
247 }; 248 };
@@ -253,7 +254,8 @@
253 interrupts = <0 81 4>; 254 interrupts = <0 81 4>;
254 pinctrl-names = "default"; 255 pinctrl-names = "default";
255 pinctrl-0 = <&pinctrl_usb3>; 256 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>;
257 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>, 259 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
258 <&mio_rst 13>; 260 <&mio_rst 13>;
259 }; 261 };
diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index b08390332971..ebd0c3f63e7f 100644
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -209,7 +209,8 @@
209 interrupts = <0 80 4>; 209 interrupts = <0 80 4>;
210 pinctrl-names = "default"; 210 pinctrl-names = "default";
211 pinctrl-0 = <&pinctrl_usb0>; 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 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>, 214 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
214 <&mio_rst 12>; 215 <&mio_rst 12>;
215 }; 216 };
@@ -221,7 +222,8 @@
221 interrupts = <0 81 4>; 222 interrupts = <0 81 4>;
222 pinctrl-names = "default"; 223 pinctrl-names = "default";
223 pinctrl-0 = <&pinctrl_usb1>; 224 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>;
225 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>, 227 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
226 <&mio_rst 13>; 228 <&mio_rst 13>;
227 }; 229 };
@@ -233,7 +235,8 @@
233 interrupts = <0 82 4>; 235 interrupts = <0 82 4>;
234 pinctrl-names = "default"; 236 pinctrl-names = "default";
235 pinctrl-0 = <&pinctrl_usb2>; 237 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>;
237 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>, 240 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
238 <&mio_rst 14>; 241 <&mio_rst 14>;
239 }; 242 };
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index ee4aff53a5f5..09c429cb6d61 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -299,7 +299,8 @@
299 interrupts = <0 243 4>; 299 interrupts = <0 243 4>;
300 pinctrl-names = "default"; 300 pinctrl-names = "default";
301 pinctrl-0 = <&pinctrl_usb0>; 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 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>, 304 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
304 <&mio_rst 12>; 305 <&mio_rst 12>;
305 }; 306 };
@@ -311,7 +312,8 @@
311 interrupts = <0 244 4>; 312 interrupts = <0 244 4>;
312 pinctrl-names = "default"; 313 pinctrl-names = "default";
313 pinctrl-0 = <&pinctrl_usb1>; 314 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>;
315 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>, 317 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
316 <&mio_rst 13>; 318 <&mio_rst 13>;
317 }; 319 };
@@ -323,7 +325,8 @@
323 interrupts = <0 245 4>; 325 interrupts = <0 245 4>;
324 pinctrl-names = "default"; 326 pinctrl-names = "default";
325 pinctrl-0 = <&pinctrl_usb2>; 327 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>;
327 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>, 330 resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
328 <&mio_rst 14>; 331 <&mio_rst 14>;
329 }; 332 };
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-29 19:01:10 -0400