diff mbox series

Revert "arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0"

Message ID 20230104140608.28432-1-nemunaire@nemunai.re (mailing list archive)
State Superseded
Headers show
Series Revert "arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0" | expand

Commit Message

Pierre-Olivier Mercier Jan. 4, 2023, 2:06 p.m. UTC
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 [0].

[0]: https://lore.kernel.org/all/20170814224542.18257-1-martin.blumenstingl@googlemail.com/T/
Link: https://lore.kernel.org/all/Y6okoXpwF%2FLZewhv@nemunai.re/
Signed-off-by: Pierre-Olivier Mercier <nemunaire@nemunai.re>
---
 arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Neil Armstrong Jan. 5, 2023, 10:29 a.m. UTC | #1
On 04/01/2023 15:06, Pierre-Olivier Mercier wrote:
> 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 [0].
> 
> [0]: https://lore.kernel.org/all/20170814224542.18257-1-martin.blumenstingl@googlemail.com/T/
> Link: https://lore.kernel.org/all/Y6okoXpwF%2FLZewhv@nemunai.re/

This should be [1] and referenced in the commit message, Link: will be used
with the applied patch URL.

> Signed-off-by: Pierre-Olivier Mercier <nemunaire@nemunai.re>
> ---
>   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";
>   };

With the commit log fixed:
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>

Thanks !
Neil
Neil Armstrong Jan. 5, 2023, 1:57 p.m. UTC | #2
On 05/01/2023 13:02, Pierre-Olivier Mercier wrote:
> 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>
> ---
> v2:
>   - Fix commit log
> ---
>   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";
>   };

Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
Martin Blumenstingl Jan. 5, 2023, 5:15 p.m. UTC | #3
On Thu, Jan 5, 2023 at 1:06 PM Pierre-Olivier Mercier
<nemunaire@nemunai.re> wrote:
>
> 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>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Neil Armstrong Jan. 5, 2023, 5:52 p.m. UTC | #4
On 05/01/2023 13:02, Pierre-Olivier Mercier wrote:
> 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>
> ---
> v2:
>   - Fix commit log
> ---
>   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";
>   };

OK weird, this email doesn't appear on any mailing-lists archive, neither our replies !

Neil
Neil Armstrong Jan. 6, 2023, 8:13 a.m. UTC | #5
On 05/01/2023 18:52, neil.armstrong@linaro.org wrote:
> On 05/01/2023 13:02, Pierre-Olivier Mercier wrote:
>> 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>
>> ---
>> v2:
>>   - Fix commit log
>> ---
>>   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";
>>   };
> 
> OK weird, this email doesn't appear on any mailing-lists archive, neither our replies !

Seems infradead was struggling yesterday, everything is back to normal and revert is sent to SoC maintainers.

> 
> Neil
diff mbox series

Patch

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";
 };