| Message ID | 20210118093139.8441-1-pali@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: marvell: armada-37xx: Add SATA comphy into main armada-37xx.dtsi file | expand |
Hi Pali, > 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> Applied on mvebu/dt64 Thanks, Gregory > --- > 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(-) > > 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 b1209ccd258e..005463935ffa 100644 > --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi > @@ -459,6 +459,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"; > }; > > -- > 2.20.1 >
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 b1209ccd258e..005463935ffa 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -459,6 +459,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"; };
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> --- 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(-)