arm64: dts: imx8mp-var-som: Move USDHC2 support to Symphony carrier

The VAR-SOM-MX8MP module does not include a microSD slot connected to
USDHC2. The USDHC2 interface is routed only on the Symphony carrier
board, and it may optionally be used or omitted depending on the
customer's carrier design.

Move the USDHC2 node, its regulators, pinctrl groups and related GPIOs
from the SOM device tree to the Symphony carrier DTS, keeping the SOM
description limited to hardware populated on the module.

Signed-off-by: Stefano Radaelli <stefano.r@variscite.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts b/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
index 36d3eb8652023446f7eb7d37aece6c3cd3560571..ea3c193bb684125de72fdcba257bff4d2a1d1892 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
@@ -8,4 +8,81 @@
 / {
        model = "Variscite VAR-SOM-MX8M-PLUS on Symphony-Board";
        compatible = "variscite,var-som-mx8mp-symphony", "variscite,var-som-mx8mp", "fsl,imx8mp";
+
+       reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
+               compatible = "regulator-fixed";
+               regulator-name = "VSD_3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               startup-delay-us = <100>;
+               off-on-delay-us = <12000>;
+       };
+
+       reg_usdhc2_vqmmc: regulator-usdhc2-vqmmc {
+               compatible = "regulator-gpio";
+               regulator-name = "VSD_VSEL";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <3300000>;
+               gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
+               states = <3300000 0x0 1800000 0x1>;
+               vin-supply = <&ldo5>;
+       };
+};
+
+/* SD-card */
+&usdhc2 {
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
+       pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
+       pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
+       cd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+       vmmc-supply = <&reg_usdhc2_vmmc>;
+       vqmmc-supply = <&reg_usdhc2_vqmmc>;
+       bus-width = <4>;
+       status = "okay";
+};
+
+&iomuxc {
+       pinctrl_usdhc2_gpio: usdhc2-gpiogrp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_GPIO1_IO14__GPIO1_IO14                             0x1c4
+                       MX8MP_IOMUXC_SAI2_RXC__GPIO4_IO22                               0x10
+                       MX8MP_IOMUXC_SD2_CD_B__GPIO2_IO12                               0xc0
+               >;
+       };
+
+       pinctrl_usdhc2: usdhc2grp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_SD2_CLK__USDHC2_CLK                                0x190
+                       MX8MP_IOMUXC_SD2_CMD__USDHC2_CMD                                0x1d0
+                       MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0                            0x1d0
+                       MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1                            0x1d0
+                       MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2                            0x1d0
+                       MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3                            0x1d0
+               >;
+       };
+
+       pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_SD2_CLK__USDHC2_CLK                                0x194
+                       MX8MP_IOMUXC_SD2_CMD__USDHC2_CMD                                0x1d4
+                       MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0                            0x1d4
+                       MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1                            0x1d4
+                       MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2                            0x1d4
+                       MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3                            0x1d4
+               >;
+       };
+
+       pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_SD2_CLK__USDHC2_CLK                                0x196
+                       MX8MP_IOMUXC_SD2_CMD__USDHC2_CMD                                0x1d6
+                       MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0                            0x1d6
+                       MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1                            0x1d6
+                       MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2                            0x1d6
+                       MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3                            0x1d6
+               >;
+       };
 };

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
index 29f080904482c53c0d04321d53135b51e7fc24c5..949d9878f395d5efc0c7988abdbf8d5d4cf475e6 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
@@ -35,27 +35,6 @@
                      <0x1 0x00000000 0 0xc0000000>;
        };
 
-       reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
-               compatible = "regulator-fixed";
-               regulator-name = "VSD_3V3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               startup-delay-us = <100>;
-               off-on-delay-us = <12000>;
-       };
-
-       reg_usdhc2_vqmmc: regulator-usdhc2-vqmmc {
-               compatible = "regulator-gpio";
-               regulator-name = "VSD_VSEL";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <3300000>;
-               gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
-               states = <3300000 0x0 1800000 0x1>;
-               vin-supply = <&ldo5>;
-       };
-
        reg_phy_supply: regulator-phy-supply {
                compatible = "regulator-fixed";
                regulator-name = "phy-supply";
@@ -271,19 +250,6 @@
         status = "okay";
 };
 
-/* SD-card */
-&usdhc2 {
-        pinctrl-names = "default", "state_100mhz", "state_200mhz";
-        pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>;
-        pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>;
-        pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
-        cd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
-        vmmc-supply = <&reg_usdhc2_vmmc>;
-       vqmmc-supply = <&reg_usdhc2_vqmmc>;
-        bus-width = <4>;
-        status = "okay";
-};
-
 /* eMMC */
 &usdhc3 {
        pinctrl-names = "default", "state_100mhz", "state_200mhz";
@@ -358,47 +324,6 @@
                >;
        };
 
-       pinctrl_usdhc2_gpio: usdhc2-gpiogrp {
-               fsl,pins = <
-                       MX8MP_IOMUXC_GPIO1_IO14__GPIO1_IO14                             0x1c4
-                       MX8MP_IOMUXC_SAI2_RXC__GPIO4_IO22                               0x10
-                       MX8MP_IOMUXC_SD2_CD_B__GPIO2_IO12                               0xc0
-               >;
-       };
-
-       pinctrl_usdhc2: usdhc2grp {
-               fsl,pins = <
-                       MX8MP_IOMUXC_SD2_CLK__USDHC2_CLK                                0x190
-                       MX8MP_IOMUXC_SD2_CMD__USDHC2_CMD                                0x1d0
-                       MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0                            0x1d0
-                       MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1                            0x1d0
-                       MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2                            0x1d0
-                       MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3                            0x1d0
-               >;
-       };
-
-       pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
-               fsl,pins = <
-                       MX8MP_IOMUXC_SD2_CLK__USDHC2_CLK                                0x194
-                       MX8MP_IOMUXC_SD2_CMD__USDHC2_CMD                                0x1d4
-                       MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0                            0x1d4
-                       MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1                            0x1d4
-                       MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2                            0x1d4
-                       MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3                            0x1d4
-               >;
-       };
-
-       pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
-               fsl,pins = <
-                       MX8MP_IOMUXC_SD2_CLK__USDHC2_CLK                                0x196
-                       MX8MP_IOMUXC_SD2_CMD__USDHC2_CMD                                0x1d6
-                       MX8MP_IOMUXC_SD2_DATA0__USDHC2_DATA0                            0x1d6
-                       MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1                            0x1d6
-                       MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2                            0x1d6
-                       MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3                            0x1d6
-               >;
-       };
-
        pinctrl_usdhc3: usdhc3grp {
                fsl,pins = <
                        MX8MP_IOMUXC_NAND_WE_B__USDHC3_CLK                              0x190