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

Commit 57e2c844 authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Greg Kroah-Hartman
Browse files

ARM: dts: uniphier: Fix USB interrupts for PXs2 SoC 



commit 9b0dc7abb5cc43a2dbf90690c3c6011dcadc574d upstream.

An interrupt for USB device are shared with USB host. Set interrupt-names
property to common "dwc_usb3" instead of "host" and "peripheral".

Cc: stable@vger.kernel.org
Fixes: 45be1573 ("ARM: dts: uniphier: Add USB3 controller nodes")
Reported-by: default avatarRyuta NAKANISHI <nakanishi.ryuta@socionext.com>
Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d952c7a

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -585,8 +585,8 @@ 
			compatible = "socionext,uniphier-dwc3", "snps,dwc3";

			compatible = "socionext,uniphier-dwc3", "snps,dwc3";

			status = "disabled";

			status = "disabled";

			reg = <0x65a00000 0xcd00>;

			reg = <0x65a00000 0xcd00>;

			interrupt-names = "host", "peripheral";

			interrupt-names = "dwc_usb3";

			interrupts = <0 134 4>, <0 135 4>;

			interrupts = <0 134 4>;

			pinctrl-names = "default";

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>;

			pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>;

			clock-names = "ref", "bus_early", "suspend";

			clock-names = "ref", "bus_early", "suspend";
@@ -681,8 +681,8 @@ 
			compatible = "socionext,uniphier-dwc3", "snps,dwc3";

			compatible = "socionext,uniphier-dwc3", "snps,dwc3";

			status = "disabled";

			status = "disabled";

			reg = <0x65c00000 0xcd00>;

			reg = <0x65c00000 0xcd00>;

			interrupt-names = "host", "peripheral";

			interrupt-names = "dwc_usb3";

			interrupts = <0 137 4>, <0 138 4>;

			interrupts = <0 137 4>;

			pinctrl-names = "default";

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>;

			pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>;

			clock-names = "ref", "bus_early", "suspend";

			clock-names = "ref", "bus_early", "suspend";