From 09dedcf8e8301c81290944fec7f46498a6057fb6 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 30 Aug 2021 21:25:46 +0200 Subject: arm: dts: colibri-imx7: iris-v2: uart transceiver force off handling Rename GPIO hogs uart1_forceoff and uart23_forceoff to uart_a_on_x13_enable and uart_b_c_on_x14_enable. While at it also sort the nodes alphabethically, update the copyright period and remove an exess space in the extcon definition. Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | 78 ++++++++++++++--------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi index 6e43dba34544..f2ebe9f53f91 100644 --- a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* - * Copyright 2018-2020 Toradex + * Copyright 2018-2021 Toradex */ #include @@ -10,6 +10,14 @@ bootargs = "console=ttymxc0,115200"; }; + extcon_usbc_det: usbc_det { + compatible = "linux,extcon-usb-gpio"; + debounce = <25>; + id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbc_det>; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; @@ -34,12 +42,11 @@ enable-active-high; }; - extcon_usbc_det: usbc_det { - compatible = "linux,extcon-usb-gpio"; - debounce = <25>; - id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbc_det>; + reg_5v0: regulator-5v0 { + compatible = "regulator-fixed"; + regulator-name = "5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; }; reg_usbh_vbus: regulator-usbh-vbus { @@ -52,13 +59,6 @@ gpio = <&gpio4 7 GPIO_ACTIVE_LOW>; vin-supply = <®_5v0>; }; - - reg_5v0: regulator-5v0 { - compatible = "regulator-fixed"; - regulator-name = "5V"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; }; &adc1 { @@ -77,6 +77,29 @@ status = "okay"; }; +&gpio2 { + /* + * uart_b_c_on_x14_enable turns the UART transceiver for UART_B and + * UART_C 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_a_on_x13_enable where the UART_A + * transceiver is turned on. + */ + uart_b_c_on_x14_enable { + gpio-hog; + gpios = <27 GPIO_ACTIVE_HIGH>; /* SODIMM 104 */ + output-high; + }; +}; + +&gpio5 { + uart_a_on_x13_enable { + gpio-hog; + gpios = <17 GPIO_ACTIVE_HIGH>; /* SODIMM 102 */ + output-high; + }; +}; + &i2c4 { status = "okay"; @@ -116,34 +139,11 @@ }; &usbotg1 { - extcon = <&extcon_usbc_det>, <&extcon_usbc_det>; + extcon = <&extcon_usbc_det>, <&extcon_usbc_det>; vbus-supply = <®_usbh_vbus>; status = "okay"; }; -&gpio2 { - /* - * uart25 turns the UART transceiver for UART2 and 5 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 uart1_tx_on and lvds_tx_on, where the UART / LVDS - * transceiver is turned on. - */ - uart25_tx_on { - gpio-hog; - gpios = <27 0>; /* SODIMM 104 */ - output-high; - }; -}; - -&gpio5 { - uart1_tx_on { - gpio-hog; - gpios = <17 0>; /* SODIMM 102 */ - output-high; - }; -}; - /* The define SD_1_8 allows to use the SD interface at a higher speed mode * if the card supports it. For this the signaling voltage is switched from * 3.3V to 1.8V under the usdhc1's drivers control. @@ -196,6 +196,4 @@ MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x0 /* CD */ >; }; - }; - -- cgit v1.2.3