On Fri, Jul 12, 2024 at 10:29:22AM -0400, Frank Li wrote:
> 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-frwy.dtb: /soc/sata@3200000: failed to match any schema with compatible: ['fsl,ls1012a-ahci', 'fsl,ls1043a-ahci']
>
> Signed-off-by: Frank Li <Frank.Li@xxxxxxx>
> ---
> Change from v1 to v2
> - rework commit message to show fix CHECK_DTB warning.
> ---
> .../devicetree/bindings/ata/fsl,ahci.yaml | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/ata/fsl,ahci.yaml b/Documentation/devicetree/bindings/ata/fsl,ahci.yaml
> index 162b3bb5427ed..a244bc603549d 100644
> --- a/Documentation/devicetree/bindings/ata/fsl,ahci.yaml
> +++ b/Documentation/devicetree/bindings/ata/fsl,ahci.yaml
> @@ -11,13 +11,18 @@ maintainers:
>
> properties:
> compatible:
> - enum:
> - - fsl,ls1021a-ahci
> - - fsl,ls1043a-ahci
> - - fsl,ls1028a-ahci
> - - fsl,ls1088a-ahci
> - - fsl,ls2080a-ahci
> - - fsl,lx2160a-ahci
> + oneOf:
> + - items:
> + - const: fsl,ls1012a-ahci
> + - const: fsl,ls1043a-ahci
> + - enum:
> + - fsl,ls1021a-ahci
> + - fsl,ls1043a-ahci
> + - fsl,ls1046a-ahci
> + - fsl,ls1028a-ahci
> + - fsl,ls1088a-ahci
> + - fsl,ls2080a-ahci
> + - fsl,lx2160a-ahci
I think that you should add the following Fixes-tag:
Fixes: e58e12c5c34c ("dt-bindings: ata: ahci-fsl-qoriq: convert to yaml format")
Considering that the commit that your are fixing is only in libata for-6.11,
and has thus never been in a released kernel version, perhaps the following
patch would be better (if it also solves the warnings):
diff --git a/Documentation/devicetree/bindings/ata/fsl,ahci.yaml b/Documentation/devicetree/bindings/ata/fsl,ahci.yaml
index 162b3bb5427e..8953b1847305 100644
--- a/Documentation/devicetree/bindings/ata/fsl,ahci.yaml
+++ b/Documentation/devicetree/bindings/ata/fsl,ahci.yaml
@@ -12,8 +12,10 @@ maintainers:
properties:
compatible:
enum:
+ - fsl,ls1012a-ahci
- fsl,ls1021a-ahci
- fsl,ls1043a-ahci
+ - fsl,ls1046a-ahci
- fsl,ls1028a-ahci
- fsl,ls1088a-ahci
- fsl,ls2080a-ahci
This assumes that we can get the patch included before 6.11 final is released,
but considering that the merge window hasn't even opened yet, that should be
doable.
Thoughts from DT maintainers?
Kind regards,
Niklas
