diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-08-05 12:33:19 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-08-05 12:33:33 +0300 |
| commit | 1630eee2d4e77d8c121ab955d31befacb720bb99 (patch) | |
| tree | 5652fd8b4a6a46c8dca2227909247ff678d4414c /arch/arm | |
| parent | 0d98fbcf72f11b6a6fadcec16d4c7f317bf417ae (diff) | |
| parent | 879bcfc4e5369c39f3199e13a188424d4fae8aa4 (diff) | |
| download | linux-1630eee2d4e77d8c121ab955d31befacb720bb99.tar.xz | |
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
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/uniphier-pxs2.dtsi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi index e81e5937a60a..03301ddb3403 100644 --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi @@ -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"; |