From 6ece0f7dbd558670ec72ba390379949a4d4dc5c0 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Mon, 18 Jan 2021 10:31:39 +0100 Subject: arm64: dts: marvell: armada-37xx: Add SATA comphy into main armada-37xx.dtsi file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Gregory CLEMENT --- arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 2 -- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm64/boot/dts/marvell') diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi index daffe136c523..5fc613d24151 100644 --- 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 d5b6c0a1c54a..7a2df148c6a3 100644 --- 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 = ; clocks = <&nb_periph_clk 1>; + phys = <&comphy2 0>; + phy-names = "sata-phy"; status = "disabled"; }; -- cgit v1.2.3