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

Commit 36a247ba authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'uniphier-fixes-v4.14' of... 

Merge tag 'uniphier-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into fixes

Pull "UniPhier ARM SoC fixes for v4.14" from Masahiro Yamada:

- Add necessary clock to EHCI node

* tag 'uniphier-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: add STDMAC clock to EHCI nodes
  ARM: dts: uniphier: add STDMAC clock to EHCI nodes
parents 0b07194b deaa5519

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>;

		};

arch/arm/boot/dts/uniphier-sld8.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/arm64/boot/dts/socionext/uniphier-ld11.dtsi

+6 −3
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ 
			interrupts = <0 243 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>;

		};
@@ -311,7 +312,8 @@ 
			interrupts = <0 244 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>;

		};
@@ -323,7 +325,8 @@ 
			interrupts = <0 245 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>;

		};