diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2021-08-30 21:23:32 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2021-09-07 16:59:23 +0200 |
commit | b63ccfe5e49306c8570b5e0bb99ef71362f5f28d (patch) | |
tree | b13688bcbb5cb4695b58f8374afd70ec7697266e | |
parent | 75e357e5be10c9f3e76c5061dc999e54d6ffa893 (diff) |
arm: dts: colibri-imx6: iris-v2: uart transceiver force off handling
Introduce GPIO hogs uart_a_on_x13_enable and uart_b_c_on_x14_enable
rather than the uart1_forceoff and uart23_forceoff pinmuxings.
While at it also sort the nodes alphabethically and update the copyright
period.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts b/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts index 4210db1b74ea..73b421ff1658 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ OR X11 /* - * Copyright 2018-2019 Toradex + * Copyright 2018-2021 Toradex */ /dts-v1/; @@ -49,6 +49,27 @@ }; }; +&gpio2 { + /* + * uart_a_on_x13_enable turns the UART transceiver for UART_A on. If one + * wants to turn the transceiver off, that property has to be deleted + * and the gpio handled in userspace. + * The same applies to uart_b_c_on_x14_enable where the UART_B and + * UART_C transceiver is turned on. + */ + uart_a_on_x13_enable { + gpio-hog; + gpios = <4 GPIO_ACTIVE_HIGH>; /* SODIMM 102 */ + output-high; + }; + + uart_b_c_on_x14_enable { + gpio-hog; + gpios = <8 GPIO_ACTIVE_HIGH>; /* SODIMM 104 */ + output-high; + }; +}; + /* * I2C: I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier * board) @@ -94,25 +115,16 @@ /* Colibri UART_A */ &uart1 { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl - &pinctrl_uart1_forceoff>; }; /* Colibri UART_B */ &uart2 { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart2_dte &pinctrl_uart23_forceoff>; }; /* Colibri UART_C */ &uart3 { status = "okay"; - /* - * Note that UART3 is on the same tranceiver as UART2 and this needs - * to be enabled with the pinmuxing &pinctrl_uart23_forceoff - */ }; &usbh1 { @@ -184,20 +196,6 @@ }; }; - uart { - pinctrl_uart1_forceoff: uart1_forceoff { - fsl,pins = < - MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x1b0b0 - >; - }; - - pinctrl_uart23_forceoff: uart23_forceoff { - fsl,pins = < - MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x1b0b0 - >; - }; - }; - usdhc { pinctrl_enable_3v3_vmmc: enable_3v3_vmmc { fsl,pins = < |