From c45219cba101f32853d011da2ba46a1b2338dc4c Mon Sep 17 00:00:00 2001

From: Pierre-Olivier Mercier <nemunaire@nemunai.re>

Date: Thu, 5 Jan 2023 13:02:08 +0100

Subject: [PATCH] Revert "arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0"

Git-commit: c45219cba101f32853d011da2ba46a1b2338dc4c

Patch-mainline: v6.2-rc5

References: git-fixes

This reverts commit 703e84d6615a4a95fb504c8f2e4c9426b86f3930.

USB device enumeration was not working on Odroid HC4 as both USB2 PHYs

need to be enabled. This is inherited from the GLX USB design [1].

[1]: https://lore.kernel.org/all/20170814224542.18257-1-martin.blumenstingl@googlemail.com/T/

Signed-off-by: Pierre-Olivier Mercier <nemunaire@nemunai.re>

Acked-by: Neil Armstrong <neil.armstrong@linaro.org>

Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

Link: https://lore.kernel.org/r/20230105120206.28964-1-nemunaire@nemunai.re

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 8 ++------

 1 file 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 @@ flash@0 {

 };

 &usb {

-	phys = <&usb2_phy1>;

-	phy-names = "usb2-phy1";

-};

-

-&usb2_phy0 {

-	status = "disabled";

+	phys = <&usb2_phy0>, <&usb2_phy1>;

+	phy-names = "usb2-phy0", "usb2-phy1";

 };

-- 

2.35.3