From e58e12c5c34ce1f339e09825037a8c86956ff51c Mon Sep 17 00:00:00 2001 From: Frank Li Date: Mon, 17 Jun 2024 14:02:40 -0400 Subject: dt-bindings: ata: ahci-fsl-qoriq: convert to yaml format Convert ahci-fsl-qoirq DT binding to yaml format. Additional changes: - Add reg-names list, ahci and sata-ecc - Add fsl,ls1028a-ahci and fsl,lx2060a-ahci Signed-off-by: Frank Li Reviewed-by: Krzysztof Kozlowski Signed-off-by: Niklas Cassel --- .../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 21 -------- .../devicetree/bindings/ata/fsl,ahci.yaml | 58 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 21 deletions(-) delete mode 100644 Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt create mode 100644 Documentation/devicetree/bindings/ata/fsl,ahci.yaml (limited to 'Documentation/devicetree') diff --git a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt deleted file mode 100644 index 7c3ca0e13de0..000000000000 --- a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt +++ /dev/null @@ -1,21 +0,0 @@ -Binding for Freescale QorIQ AHCI SATA Controller - -Required properties: - - reg: Physical base address and size of the controller's register area. - - compatible: Compatibility string. Must be 'fsl,-ahci', where - chip could be ls1021a, ls1043a, ls1046a, ls1088a, ls2080a etc. - - clocks: Input clock specifier. Refer to common clock bindings. - - interrupts: Interrupt specifier. Refer to interrupt binding. - -Optional properties: - - dma-coherent: Enable AHCI coherent DMA operation. - - reg-names: register area names when there are more than 1 register area. - -Examples: - sata@3200000 { - compatible = "fsl,ls1021a-ahci"; - reg = <0x0 0x3200000 0x0 0x10000>; - interrupts = ; - clocks = <&platform_clk 1>; - dma-coherent; - }; diff --git a/Documentation/devicetree/bindings/ata/fsl,ahci.yaml b/Documentation/devicetree/bindings/ata/fsl,ahci.yaml new file mode 100644 index 000000000000..162b3bb5427e --- /dev/null +++ b/Documentation/devicetree/bindings/ata/fsl,ahci.yaml @@ -0,0 +1,58 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/ata/fsl,ahci.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Freescale QorIQ AHCI SATA Controller + +maintainers: + - Frank Li + +properties: + compatible: + enum: + - fsl,ls1021a-ahci + - fsl,ls1043a-ahci + - fsl,ls1028a-ahci + - fsl,ls1088a-ahci + - fsl,ls2080a-ahci + - fsl,lx2160a-ahci + + reg: + minItems: 1 + maxItems: 2 + + reg-names: + items: + - const: ahci + - const: sata-ecc + minItems: 1 + + clocks: + maxItems: 1 + + interrupts: + maxItems: 1 + + dma-coherent: true + +required: + - compatible + - reg + - clocks + - interrupts + +additionalProperties: false + +examples: + - | + #include + + sata@3200000 { + compatible = "fsl,ls1021a-ahci"; + reg = <0x3200000 0x10000>; + interrupts = ; + clocks = <&platform_clk 1>; + dma-coherent; + }; -- cgit v1.2.3 From 6739fad42af2e5eb87417283278a13a57f69c0de Mon Sep 17 00:00:00 2001 From: Frank Li Date: Fri, 12 Jul 2024 14:57:40 -0400 Subject: 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") Reviewed-by: Rob Herring Signed-off-by: Frank Li Link: https://lore.kernel.org/r/20240712185740.3819170-1-Frank.Li@nxp.com [cassel: rewrap commit log lines, capitalize SATA] Signed-off-by: Niklas Cassel --- Documentation/devicetree/bindings/ata/fsl,ahci.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'Documentation/devicetree') diff --git a/Documentation/devicetree/bindings/ata/fsl,ahci.yaml b/Documentation/devicetree/bindings/ata/fsl,ahci.yaml index 162b3bb5427e..ea4428bc1742 100644 --- a/Documentation/devicetree/bindings/ata/fsl,ahci.yaml +++ b/Documentation/devicetree/bindings/ata/fsl,ahci.yaml @@ -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 -- cgit v1.2.3