diff options
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | 128 |
1 files changed, 40 insertions, 88 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..190549461610 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 <dt-bindings/input/input.h> @@ -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,86 +139,15 @@ }; &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. - * All pins supplied with NVCC_SD1 must be able to cope with this - * and must (MUST!!!) not be driven with a voltage higher than 1.8V or - * the interface will not work. - */ -#define SD_1_8 &usdhc1 { -#ifdef SD_1_8 - pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; - pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_cd_usdhc1>; - pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_cd_usdhc1>; - pinctrl-3 = <&pinctrl_usdhc1_sleep &pinctrl_cd_usdhc1_sleep>; - vqmmc-supply = <®_LDO2>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; - sd-uhs-sdr104; -#else - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; - pinctrl-1 = <&pinctrl_usdhc1_sleep &pinctrl_cd_usdhc1_sleep>; - no-1-8-v; -#endif - cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; - disable-wp; - enable-sdio-wakeup; cap-power-off-card; - wakeup-source; + /delete-property/ keep-power-in-suspend; + /delete-property/ no-1-8-v; vmmc-supply = <®_3v3_vmmc>; status = "okay"; }; - -&iomuxc { - pinctrl_usdhc1_sleep: usdhc1-slp-grp { - fsl,pins = < - MX7D_PAD_SD1_CMD__SD1_CMD 0x10 - MX7D_PAD_SD1_CLK__SD1_CLK 0x10 - MX7D_PAD_SD1_DATA0__SD1_DATA0 0x10 - MX7D_PAD_SD1_DATA1__SD1_DATA1 0x10 - MX7D_PAD_SD1_DATA2__SD1_DATA2 0x10 - MX7D_PAD_SD1_DATA3__SD1_DATA3 0x10 - >; - }; - - pinctrl_cd_usdhc1_sleep: usdhc1-cd-slp-grp { - fsl,pins = < - MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x0 /* CD */ - >; - }; - -}; - |