arm64: dts: marvell: Add 7k/8k PHYs in USB3 nodes

Fill-in the missing USB3 phys/phy-names DT properties of Armada 7k/8k
based boards. Only update nodes actually enabling USB3 in the default
(mainline) configuration. A few USB nodes are enabled but there is
only USB2 working on them.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 45eb419..81bea91 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -228,11 +228,15 @@
 
 &cp0_usb3_0 {
        usb-phy = <&cp0_usb3_0_phy>;
+       phys = <&cp0_comphy1 0>;
+       phy-names = "cp0-usb3h0-comphy";
        status = "okay";
 };
 
 &cp0_usb3_1 {
        usb-phy = <&cp0_usb3_1_phy>;
+       phys = <&cp0_comphy4 1>;
+       phy-names = "cp0-usb3h1-comphy";
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
index 1527c82..281209a 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
@@ -474,5 +474,7 @@
 
 &cp1_usb3_0 {
        usb-phy = <&usb3h0_phy>;
+       phys = <&cp1_comphy2 0>;
+       phy-names = "cp1-usb3h0-comphy";
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 66afed6..1086d53 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -163,6 +163,8 @@
 /* CON10 on CP0 expansion */
 &cp0_usb3_1 {
        usb-phy = <&cp0_usb3_1_phy>;
+       phys = <&cp0_comphy4 1>;
+       phy-names = "cp0-usb3h1-comphy";
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
index b8f28d6..6b9941d 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@ -359,5 +359,7 @@
 &cp1_usb3_0 {
        /* CPS Lane 2 - CON7 */
        usb-phy = <&usb3h0_phy>;
+       phys = <&cp1_comphy2 0>;
+       phy-names = "cp1-usb3h0-comphy";
        status = "okay";
 };