[PATCH] arm64: dts: marvell: Drop undocumented SATA phy names

Gregory CLEMENT gregory.clement at bootlin.com
Tue Nov 5 08:28:57 PST 2024


"Rob Herring (Arm)" <robh at kernel.org> writes:

> While "phy-names" is allowed for sata-port nodes, the names used aren't
> documented and are incorrect ("sata-phy" is what's documented). The name
> for a single entry is fairly useless, so just drop the property.
>
> Signed-off-by: Rob Herring (Arm) <robh at kernel.org>

Applied on mvebu/dt64

Thanks,

Gregory
> ---
> Cc: Frank Wunderlich <linux at fw-web.de>
>
> There's also this 2 year old patch fixing other SATA errors[1] which 
> was never picked up. :(
>
> [1] https://lore.kernel.org/linux-arm-kernel/20220311210357.222830-3-linux@fw-web.de/
>
>  arch/arm64/boot/dts/marvell/armada-7040-db.dts             | 1 -
>  arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts       | 2 --
>  arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts | 1 -
>  arch/arm64/boot/dts/marvell/armada-8040-db.dts             | 2 --
>  arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi         | 1 -
>  arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts    | 2 --
>  6 files changed, 9 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
> index 5e5baf6beea4..1e0ab35cc686 100644
> --- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
> @@ -214,7 +214,6 @@ &cp0_sata0 {
>  
>  	sata-port at 1 {
>  		phys = <&cp0_comphy3 1>;
> -		phy-names = "cp0-sata0-1-phy";
>  	};
>  };
>  
> diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
> index 40b7ee7ead72..7af949092b91 100644
> --- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
> @@ -433,13 +433,11 @@ &cp0_sata0 {
>  	/* 7 + 12 SATA connector (J24) */
>  	sata-port at 0 {
>  		phys = <&cp0_comphy2 0>;
> -		phy-names = "cp0-sata0-0-phy";
>  	};
>  
>  	/* M.2-2250 B-key (J39) */
>  	sata-port at 1 {
>  		phys = <&cp0_comphy3 1>;
> -		phy-names = "cp0-sata0-1-phy";
>  	};
>  };
>  
> 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 67892f0d2863..7005a32a6e1e 100644
> --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
> @@ -475,7 +475,6 @@ &cp1_sata0 {
>  
>  	sata-port at 1 {
>  		phys = <&cp1_comphy0 1>;
> -		phy-names = "cp1-sata0-1-phy";
>  	};
>  };
>  
> diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
> index 92897bd7e6cf..2ec19d364e62 100644
> --- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
> @@ -145,11 +145,9 @@ &cp0_sata0 {
>  
>  	sata-port at 0 {
>  		phys = <&cp0_comphy1 0>;
> -		phy-names = "cp0-sata0-0-phy";
>  	};
>  	sata-port at 1 {
>  		phys = <&cp0_comphy3 1>;
> -		phy-names = "cp0-sata0-1-phy";
>  	};
>  };
>  
> diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
> index c864df9ec84d..e88ff5b179c8 100644
> --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
> @@ -245,7 +245,6 @@ &cp0_sata0 {
>  	/* CPM Lane 5 - U29 */
>  	sata-port at 1 {
>  		phys = <&cp0_comphy5 1>;
> -		phy-names = "cp0-sata0-1-phy";
>  	};
>  };
>  
> diff --git a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
> index 42a60f3dd5d1..3e5e0651ce68 100644
> --- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
> @@ -408,12 +408,10 @@ &cp0_sata0 {
>  
>  	sata-port at 0 {
>  		phys = <&cp0_comphy2 0>;
> -		phy-names = "cp0-sata0-0-phy";
>  	};
>  
>  	sata-port at 1 {
>  		phys = <&cp0_comphy5 1>;
> -		phy-names = "cp0-sata0-1-phy";
>  	};
>  };
>  
> -- 
> 2.45.2
>

-- 
Grégory CLEMENT, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com



More information about the linux-arm-kernel mailing list