diff mbox series

ARM: dts: stm32mp15x: Consolidate usbh_[eo]hci phy properties

Message ID 20231206083142.1476340-2-u.kleine-koenig@pengutronix.de (mailing list archive)
State New, archived
Headers show
Series ARM: dts: stm32mp15x: Consolidate usbh_[eo]hci phy properties | expand

Commit Message

Uwe Kleine-König Dec. 6, 2023, 8:31 a.m. UTC 
All machines making use of &usbh_ehci and/or &usbh_ohci use

	phys = <&usbphyc_port0>;

So move this setting into the .dtsi. Also add

	phy-names = "usb";

which isn't used by all machines, but nice for consistency.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 arch/arm/boot/dts/st/stm32mp151.dtsi                        | 4 ++++
 arch/arm/boot/dts/st/stm32mp151a-prtt1l.dtsi                | 2 --
 arch/arm/boot/dts/st/stm32mp157a-stinger96.dtsi             | 2 --
 arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi         | 4 ----
 arch/arm/boot/dts/st/stm32mp157c-ev1.dts                    | 1 -
 arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts           | 4 ----
 arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi | 4 ----
 arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi               | 3 ---
 arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi           | 1 -
 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi            | 1 -
 arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi         | 2 --
 arch/arm/boot/dts/st/stm32mp15xx-dhcor-avenger96.dtsi       | 2 --
 arch/arm/boot/dts/st/stm32mp15xx-dhcor-drc-compact.dtsi     | 2 --
 arch/arm/boot/dts/st/stm32mp15xx-dhcor-testbench.dtsi       | 2 --
 arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi                   | 2 --
 15 files changed, 4 insertions(+), 32 deletions(-)


base-commit: 577a4ee0b96fb043c9cf4a533c550ff587e526cf

Comments

Uwe Kleine-König Dec. 6, 2023, 8:48 a.m. UTC | #1 
Hello,

