ARM: dts: imx6sx: Remove incorrect mmc fallback compatible

Per fsl-imx-esdhc.yaml, the correct compatible string for i.MX6SX is:

compatible = "fsl,imx6sx-usdhc"

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

This fixes the following dt-schema warnings:

mmc@2198000: 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 <[email protected]>
Signed-off-by: Shawn Guo <[email protected]>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
index b386448486df80a033efbad38c37a4dd04ee1caa..a94bebaa858a2e893ce7dc9d93034de0e4d32de5 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
@@ -998,7 +998,7 @@
                        };
 
                        usdhc1: mmc@2190000 {
-                               compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+                               compatible = "fsl,imx6sx-usdhc";
                                reg = <0x02190000 0x4000>;
                                interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_USDHC1>,
@@ -1012,7 +1012,7 @@
                        };
 
                        usdhc2: mmc@2194000 {
-                               compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+                               compatible = "fsl,imx6sx-usdhc";
                                reg = <0x02194000 0x4000>;
                                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_USDHC2>,
@@ -1026,7 +1026,7 @@
                        };
 
                        usdhc3: mmc@2198000 {
-                               compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+                               compatible = "fsl,imx6sx-usdhc";
                                reg = <0x02198000 0x4000>;
                                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_USDHC3>,
@@ -1040,7 +1040,7 @@
                        };
 
                        usdhc4: mmc@219c000 {
-                               compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+                               compatible = "fsl,imx6sx-usdhc";
                                reg = <0x0219c000 0x4000>;
                                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_USDHC4>,