mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

Merge branch 'arm/fixes' into arm/late

Browse source 
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
This commit is contained in:
Arnd Bergmann 2022-08-05 11:33:19 +02:00
commit 1630eee2d4
No known key found for this signature in database
GPG key ID: 9A6C79EFE60018D9
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MAINTAINERS
View file

@ -1824,6 +1824,7 @@ ARM/APPLE MACHINE SUPPORT
M: Hector Martin <marcan@marcan.st> M: Hector Martin <marcan@marcan.st>
M: Sven Peter <sven@svenpeter.dev> M: Sven Peter <sven@svenpeter.dev>
R: Alyssa Rosenzweig <alyssa@rosenzweig.io> R: Alyssa Rosenzweig <alyssa@rosenzweig.io>
L: asahi@lists.linux.dev
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
W: https://asahilinux.org W: https://asahilinux.org

8
arch/arm/boot/dts/uniphier-pxs2.dtsi
View file

@ -597,8 +597,8 @@ usb0: usb@65a00000 {
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";
@ -693,8 +693,8 @@ usb1: usb@65c00000 {
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";

8
arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
View file

@ -599,8 +599,8 @@ usb0: usb@65a00000 {
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";
@ -701,8 +701,8 @@ usb1: usb@65c00000 {
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";