Unverified Commit 1630eee2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'arm/fixes' into arm/late 

Two bugfixes that came in to update the MAINTAINERS file
and fix an issue with USB on the uniphier platform.

* arm/fixes:
  arm64: dts: uniphier: Fix USB interrupts for PXs3 SoC
  ARM: dts: uniphier: Fix USB interrupts for PXs2 SoC
  MAINTAINERS: add ARM/APPLE MACHINE mailing list
parents 0d98fbcf 879bcfc4

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1824,6 +1824,7 @@ ARM/APPLE MACHINE SUPPORT 
M:	Hector Martin <marcan@marcan.st>

M:	Sven Peter <sven@svenpeter.dev>

R:	Alyssa Rosenzweig <alyssa@rosenzweig.io>

L:	asahi@lists.linux.dev

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

W:	https://asahilinux.org

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

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

			status = "disabled";

			reg = <0x65a00000 0xcd00>;

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

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

			interrupt-names = "dwc_usb3";

			interrupts = <0 134 4>;

			pinctrl-names = "default";

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

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

			status = "disabled";

			reg = <0x65c00000 0xcd00>;

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

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

			interrupt-names = "dwc_usb3";

			interrupts = <0 137 4>;

			pinctrl-names = "default";

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

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

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

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

			status = "disabled";

			reg = <0x65a00000 0xcd00>;

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

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

			interrupt-names = "dwc_usb3";

			interrupts = <0 134 4>;

			pinctrl-names = "default";

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

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

			status = "disabled";

			reg = <0x65c00000 0xcd00>;

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

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

			interrupt-names = "dwc_usb3";

			interrupts = <0 137 4>;

			pinctrl-names = "default";

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

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