fix some binding check errors for marvell
Subsystems (4)
v2 cover fix some binding check errors for marvell
From: Frank Wunderlich <[email protected]>
Thies series fixes some Errors reported by dtbs_check. First part is taken from my old series [1] where i converted sata-platform txt binding to yaml because it wasn't picked up.
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
I only try to fix the binding errors, i do not have any marvell board, so cannot verify that my changes are correct. From my PoV peripheral controllers should be disabled in the SoC DT and enabled in board DT.
Frank Wunderlich (2):
arm64: dts: marvell: only enable complete sata nodes
arm64: dts: marvell: drop additional phy-names for sata
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 | 5 +++-- arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 3 +-- arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 ++ arch/arm64/boot/dts/marvell/cn9130-crb-B.dts | 1 + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 1 + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 1 + 10 files changed, 15 insertions(+), 4 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/2 arm64: dts: marvell: only enable complete sata nodes
From: Frank Wunderlich <[email protected]>
The ahci-platform binding requires phys/target-supply property.
After converting the binding to yaml the following files reporting "'anyOf' conditional failed" on
sata@540000: sata-port@0
armada-7040-db.dtsarmada-8040-clearfog-gt-8k.dtsarmada-8040-mcbin.dtsarmada-8040-mcbin-singleshot.dtscn9130-db.dtscn9130-db-B.dtscn9131-db.dtscn9131-db-B.dtscn9132-db.dtscn9132-db-B.dts
the following files reporting 'anyOf' conditional failed on
sata@540000: sata-port@1
cn9132-db.dtscn9132-db-B.dtscn9130-crb-B.dts
'phys' is a required property
'target-supply' is a required property
From schema: Documentation/devicetree/bindings/ata/ahci-platform.yaml
This is caused by defining sata-ports incomplete in armada-cp11x.dtsi and overriding only a subset of ports with the needed phys/target-supply property.
Fix this by disabling the node-templates and enabling the needed nodes.
---
v2:
- change commit title
v7 => new v1:
- rebase on mvebu/dt64
- drop fixes tag
i only try to fix binding-check errors.
as i cannot test it on hardware, please verify my changes are correct
there are still some there, but they should be fixed by someone having the hardware.
v5: add fixes-tag
the dtsi uses a macro for the node-label defined in armada-common.dtsi
CP11X_LABEL(sata0): sata@540000 {
so i hope i catched all right nodes to be enabled... have enabled all cpX_sata0 sata-portY childs
--- 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 | 3 +++ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 1 + arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 ++ arch/arm64/boot/dts/marvell/cn9130-crb-B.dts | 1 + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 1 + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 1 + 10 files changed, 15 insertions(+)
arch/arm64/boot/dts/marvell/armada-7040-db.dts +1 -0
@@ -214,6 +214,7 @@ &cp0_sata0 { sata-port@1 { phys = <&cp0_comphy3 1>; + status = "okay"; }; };
arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts +2 -0
@@ -433,11 +433,13 @@ &cp0_sata0 { /* 7 + 12 SATA connector (J24) */ sata-port@0 { phys = <&cp0_comphy2 0>; + status = "okay"; }; /* M.2-2250 B-key (J39) */ sata-port@1 { phys = <&cp0_comphy3 1>; + status = "okay"; }; };
arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +1 -0
@@ -475,6 +475,7 @@ &cp1_sata0 { sata-port@1 { phys = <&cp1_comphy0 1>; + status = "okay"; }; };
arch/arm64/boot/dts/marvell/armada-8040-db.dts +3 -0
@@ -145,9 +145,12 @@ &cp0_sata0 { sata-port@0 { phys = <&cp0_comphy1 0>; + status = "okay"; }; + sata-port@1 { phys = <&cp0_comphy3 1>; + status = "okay"; }; };
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +1 -0
@@ -245,6 +245,7 @@ &cp0_sata0 { /* CPM Lane 5 - U29 */ sata-port@1 { phys = <&cp0_comphy5 1>; + status = "okay"; }; };
arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts +2 -0
@@ -408,10 +408,12 @@ &cp0_sata0 { sata-port@0 { phys = <&cp0_comphy2 0>; + status = "okay"; }; sata-port@1 { phys = <&cp0_comphy5 1>; + status = "okay"; }; };
arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +2 -0
@@ -347,10 +347,12 @@ CP11X_LABEL(sata0): sata@540000 { sata-port@0 { reg = <0>; + status = "disabled"; }; sata-port@1 { reg = <1>; + status = "disabled"; }; };
arch/arm64/boot/dts/marvell/cn9130-crb-B.dts +1 -0
@@ -28,6 +28,7 @@ sata-port@0 { status = "okay"; /* Generic PHY, providing serdes lanes */ phys = <&cp0_comphy2 0>; + status = "okay"; }; };
arch/arm64/boot/dts/marvell/cn9131-db.dtsi +1 -0
@@ -127,6 +127,7 @@ &cp1_sata0 { sata-port@1 { /* Generic PHY, providing serdes lanes */ phys = <&cp1_comphy5 1>; + status = "okay"; }; };
arch/arm64/boot/dts/marvell/cn9132-db.dtsi +1 -0
@@ -175,6 +175,7 @@ &cp2_sata0 { sata-port@0 { /* Generic PHY, providing serdes lanes */ phys = <&cp2_comphy2 0>; + status = "okay"; }; };
Signature · 1 line
2.43.0
PATCH v2 2/2 arm64: dts: marvell: drop additional phy-names for sata
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Commit facbe7092f8a ("arm64: dts: marvell: Drop undocumented SATA phy names") drops some phy-names from devicetrees but misses some. Drop them too.
--- arch/arm64/boot/dts/marvell/armada-8040-db.dts | 2 -- arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 2 -- 2 files changed, 4 deletions(-)
arch/arm64/boot/dts/marvell/armada-8040-db.dts +0 -2
@@ -307,11 +307,9 @@ &cp1_sata0 { sata-port@0 { phys = <&cp1_comphy1 0>; - phy-names = "cp1-sata0-0-phy"; }; sata-port@1 { phys = <&cp1_comphy3 1>; - phy-names = "cp1-sata0-1-phy"; }; };
arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +0 -2
@@ -345,13 +345,11 @@ &cp1_sata0 { /* CPS Lane 1 - U32 */ sata-port@0 { phys = <&cp1_comphy1 0>; - phy-names = "cp1-sata0-0-phy"; }; /* CPS Lane 3 - U31 */ sata-port@1 { phys = <&cp1_comphy3 1>; - phy-names = "cp1-sata0-1-phy"; }; };
Signature · 1 line
2.43.0
Gregory CLEMENT
maintainerQuoted 8 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Thies series fixes some Errors reported by
dtbs_check. First part is taken from my old series [1] where i converted sata-platform txt binding to yaml because it wasn't picked up.[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Quoted 7 lines
I only try to fix the binding errors, i do not have any marvell board, so cannot verify that my changes are correct. From my PoV peripheral controllers should be disabled in the SoC DT and enabled in board DT.
Frank Wunderlich (2):
arm64: dts: marvell: only enable complete sata nodes
arm64: dts: marvell: drop additional phy-names for sata
Applied on mvebu/dt64
Thanks,
Gregory
Quoted 16 lines
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 | 5 +++-- arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 3 +-- arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts | 2 ++ arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 ++ arch/arm64/boot/dts/marvell/cn9130-crb-B.dts | 1 + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 1 + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 1 + 10 files changed, 15 insertions(+), 4 deletions(-)Signature · 1 line
2.43.0
Signature · 3 lines
Grégory CLEMENT, Bootlin Embedded Linux and Kernel engineering https://bootlin.com