From 85483bb2da5af338e689c4aa69a5ef6e911cf0ef Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Fri, 16 Nov 2018 11:00:50 +0100 Subject: ARM: dts: imx6: add missing uart transceiver enable pinmux This adds the enable-pin to uart2 that controls the transceiver for uart2/4. Signed-off-by: Philippe Schenker Acked-by: Marcel Ziswiler (cherry picked from commit 07a8f35650e711666cf42f4962792d87b3b39b09) --- arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 12 ++++++++++++ arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi index 85e9d4d440a4..56d1fa31dd2d 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi @@ -292,6 +292,12 @@ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 PAD_CTRL_HYS_PU >; }; + + pinctrl_uart24_forceoff: uart24_forceoff { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__GPIO1_IO11 PAD_CTRL_HYS_PU + >; + }; }; &lcd { @@ -373,6 +379,8 @@ &uart2 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2_dte &pinctrl_uart24_forceoff>; #if 0 linux,rs485-enabled-at-boot-time; rs485-rts-active-low; @@ -382,6 +390,10 @@ &uart4 { status = "okay"; + /* + * note that uart4 is only working with pinctrl_uart24_forceoff that is + * already defined in &uart2 + */ }; &uart5 { diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi index 9f7f6e705233..917dabdecb6d 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi @@ -270,6 +270,12 @@ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 PAD_CTRL_HYS_PU >; }; + + pinctrl_uart24_forceoff: uart24_forceoff { + fsl,pins = < + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 PAD_CTRL_HYS_PU + >; + }; }; &lcd { @@ -343,6 +349,8 @@ &uart2 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2_dte &pinctrl_uart24_forceoff>; #if 0 linux,rs485-enabled-at-boot-time; rs485-rts-active-low; @@ -352,6 +360,10 @@ &uart4 { status = "okay"; + /* + * note that uart4 is also depending on pinctrl_uart24_forceoff that is + * already defined in &uart2 + */ }; &uart5 { -- cgit v1.2.3