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(-)
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@kernel.org>
---
Cc: Frank Wunderlich <linux@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@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@0 {
phys = <&cp0_comphy2 0>;
- phy-names = "cp0-sata0-0-phy";
};
/* M.2-2250 B-key (J39) */
sata-port@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@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@0 {
phys = <&cp0_comphy1 0>;
- phy-names = "cp0-sata0-0-phy";
};
sata-port@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@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@0 {
phys = <&cp0_comphy2 0>;
- phy-names = "cp0-sata0-0-phy";
};
sata-port@1 {
phys = <&cp0_comphy5 1>;
- phy-names = "cp0-sata0-1-phy";
};
};
--
2.45.2"Rob Herring (Arm)" <robh@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@kernel.org>
Applied on mvebu/dt64
Thanks,
Gregory
> ---
> Cc: Frank Wunderlich <linux@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@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@0 {
> phys = <&cp0_comphy2 0>;
> - phy-names = "cp0-sata0-0-phy";
> };
>
> /* M.2-2250 B-key (J39) */
> sata-port@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@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@0 {
> phys = <&cp0_comphy1 0>;
> - phy-names = "cp0-sata0-0-phy";
> };
> sata-port@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@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@0 {
> phys = <&cp0_comphy2 0>;
> - phy-names = "cp0-sata0-0-phy";
> };
>
> sata-port@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
Am 5. November 2024 17:28:57 MEZ schrieb Gregory CLEMENT <gregory.clement@bootlin.com>:
>"Rob Herring (Arm)" <robh@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@kernel.org>
>
>Applied on mvebu/dt64
>
>Thanks,
>
>Gregory
>> ---
>> Cc: Frank Wunderlich <linux@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/
Hi
How to deal with my patch pointed by rob?
regards Frank
On Wed, Nov 6, 2024 at 12:34 PM Frank Wunderlich <linux@fw-web.de> wrote:
>
> Am 5. November 2024 17:28:57 MEZ schrieb Gregory CLEMENT <gregory.clement@bootlin.com>:
> >"Rob Herring (Arm)" <robh@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@kernel.org>
> >
> >Applied on mvebu/dt64
> >
> >Thanks,
> >
> >Gregory
> >> ---
> >> Cc: Frank Wunderlich <linux@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/
>
> Hi
>
> How to deal with my patch pointed by rob?
I believe it will conflict with mine. Can you rebase on top of
mvebu/dt64 and resend it.
Rob
Am 2024-11-06 19:39, schrieb Rob Herring:
> On Wed, Nov 6, 2024 at 12:34 PM Frank Wunderlich <linux@fw-web.de>
> wrote:
>>
>> Am 5. November 2024 17:28:57 MEZ schrieb Gregory CLEMENT
>> <gregory.clement@bootlin.com>:
>> >"Rob Herring (Arm)" <robh@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@kernel.org>
>> >
>> >Applied on mvebu/dt64
>> >
>> >Thanks,
>> >
>> >Gregory
>> >> ---
>> >> Cc: Frank Wunderlich <linux@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/
>>
>> Hi
>>
>> How to deal with my patch pointed by rob?
>
> I believe it will conflict with mine. Can you rebase on top of
> mvebu/dt64 and resend it.
>
> Rob
i have rebased my patch [1], but it seems there are much more errors
there (which i tried to fix there too).
To be honest marvell is confusing to me finding the right file to patch
because of many dtsi files included by each other mixed with some
macros.
at least some properties have to be documented in yaml:
arch/arm64/boot/dts/marvell/armada-8040-db.dtb: sata@540000: Unevaluated
properties are not allowed ('#address-cells', '#size-cells',
'dma-coherent', 'iommus' were unexpected)
sata-node itself seems to be defined in
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi (adress/size-cells and
dma-coherent are defined here)
iommus seems to be added with
83a3545d9c37 2020-07-15 arm64: dts: marvell: add SMMU support Marcin
Wojtas (tag: mvebu-dt64-5.9-1)
which seems not be documented in txt before i converted the binding.
so something like adding this to the binding:
'#address-cells':
const: 1
'#size-cells':
const: 0
dma-coherent: true
iommus:
maxItems: 1
dma-coherent was there in my version and seem to be broken with
6f997d4bb98b 2022-09-09 dt-bindings: ata: ahci-platform: Move
dma-coherent to sata-common.yaml Serge Semin
but maybe i only get the error for it because of my call with my yaml
only
ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/ata/ahci-platform.yaml
adress/size-cells is strange to me, i'm sure i tested the yaml against
the example which also contains them...i guess it was defined somewhere
else.
and this one:
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtb: sata@540000:
sata-port@0:phy-names:0: 'sata-phy' was expected
from schema $id: http://devicetree.org/schemas/ata/ahci-platform.yaml#
i guess it is taken from here:
Documentation/devicetree/bindings/ata/ahci-common.yaml:107:
const: sata-phy
if i understand it the right way then if phy-names is defined in
sata-subnode it has to be value "sata-phy"...so basicly somewhere in the
chains of dtsi's a phy-name is defined to another value..am i right?
it looks like it is in
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi...if i drop the
phy-names for the other sata-ports (below cp1_sata0)
seems dropping them were missing from your patch as you remove another
one in same file (&cp0_sata0)
please correct me if i'm wrong
regards Frank
[1] https://github.com/frank-w/BPI-Router-Linux/commits/mvebu/dt64/
On Wed, Nov 6, 2024 at 3:17 PM Frank Wunderlich (linux) <linux@fw-web.de> wrote:
>
> Am 2024-11-06 19:39, schrieb Rob Herring:
> > On Wed, Nov 6, 2024 at 12:34 PM Frank Wunderlich <linux@fw-web.de>
> > wrote:
> >>
> >> Am 5. November 2024 17:28:57 MEZ schrieb Gregory CLEMENT
> >> <gregory.clement@bootlin.com>:
> >> >"Rob Herring (Arm)" <robh@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@kernel.org>
> >> >
> >> >Applied on mvebu/dt64
> >> >
> >> >Thanks,
> >> >
> >> >Gregory
> >> >> ---
> >> >> Cc: Frank Wunderlich <linux@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/
> >>
> >> Hi
> >>
> >> How to deal with my patch pointed by rob?
> >
> > I believe it will conflict with mine. Can you rebase on top of
> > mvebu/dt64 and resend it.
> >
> > Rob
>
> i have rebased my patch [1], but it seems there are much more errors
> there (which i tried to fix there too).
>
> To be honest marvell is confusing to me finding the right file to patch
> because of many dtsi files included by each other mixed with some
> macros.
>
> at least some properties have to be documented in yaml:
>
> arch/arm64/boot/dts/marvell/armada-8040-db.dtb: sata@540000: Unevaluated
> properties are not allowed ('#address-cells', '#size-cells',
> 'dma-coherent', 'iommus' were unexpected)
iommus should be added to ahci-platform.yaml.
I think the others are just a side effect because sata-common.yaml
fails due to phy-names. When phy-names is fixed, they should
disappear.
> sata-node itself seems to be defined in
> arch/arm64/boot/dts/marvell/armada-cp11x.dtsi (adress/size-cells and
> dma-coherent are defined here)
>
> iommus seems to be added with
> 83a3545d9c37 2020-07-15 arm64: dts: marvell: add SMMU support Marcin
> Wojtas (tag: mvebu-dt64-5.9-1)
> which seems not be documented in txt before i converted the binding.
>
> so something like adding this to the binding:
>
> '#address-cells':
> const: 1
>
> '#size-cells':
> const: 0
>
> dma-coherent: true
>
> iommus:
> maxItems: 1
>
> dma-coherent was there in my version and seem to be broken with
>
> 6f997d4bb98b 2022-09-09 dt-bindings: ata: ahci-platform: Move
> dma-coherent to sata-common.yaml Serge Semin
>
> but maybe i only get the error for it because of my call with my yaml
> only
>
> ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make dtbs_check
> DT_SCHEMA_FILES=Documentation/devicetree/bindings/ata/ahci-platform.yaml
>
> adress/size-cells is strange to me, i'm sure i tested the yaml against
> the example which also contains them...i guess it was defined somewhere
> else.
>
> and this one:
>
> arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtb: sata@540000:
> sata-port@0:phy-names:0: 'sata-phy' was expected
> from schema $id: http://devicetree.org/schemas/ata/ahci-platform.yaml#
>
> i guess it is taken from here:
> Documentation/devicetree/bindings/ata/ahci-common.yaml:107:
> const: sata-phy
>
> if i understand it the right way then if phy-names is defined in
> sata-subnode it has to be value "sata-phy"...so basicly somewhere in the
> chains of dtsi's a phy-name is defined to another value..am i right?
>
> it looks like it is in
> arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi...if i drop the
> phy-names for the other sata-ports (below cp1_sata0)
>
> seems dropping them were missing from your patch as you remove another
> one in same file (&cp0_sata0)
Humm, not sure how I missed that. I was probably looking at warning
counts and the others registered higher.
Rob
On Mon, Oct 14, 2024 at 2:37 PM Rob Herring (Arm) <robh@kernel.org> wrote:
>
> 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@kernel.org>
> ---
> Cc: Frank Wunderlich <linux@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(-)
Ping.
>
> 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@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@0 {
> phys = <&cp0_comphy2 0>;
> - phy-names = "cp0-sata0-0-phy";
> };
>
> /* M.2-2250 B-key (J39) */
> sata-port@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@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@0 {
> phys = <&cp0_comphy1 0>;
> - phy-names = "cp0-sata0-0-phy";
> };
> sata-port@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@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@0 {
> phys = <&cp0_comphy2 0>;
> - phy-names = "cp0-sata0-0-phy";
> };
>
> sata-port@1 {
> phys = <&cp0_comphy5 1>;
> - phy-names = "cp0-sata0-1-phy";
> };
> };
>
> --
> 2.45.2
>
© 2016 - 2024 Red Hat, Inc.