diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-18 20:19:22 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-18 20:52:00 +0200 |
| commit | a6779cc2f41e0d08261aa315852223d84ee72645 (patch) | |
| tree | cea774e46cb10140da8d874047ea241d47c80249 | |
| parent | 07ef284395e74fad5f0a568261753bf35ef77aaf (diff) | |
Colibri iMX6 dtb: enable/fix UART A, UART C pinmuxing
UART A was lacking DCD/DSR/DTR muxing,
UART C pinmuxing was set for DCE.
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index 2bb587dd636f..b517f47beb3a 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -458,8 +458,7 @@ /* UART A */ &uart1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart1_3>; -// pinctrl-0 = <&pinctrl_uart1_3 &pinctrl_uart1_4>; + pinctrl-0 = <&pinctrl_uart1_3 &pinctrl_uart1_4>; #if 1 fsl,dte-mode; fsl,uart-has-rtscts; @@ -479,7 +478,7 @@ /* UART_C */ &uart3 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart3_3>; + pinctrl-0 = <&pinctrl_uart3_4>; fsl,dte-mode; status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 2315e0bcd641..40c88fa69b53 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -1815,6 +1815,12 @@ MX6QDL_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1 >; }; + pinctrl_uart3_4: uart3grp-4 { /* DTE mode */ + fsl,pins = < + MX6QDL_PAD_SD4_CLK__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_SD4_CMD__UART3_RX_DATA 0x1b0b1 + >; + }; }; uart4 { |