arm64: dts: freescale: imx8mp-toradex-smarc: fix lvds dsi mux gpio

[ Upstream commit 29d34c678cf82341cb0bedb3179d59c56856a80f ]

The MUX which either outputs DSI or 2nd channel LVDS signals is part of
the SoM. Move the pinmuxing of the GPIO used for controlling the MUX
to the SoM dtsi file.

Fixes: 97dc91c04558 ("arm64: dts: freescale: add Toradex SMARC iMX8MP")
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc-dev.dts b/arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc-dev.dts
index 55b8c5c14fb4f3e7407243760ac01b0aca0dacf5..d5fa9a8d414ec8d6f4710e95fccfe8983f24d406 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc-dev.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc-dev.dts
@@ -102,11 +102,6 @@
                    <&pinctrl_gpio13>;
 };
 
-&gpio3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_lvds_dsi_sel>;
-};
-
 &gpio4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpio4>, <&pinctrl_gpio6>;

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc.dtsi
index 22f6daabdb90a2a3b828fcca9396edf9a207f7c3..11fd5360ab90409f5e7e8ab0a1c0f721d4654b00 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-toradex-smarc.dtsi
@@ -320,6 +320,8 @@
 };
 
 &gpio3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_lvds_dsi_sel>;
        gpio-line-names = "ETH_0_INT#", /* 0 */
                          "SLEEP#",
                          "",