arm64: dts: imx95-tqma9596sa: move USDHC2 config to SOM

The muxing and other features are mostly determined by SOM,
so add it at this level.

Signed-off-by: Markus Niebel <Markus.Niebel@ew.tq-group.com>
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts b/arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts
index 43ed55e57d2a389173f26edf3a2e66117ba75021..02bbaaf298930ae54c6fdc12b3dd62efa19a68e4 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts
+++ b/arch/arm64/boot/dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts
@@ -301,17 +301,7 @@
 
 /* X16 */
 &usdhc2 {
-       pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
-       pinctrl-0 = <&pinctrl_usdhc2>;
-       pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
-       pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
-       pinctrl-3 = <&pinctrl_usdhc2>;
-       vmmc-supply = <&reg_sdvmmc>;
-       cd-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
-       no-1-8-v;
        no-mmc;
        no-sdio;
-       disable-wp;
-       bus-width = <4>;
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi b/arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi
index 8da9e368c1f4dadd7bf3025e2afa42486cda0a6b..166439e251c53fb00d2987dd33c177cbf584e80d 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi
@@ -453,6 +453,18 @@
        status = "okay";
 };
 
+&usdhc2 {
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
+       pinctrl-0 = <&pinctrl_usdhc2>;
+       pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
+       vmmc-supply = <&reg_sdvmmc>;
+       cd-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+       no-1-8-v;
+       disable-wp;
+       bus-width = <4>;
+};
+
 &wdog3 {
        status = "okay";
 };