[PATCH RFC v3 6/6] arm: dts: marvell: armada-388-clearfog: add description for usb phys

Josua Mayer
2024-07-20T14:19:40Z

armada-38x.dtsi now has usb phy nodes for all 3 usb-2.0 ports.

Enable, and add references to the usb phys used by clearfog base and pro.
Explicitly set dr_mode to avoid phy driver warning messages during boot.

Finally replace the usb@58000 and usb3@f8000 nodes with references to
labels in armada-38x.dtsi.

Signed-off-by: Josua Mayer <josua@solid-run.com>
---
.../boot/dts/marvell/armada-388-clearfog-base.dts | 3 +++
arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 3 +++
arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi | 30 ++++++++++++++--------
3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts
index 308ad9d1c70f..3edb7988ee2e 100644
--- a/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts
+++ b/arch/arm/boot/dts/marvell/armada-388-clearfog-base.dts
@@ -102,5 +102,8 @@ rear_button_pins: rear-button-pins {

/* SRDS #4 - USB-2.0/3.0 Host, M.2 */
&usb3_0 {
+ phys = <&utmi1>;
+ phy-names = "utmi";
+ dr_mode = "host";
status = "okay";
};
diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
index d6d7cc885f4d..4f5bb5867f20 100644
--- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts
@@ -185,5 +185,8 @@ &spi1 {

/* USB-2.0 Host, CON2 - nearest CPU */
&usb3_0 {
+ phys = <&utmi1>;
+ phy-names = "utmi";
+ dr_mode = "host";
status = "okay";
};
diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi b/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi
index f8a06ae4a3c9..0497fe13f56d 100644
--- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi
+++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi
@@ -51,16 +51,6 @@ sdhci@d8000 {
vmmc-supply = <&reg_3p3v>;
wp-inverted;
};
-
- usb@58000 {
- /* CON3, nearest power. */
- status = "okay";
- };
-
- usb3@f8000 {
- /* CON7 */
- status = "okay";
- };
};

pcie {
@@ -243,3 +233,23 @@ &uart1 {
pinctrl-names = "default";
status = "okay";
};
+
+/* USB-2.0 Host, CON3 - nearest power */
+&usb0 {
+ phys = <&utmi0>;
+ phy-names = "utmi";
+ dr_mode = "host";
+ status = "okay";
+};
+
+/* SRDS #3 - USB-2.0/3.0 Host, Type-A connector */
+&usb3_1 {
+ phys = <&utmi2>;
+ phy-names = "utmi";
+ dr_mode = "host";
+ status = "okay";
+};
+
+&utmi {
+ status = "okay";
+};

--
2.43.0