summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2018-11-16 11:00:50 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-12-11 08:11:52 +0100
commit07a8f35650e711666cf42f4962792d87b3b39b09 (patch)
tree45357c97a7a926f3858070610c5b77bc4834e2c0 /arch/arm/boot
parent1865142fd6a9dff221ace05fcbd704b5d86523df (diff)
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 <philippe.schenker@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi12
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi12
2 files changed, 24 insertions, 0 deletions
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 26525e24a6c7..fa80f7a88f31 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
@@ -290,6 +290,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 {
@@ -371,6 +377,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;
@@ -380,6 +388,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 40e4d2e3394f..5ebb5f8b4f8a 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi
@@ -268,6 +268,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 {
@@ -341,6 +347,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;
@@ -350,6 +358,10 @@
&uart4 {
status = "okay";
+ /*
+ * note that uart4 is also depending on pinctrl_uart24_forceoff that is
+ * already defined in &uart2
+ */
};
&uart5 {