arm64: dts: marvell: only enable complete sata nodes

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.

Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index 1e0ab35cc686b018df96978c17f838ac7f76d52b..2b5e45d2c5a6f1f654dc85a4039f809470c1994b 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -214,6 +214,7 @@
 
        sata-port@1 {
                phys = <&cp0_comphy3 1>;
+               status = "okay";
        };
 };
 

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
index 7af949092b913428f9d5bf8cff9fa252f1f71d4a..6bdc4f1e693957994f6d5f53c07897747602f9e3 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
@@ -433,11 +433,13 @@
        /* 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";
        };
 };
 

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 7005a32a6e1e78d5fe059488978769058149b336..225a54ab688dc3db64dfe94fe124a1d18e5fd908 100644 (file)
--- 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,6 +475,7 @@
 
        sata-port@1 {
                phys = <&cp1_comphy0 1>;
+               status = "okay";
        };
 };
 

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 2ec19d364e626e009d73708b3a0f0d2b88a5d853..fe5d6cb9d6923e2749551b0cf77f9eb7e923b101 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -145,9 +145,12 @@
 
        sata-port@0 {
                phys = <&cp0_comphy1 0>;
+               status = "okay";
        };
+
        sata-port@1 {
                phys = <&cp0_comphy3 1>;
+               status = "okay";
        };
 };
 

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
index e88ff5b179c89a5dc92801d869ff45b051865c11..5043cf2eb33e0746fe9b235562120c76f6b17dd7 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@ -245,6 +245,7 @@
        /* CPM Lane 5 - U29 */
        sata-port@1 {
                phys = <&cp0_comphy5 1>;
+               status = "okay";
        };
 };
 

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 3e5e0651ce6815fffc8d451babbee7f67077fcae..9c25a88581e428917695551625ff68705788130b 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
@@ -408,10 +408,12 @@
 
        sata-port@0 {
                phys = <&cp0_comphy2 0>;
+               status = "okay";
        };
 
        sata-port@1 {
                phys = <&cp0_comphy5 1>;
+               status = "okay";
        };
 };
 

diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
index 7e595ac80043aa18ed742a13c97f5e74aa0e05b2..161beec0b6b062e5d172855757cfacfc539c693c 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
@@ -347,10 +347,12 @@
 
                        sata-port@0 {
                                reg = <0>;
+                               status = "disabled";
                        };
 
                        sata-port@1 {
                                reg = <1>;
+                               status = "disabled";
                        };
                };
 

diff --git a/arch/arm64/boot/dts/marvell/cn9130-crb-B.dts b/arch/arm64/boot/dts/marvell/cn9130-crb-B.dts
index 0904cb0309ae74b71edd660803cf4402c9fcc92e..34194745f79e9d36732fe3dde3f714a2d658706a 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9130-crb-B.dts
+++ b/arch/arm64/boot/dts/marvell/cn9130-crb-B.dts
@@ -28,6 +28,7 @@
                status = "okay";
                /* Generic PHY, providing serdes lanes */
                phys = <&cp0_comphy2 0>;
+               status = "okay";
        };
 };
 

diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
index ad7360c830486bf30854e5885e0d95c1b4260169..626042fce7e2468d6504e17532b369bb7ea06bc5 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
@@ -127,6 +127,7 @@
        sata-port@1 {
                /* Generic PHY, providing serdes lanes */
                phys = <&cp1_comphy5 1>;
+               status = "okay";
        };
 };
 

diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
index e753cfdac697330512f6c46c2b656dd57768b2c5..f91fc69905b881ae216562f5c64a43d7e50e523e 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi
@@ -175,6 +175,7 @@
        sata-port@0 {
                /* Generic PHY, providing serdes lanes */
                phys = <&cp2_comphy2 0>;
+               status = "okay";
        };
 };