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 45eb4197e603278145fa3b8d618cfa9540f5b7a9..81bea91468f772e2cec5b639b7fe73575a88a4bd 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 @@ sata-port@1 {
 
 &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 1527c82177ab4f8bcd35e9aaa85fbb69e098e5a2..281209aa7f2cd85aa6df6f0cf120c10dd1146b7b 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 @@ spi-flash@0 {
 
 &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 66afed6c6245f0b7e40d21ad13363acdeb99cacb..1086d53fd1b9c86f9fae6cc7e78ade4ff1dff957 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 @@ &cp0_usb3_0 {
 /* 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 b8f28d62be5cc04a576134a33f2361a8652fa7b5..6b9941d92e20b0cac0814f5eaae60988b3927dac 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 @@ spi-flash@0 {
 &cp1_usb3_0 {
        /* CPS Lane 2 - CON7 */
        usb-phy = <&usb3h0_phy>;
+       phys = <&cp1_comphy2 0>;
+       phy-names = "cp1-usb3h0-comphy";
        status = "okay";
 };