Skip to contentSkip to conversation

fix some binding check errors for marvell

PATCH In review Frank Wunderlich 2 participants 4 messages Jan 3, 2025 – Jan 8, 2025

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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
#1 lore raw

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.dts
armada-8040-clearfog-gt-8k.dts
armada-8040-mcbin.dts
armada-8040-mcbin-singleshot.dts
cn9130-db.dts
cn9130-db-B.dts
cn9131-db.dts
cn9131-db-B.dts
cn9132-db.dts
cn9132-db-B.dts

the following files reporting 'anyOf' conditional failed on

sata@540000: sata-port@1

cn9132-db.dts
cn9132-db-B.dts
cn9130-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
index 1e0ab35cc686..2b5e45d2c5a6 100644
@@ -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
index 7af949092b91..6bdc4f1e6939 100644
@@ -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
index 7005a32a6e1e..225a54ab688d 100644
@@ -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
index 2ec19d364e62..fe5d6cb9d692 100644
@@ -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
index e88ff5b179c8..5043cf2eb33e 100644
@@ -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
index 3e5e0651ce68..9c25a88581e4 100644
@@ -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
index 7e595ac80043..161beec0b6b0 100644
@@ -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
index 0904cb0309ae..34194745f79e 100644
@@ -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
index ad7360c83048..626042fce7e2 100644
@@ -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
index e753cfdac697..f91fc69905b8 100644
@@ -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
#2 lore raw

PATCH v2 2/2 arm64: dts: marvell: drop additional phy-names for sata

In reply to Frank Wunderlich

From: 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
index fe5d6cb9d692..9d45e881a97d 100644
@@ -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
index 5043cf2eb33e..0d4a5fd9503f 100644
@@ -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
maintainer
#3 lore raw
In reply to Frank Wunderlich
Quoted 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