arm64: dts: marvell: armada-37xx: Add SATA comphy into main armada-37xx.dtsi file

SATA on A3720 SOC can use only comphy2, so move this definition from board
specific DTS file armada-3720-espressobin.dtsi into main A3720 SOC file
armada-37xx.dtsi.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
index daffe136c5235471e25e1f33eb63d94f119a59b2..5fc613d241516bed49480dbf7df038f0127dd460 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi
@@ -67,8 +67,6 @@
 /* J6 */
 &sata {
        status = "okay";
-       phys = <&comphy2 0>;
-       phy-names = "sata-phy";
 };
 
 /* U11 */

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index d5b6c0a1c54a542d8fa5973deae4f5579b92c93f..7a2df148c6a31aa00e3ef638ff9711d6540eab11 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -458,6 +458,8 @@
                                reg = <0xe0000 0x178>;
                                interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&nb_periph_clk 1>;
+                               phys = <&comphy2 0>;
+                               phy-names = "sata-phy";
                                status = "disabled";
                        };