]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ARM: dts: imx6sl: Remove incorrect mmc fallback compatible
authorFabio Estevam <festevam@denx.de>
Wed, 23 Oct 2024 19:26:37 +0000 (16:26 -0300)
committerShawn Guo <shawnguo@kernel.org>
Fri, 1 Nov 2024 10:11:17 +0000 (18:11 +0800)
Per fsl-imx-esdhc.yaml, the correct compatible string for i.MX6SL is:

compatible = "fsl,imx6sl-usdhc"

Remove the undocumented "fsl,imx6q-usdhc" fallback compatible.

This fixes the following dt-schema warnings:

mmc@2190000: compatible: 'oneOf' conditional failed, one must be fixed:
['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too long
['fsl,imx6sl-usdhc', 'fsl,imx6q-usdhc'] is too short
'fsl,imx50-esdhc' was expected
...

Signed-off-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/nxp/imx/imx6sl.dtsi

index 96f3c6b9e4853e128aeded411e7819c8d6e30174..1676d689c355876d67a62f42108427d9ec8d07a7 100644 (file)
                        };
 
                        usdhc1: mmc@2190000 {
-                               compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+                               compatible = "fsl,imx6sl-usdhc";
                                reg = <0x02190000 0x4000>;
                                interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SL_CLK_USDHC1>,
                        };
 
                        usdhc2: mmc@2194000 {
-                               compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+                               compatible = "fsl,imx6sl-usdhc";
                                reg = <0x02194000 0x4000>;
                                interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SL_CLK_USDHC2>,
                        };
 
                        usdhc3: mmc@2198000 {
-                               compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+                               compatible = "fsl,imx6sl-usdhc";
                                reg = <0x02198000 0x4000>;
                                interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SL_CLK_USDHC3>,
                        };
 
                        usdhc4: mmc@219c000 {
-                               compatible = "fsl,imx6sl-usdhc", "fsl,imx6q-usdhc";
+                               compatible = "fsl,imx6sl-usdhc";
                                reg = <0x0219c000 0x4000>;
                                interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SL_CLK_USDHC4>,