On Wed, Dec 06, 2023 at 09:31:43AM +0100, Uwe Kleine-König wrote:
> diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
> index 511113f2e399..704c0d0cfe5f 100644
> --- a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
> +++ b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
> @@ -680,8 +680,6 @@ &usart3 {
>  };
>  
>  &usbh_ehci {
> -	phys = <&usbphyc_port0>;
> -	status = "okay";

the status property must be kept. I will wait a bit for further review
and then resend (unless this patch is picked up with this issue fixed
up).

Best regards
Uwe
Alexandre TORGUE Dec. 14, 2023, 4:14 p.m. UTC | #2 
Hi Uwe

On 12/6/23 09:48, Uwe Kleine-König wrote:
> Hello,
> 
> On Wed, Dec 06, 2023 at 09:31:43AM +0100, Uwe Kleine-König wrote:
>> diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
>> index 511113f2e399..704c0d0cfe5f 100644
>> --- a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
>> +++ b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
>> @@ -680,8 +680,6 @@ &usart3 {
>>   };
>>   
>>   &usbh_ehci {
>> -	phys = <&usbphyc_port0>;
>> -	status = "okay";
> 
> the status property must be kept. I will wait a bit for further review
> and then resend (unless this patch is picked up with this issue fixed
> up).

Applied with the fix. First I had a small doubt about the patch as we 
can also choose usbphyc_port1 for USB host but as usbphyc_port0 remains 
always connected to the USB host then your patch makes completely sens.

Regards
Alex


> Best regards
> Uwe
>
Fabrice Gasnier Dec. 15, 2023, 8:23 a.m. UTC | #3 
On 12/14/23 17:14, Alexandre TORGUE wrote:
> Hi Uwe
> 
> On 12/6/23 09:48, Uwe Kleine-König wrote:
>> Hello,
>>
>> On Wed, Dec 06, 2023 at 09:31:43AM +0100, Uwe Kleine-König wrote:
>>> diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
>>> b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
>>> index 511113f2e399..704c0d0cfe5f 100644
>>> --- a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
>>> +++ b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
>>> @@ -680,8 +680,6 @@ &usart3 {
>>>   };
>>>     &usbh_ehci {
>>> -    phys = <&usbphyc_port0>;
>>> -    status = "okay";
>>
>> the status property must be kept. I will wait a bit for further review
>> and then resend (unless this patch is picked up with this issue fixed
>> up).
> 
> Applied with the fix. First I had a small doubt about the patch as we
> can also choose usbphyc_port1 for USB host but as usbphyc_port0 remains
> always connected to the USB host then your patch makes completely sens.

Hi UWe, Alex,

I tested it, with the fix, on stm32mp157c-ev1 and stm32mp157c-dk2. You
can add my:
Tested-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>

Best Regards,
Fabrice
> 
> Regards
> Alex
> 
> 
>> Best regards
>> Uwe
>>
> _______________________________________________
> Linux-stm32 mailing list
> Linux-stm32@st-md-mailman.stormreply.com
> https://st-md-mailman.stormreply.com/mailman/listinfo/linux-stm32
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/st/stm32mp151.dtsi b/arch/arm/boot/dts/st/stm32mp151.dtsi
index 61508917521c..fa4cbd312e5a 100644
--- a/arch/arm/boot/dts/st/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp151.dtsi
@@ -1521,6 +1521,8 @@  usbh_ohci: usb@5800c000 {
 			clocks = <&usbphyc>, <&rcc USBH>;
 			resets = <&rcc USBH_R>;
 			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
+			phys = <&usbphyc_port0>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 
@@ -1531,6 +1533,8 @@  usbh_ehci: usb@5800d000 {
 			resets = <&rcc USBH_R>;
 			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
 			companion = <&usbh_ohci>;
+			phys = <&usbphyc_port0>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/st/stm32mp151a-prtt1l.dtsi b/arch/arm/boot/dts/st/stm32mp151a-prtt1l.dtsi
index dd23de85100c..3938d357e198 100644
--- a/arch/arm/boot/dts/st/stm32mp151a-prtt1l.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp151a-prtt1l.dtsi
@@ -206,8 +206,6 @@  pins {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp157a-stinger96.dtsi b/arch/arm/boot/dts/st/stm32mp157a-stinger96.dtsi
index 5f85598cc7c6..5c1cc48e5199 100644
--- a/arch/arm/boot/dts/st/stm32mp157a-stinger96.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp157a-stinger96.dtsi
@@ -313,8 +313,6 @@  &uart7 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi b/arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi
index f928cfb80b87..4792004cab0c 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi
@@ -500,14 +500,10 @@  &usart3 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
 &usbh_ohci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp157c-ev1.dts b/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
index cd9c3ff5378b..9eb9a1bf4f2c 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-ev1.dts
@@ -362,7 +362,6 @@  &usart3 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 	#address-cells = <1>;
 	#size-cells = <0>;
diff --git a/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts b/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts
index bd67a1db9122..527c33be66cc 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts
+++ b/arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts
@@ -197,14 +197,10 @@  &uart4 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
 &usbh_ohci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi b/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi
index 4e8b2d2b30c7..bf0c32027baf 100644
--- a/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp157c-phycore-stm32mp15-som.dtsi
@@ -547,14 +547,10 @@  &usart3 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
 &usbh_ohci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi
index f09b7c384bd9..fc3a2386dbb9 100644
--- a/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi
@@ -567,9 +567,6 @@  &usart3 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
-
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi
index 35b1034aa3cf..bb4f8a0b937f 100644
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi
@@ -152,7 +152,6 @@  &uart8 {	/* RS485 */
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi
index 46b87a27d8b3..466d9701add0 100644
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi
@@ -305,7 +305,6 @@  &uart8 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi
index abc595350e71..b5bc53accd6b 100644
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi
@@ -119,12 +119,10 @@  &uart8 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 };
 
 &usbh_ohci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcor-avenger96.dtsi
index 0069ad75d55e..343a4613dfca 100644
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcor-avenger96.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcor-avenger96.dtsi
@@ -489,8 +489,6 @@  bluetooth {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
-	phy-names = "usb";
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcor-drc-compact.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcor-drc-compact.dtsi
index 92d906bfd5d7..bc4ddcbdd5cf 100644
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcor-drc-compact.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcor-drc-compact.dtsi
@@ -312,12 +312,10 @@  &usart3 {	/* RS485 or RS232 */
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 };
 
 &usbh_ohci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dhcor-testbench.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dhcor-testbench.dtsi
index ab7f0ba49639..6e79c4b6fe32 100644
--- a/arch/arm/boot/dts/st/stm32mp15xx-dhcor-testbench.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dhcor-testbench.dtsi
@@ -168,12 +168,10 @@  &uart7 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 };
 
 &usbh_ohci {
-	phys = <&usbphyc_port0>;
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
index 511113f2e399..704c0d0cfe5f 100644
--- a/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi
@@ -680,8 +680,6 @@  &usart3 {
 };
 
 &usbh_ehci {
-	phys = <&usbphyc_port0>;
-	status = "okay";
 	#address-cells = <1>;
 	#size-cells = <0>;
 	/* onboard HUB */