Skip to contentSkip to conversation

dt-bindings: ata: ahci-fsl-qoriq: add fsl,ls1046a-ahci and fsl,ls1012a-ahci

PATCH Applied Frank Li 2 participants 5 messages Jul 12, 2024

Subsystems (3)
lore
Share & tools
lore

Frank Li

author maintainer
#0 lore raw

PATCH v3 1/1 dt-bindings: ata: ahci-fsl-qoriq: add fsl,ls1046a-ahci and fsl,ls1012a-ahci

Add missing documented compatible strings 'fsl,ls1046a-ahci' and 'fsl,ls1012a-ahci'. Allow 'fsl,ls1012a-ahci' to fallback to 'fsl,ls1043a-ahci'.

Fix below CHECK_DTB warnings
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible:0: 'fsl,ls1012a-ahci' is not one of ['fsl,ls1021a-ahci', 'fsl,ls1043a-ahci', 'fsl,ls1028a-ahci', 'fsl,ls1088a-ahci', 'fsl,ls2080a-ahci', 'fsl,lx2160a-ahci'] arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible: ['fsl,ls1012a-ahci', 'fsl,ls1043a-ahci'] is too long

Fixes e58e12c5c34c ("dt-bindings: ata: ahci-fsl-qoriq: convert to yaml format")

---
Change from v2 to v3
- Add rob's review tag
- Sort compatible string list
- Add fix tag
- Add two warnings in commit message.
- Add - description: sata controller for ls1012a

Change from v1 to v2
- rework commit message to show fix CHECK_DTB warning.

---
 .../devicetree/bindings/ata/fsl,ahci.yaml     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/ata/fsl,ahci.yaml +13 -7
index 162b3bb5427ed..b58ea5a183082 100644
@@ -11,13 +11,19 @@ maintainers:
 
 properties:
   compatible:
-    enum:
-      - fsl,ls1021a-ahci
-      - fsl,ls1043a-ahci
-      - fsl,ls1028a-ahci
-      - fsl,ls1088a-ahci
-      - fsl,ls2080a-ahci
-      - fsl,lx2160a-ahci
+    oneOf:
+      - description: sata controller for ls1012a
+        items:
+          - const: fsl,ls1012a-ahci
+          - const: fsl,ls1043a-ahci
+      - enum:
+          - fsl,ls1021a-ahci
+          - fsl,ls1028a-ahci
+          - fsl,ls1043a-ahci
+          - fsl,ls1046a-ahci
+          - fsl,ls1088a-ahci
+          - fsl,ls2080a-ahci
+          - fsl,lx2160a-ahci
 
   reg:
     minItems: 1
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 7 lines · Frank Li

Add missing documented compatible strings 'fsl,ls1046a-ahci' and 'fsl,ls1012a-ahci'. Allow 'fsl,ls1012a-ahci' to fallback to 'fsl,ls1043a-ahci'.

Fix below CHECK_DTB warnings
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible:0: 'fsl,ls1012a-ahci' is not one of ['fsl,ls1021a-ahci', 'fsl,ls1043a-ahci', 'fsl,ls1028a-ahci', 'fsl,ls1088a-ahci', 'fsl,ls2080a-ahci', 'fsl,lx2160a-ahci'] arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible: ['fsl,ls1012a-ahci', 'fsl,ls1043a-ahci'] is too long

These lines should have been wrapped to 75 lines IMO. I will fixup when applying.

Quoted 25 lines
Fixes e58e12c5c34c ("dt-bindings: ata: ahci-fsl-qoriq: convert to yaml format")

---
Change from v2 to v3
- Add rob's review tag
- Sort compatible string list
- Add fix tag
- Add two warnings in commit message.
- Add - description: sata controller for ls1012a

Change from v1 to v2
- rework commit message to show fix CHECK_DTB warning.

---
 .../devicetree/bindings/ata/fsl,ahci.yaml     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/ata/fsl,ahci.yaml +0 -0
index 162b3bb5427ed..b58ea5a183082 100644
@@ -11,13 +11,19 @@ maintainers:
 
 properties:

Documentation/devicetree/bindings/ata/fsl,ahci.yaml maintainers: · line 15

Quoted 10 lines
Documentation/devicetree/bindings/ata/fsl,ahci.yaml +2 -7
   compatible:
-    enum:
-      - fsl,ls1021a-ahci
-      - fsl,ls1043a-ahci
-      - fsl,ls1028a-ahci
-      - fsl,ls1088a-ahci
-      - fsl,ls2080a-ahci
-      - fsl,lx2160a-ahci
+    oneOf:
+      - description: sata controller for ls1012a

SATA should have been capitalized.
I will fixup when applying.

Kind regards,
Niklas

