diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-01-10 01:15:44 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-01-10 01:15:45 +0300 |
| commit | 13d159553ef2c2b68d5c643db4491999f8b6bbb1 (patch) | |
| tree | 7d73cb1ad095ce2f52f63e2d8f8268a4ec70d695 /arch | |
| parent | a316877372f4f3062b132437cbc16f2fab8cc4c5 (diff) | |
| parent | c45219cba101f32853d011da2ba46a1b2338dc4c (diff) | |
| download | linux-13d159553ef2c2b68d5c643db4491999f8b6bbb1.tar.xz | |
Merge tag 'amlogic-fixes-v6.2-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes
Amlogic fixes for v6.2-rc:
- Revert "arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0" which breaks whole USB on Odroid-HC4
* tag 'amlogic-fixes-v6.2-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
Revert "arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0"
Link: https://lore.kernel.org/r/7915c3f8-57bc-25e2-0314-c78af7a79d6a@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts index e3486f60645a..a1f0c38ccadd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts @@ -131,10 +131,6 @@ }; &usb { - phys = <&usb2_phy1>; - phy-names = "usb2-phy1"; -}; - -&usb2_phy0 { - status = "disabled"; + phys = <&usb2_phy0>, <&usb2_phy1>; + phy-names = "usb2-phy0", "usb2-phy1"; }; |