Commit caa3415f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Alexandre Torgue

ARM: dts: stm32: Consolidate usbh_[eo]hci phy properties on stm32mp15

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarAlexandre Torgue <alexandre.torgue@foss.st.com>
parent bfc3c674
...@@ -1521,6 +1521,8 @@ usbh_ohci: usb@5800c000 { ...@@ -1521,6 +1521,8 @@ usbh_ohci: usb@5800c000 {
clocks = <&usbphyc>, <&rcc USBH>; clocks = <&usbphyc>, <&rcc USBH>;
resets = <&rcc USBH_R>; resets = <&rcc USBH_R>;
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "disabled"; status = "disabled";
}; };
...@@ -1531,6 +1533,8 @@ usbh_ehci: usb@5800d000 { ...@@ -1531,6 +1533,8 @@ usbh_ehci: usb@5800d000 {
resets = <&rcc USBH_R>; resets = <&rcc USBH_R>;
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
companion = <&usbh_ohci>; companion = <&usbh_ohci>;
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "disabled"; status = "disabled";
}; };
......
...@@ -206,8 +206,6 @@ pins { ...@@ -206,8 +206,6 @@ pins {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
......
...@@ -313,8 +313,6 @@ &uart7 { ...@@ -313,8 +313,6 @@ &uart7 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
......
...@@ -500,14 +500,10 @@ &usart3 { ...@@ -500,14 +500,10 @@ &usart3 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
&usbh_ohci { &usbh_ohci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
......
...@@ -362,7 +362,6 @@ &usart3 { ...@@ -362,7 +362,6 @@ &usart3 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
...@@ -197,14 +197,10 @@ &uart4 { ...@@ -197,14 +197,10 @@ &uart4 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
&usbh_ohci { &usbh_ohci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
......
...@@ -547,14 +547,10 @@ &usart3 { ...@@ -547,14 +547,10 @@ &usart3 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
&usbh_ohci { &usbh_ohci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
......
...@@ -567,9 +567,6 @@ &usart3 { ...@@ -567,9 +567,6 @@ &usart3 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
......
...@@ -152,7 +152,6 @@ &uart8 { /* RS485 */ ...@@ -152,7 +152,6 @@ &uart8 { /* RS485 */
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
}; };
......
...@@ -305,7 +305,6 @@ &uart8 { ...@@ -305,7 +305,6 @@ &uart8 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
}; };
......
...@@ -119,12 +119,10 @@ &uart8 { ...@@ -119,12 +119,10 @@ &uart8 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
}; };
&usbh_ohci { &usbh_ohci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
}; };
......
...@@ -489,8 +489,6 @@ bluetooth { ...@@ -489,8 +489,6 @@ bluetooth {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
phy-names = "usb";
status = "okay"; status = "okay";
}; };
......
...@@ -312,12 +312,10 @@ &usart3 { /* RS485 or RS232 */ ...@@ -312,12 +312,10 @@ &usart3 { /* RS485 or RS232 */
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
}; };
&usbh_ohci { &usbh_ohci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
}; };
......
...@@ -168,12 +168,10 @@ &uart7 { ...@@ -168,12 +168,10 @@ &uart7 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
}; };
&usbh_ohci { &usbh_ohci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
}; };
......
...@@ -680,7 +680,6 @@ &usart3 { ...@@ -680,7 +680,6 @@ &usart3 {
}; };
&usbh_ehci { &usbh_ehci {
phys = <&usbphyc_port0>;
status = "okay"; status = "okay";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment