Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1878b85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dab30d55 da984d75

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

+2 −2
Original line number Diff line number Diff line
@@ -178,9 +178,9 @@ 
				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

				arm,double-linefill-incr = <1>;

				arm,double-linefill-incr = <0>;

				arm,double-linefill-wrap = <0>;

				arm,double-linefill = <1>;

				arm,double-linefill = <0>;

				prefetch-data = <1>;

			};

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

+2 −2
Original line number Diff line number Diff line
@@ -143,9 +143,9 @@ 
				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

				arm,double-linefill-incr = <1>;

				arm,double-linefill-incr = <0>;

				arm,double-linefill-wrap = <0>;

				arm,double-linefill = <1>;

				arm,double-linefill = <0>;

				prefetch-data = <1>;

			};

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

+2 −2
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ 
				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

				arm,double-linefill-incr = <1>;

				arm,double-linefill-incr = <0>;

				arm,double-linefill-wrap = <0>;

				arm,double-linefill = <1>;

				arm,double-linefill = <0>;

				prefetch-data = <1>;

			};

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

+6 −3
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ 
			interrupts = <0 80 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb0>;

			clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;

			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,

				 <&mio_clk 12>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,

				 <&mio_rst 12>;

		};
@@ -221,7 +222,8 @@ 
			interrupts = <0 81 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb1>;

			clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;

			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,

				 <&mio_clk 13>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,

				 <&mio_rst 13>;

		};
@@ -233,7 +235,8 @@ 
			interrupts = <0 82 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb2>;

			clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;

			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,

				 <&mio_clk 14>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,

				 <&mio_rst 14>;

		};

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

+4 −2
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ 
			interrupts = <0 80 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb2>;

			clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;

			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,

				 <&mio_clk 12>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,

				 <&mio_rst 12>;

		};
@@ -253,7 +254,8 @@ 
			interrupts = <0 81 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb3>;

			clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;

			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,

				 <&mio_clk 13>;

			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,

				 <&mio_rst 13>;

		};