author maintainer
#2 lore raw
Quoted 11 lines · Niklas Cassel
Quoted 7 lines · Frank Li

Add missing documented compatible strings 'fsl,ls1046a-ahci' and 'fsl,ls1012a-ahci'. Allow 'fsl,ls1012a-ahci' to fallback to 'fsl,ls1043a-ahci'.

Fix below CHECK_DTB warnings
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible:0: 'fsl,ls1012a-ahci' is not one of ['fsl,ls1021a-ahci', 'fsl,ls1043a-ahci', 'fsl,ls1028a-ahci', 'fsl,ls1088a-ahci', 'fsl,ls2080a-ahci', 'fsl,lx2160a-ahci'] arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible: ['fsl,ls1012a-ahci', 'fsl,ls1043a-ahci'] is too long

These lines should have been wrapped to 75 lines IMO. I will fixup when applying.

Thanks, according to my knowledge, computer generate warning, error, log... doesn't require wrap.

It may impact my other patch. just want to make clear about this.

Frank

Quoted 43 lines
Quoted 26 lines
Fixes e58e12c5c34c ("dt-bindings: ata: ahci-fsl-qoriq: convert to yaml format")

---
Change from v2 to v3
- Add rob's review tag
- Sort compatible string list
- Add fix tag
- Add two warnings in commit message.
- Add - description: sata controller for ls1012a

Change from v1 to v2
- rework commit message to show fix CHECK_DTB warning.

---
 .../devicetree/bindings/ata/fsl,ahci.yaml     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/ata/fsl,ahci.yaml +0 -0
index 162b3bb5427ed..b58ea5a183082 100644
@@ -11,13 +11,19 @@ maintainers:
 
 properties:

Documentation/devicetree/bindings/ata/fsl,ahci.yaml maintainers: · line 15

Quoted 10 lines
Documentation/devicetree/bindings/ata/fsl,ahci.yaml +2 -7
   compatible:
-    enum:
-      - fsl,ls1021a-ahci
-      - fsl,ls1043a-ahci
-      - fsl,ls1028a-ahci
-      - fsl,ls1088a-ahci
-      - fsl,ls2080a-ahci
-      - fsl,lx2160a-ahci
+    oneOf:
+      - description: sata controller for ls1012a

SATA should have been capitalized.
I will fixup when applying.

Kind regards,
Niklas

maintainer
#3 lore raw
Quoted 10 lines · Frank Li
Quoted 9 lines · Niklas Cassel
Quoted 7 lines · Frank Li

Add missing documented compatible strings 'fsl,ls1046a-ahci' and 'fsl,ls1012a-ahci'. Allow 'fsl,ls1012a-ahci' to fallback to 'fsl,ls1043a-ahci'.

Fix below CHECK_DTB warnings
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible:0: 'fsl,ls1012a-ahci' is not one of ['fsl,ls1021a-ahci', 'fsl,ls1043a-ahci', 'fsl,ls1028a-ahci', 'fsl,ls1088a-ahci', 'fsl,ls2080a-ahci', 'fsl,lx2160a-ahci'] arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible: ['fsl,ls1012a-ahci', 'fsl,ls1043a-ahci'] is too long

Quoted 5 lines
Quoted 2 lines

These lines should have been wrapped to 75 lines IMO. I will fixup when applying.

Thanks, according to my knowledge, computer generate warning, error, log... doesn't require wrap.

Yes, that is correct, especially for critical things like a kernel oops etc.

In this case, I don't think a simple CHECK_DTB warning is critical enough to warrant keeping a line length of 232 columns, but I agree that 'critical enough' is subjective.

Kind regards,
Niklas

maintainer Applied
#4 lore raw
In reply to Frank Li
Quoted 9 lines · Frank Li

Add missing documented compatible strings 'fsl,ls1046a-ahci' and 'fsl,ls1012a-ahci'. Allow 'fsl,ls1012a-ahci' to fallback to 'fsl,ls1043a-ahci'.

Fix below CHECK_DTB warnings
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible:0: 'fsl,ls1012a-ahci' is not one of ['fsl,ls1021a-ahci', 'fsl,ls1043a-ahci', 'fsl,ls1028a-ahci', 'fsl,ls1088a-ahci', 'fsl,ls2080a-ahci', 'fsl,lx2160a-ahci'] arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: sata@3200000: compatible: ['fsl,ls1012a-ahci', 'fsl,ls1043a-ahci'] is too long

[...]

Applied to libata/linux.git (for-6.11), thanks!

[1/1] dt-bindings: ata: ahci-fsl-qoriq: add fsl,ls1046a-ahci and fsl,ls1012a-ahci

      https://git.kernel.org/libata/linux/c/6739fad4

Kind regards,
Niklas