diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-06-11 14:35:58 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:45:45 +0100 |
| commit | 87eace5bea16a50bd21b4556c5de7d5c870fc724 (patch) | |
| tree | 140b1e311bea5032eea4b3233433ea6b426da4cb /arch/arm/boot/dts/imx6dl-colibri-aster.dts | |
| parent | d902761ca71e86d6d0eee4966e9d511107975e0b (diff) | |
ARM: dts (ds): imx6: Merge changes from toradex_4.9-2.3.x-imx-next
In 4.14 devicetress are based on the mainline DT's and only necessary
stuff for downstream is put into those devicetrees.
This commit holds the changes for imx6*(colibri|apalis)* from 4.9.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-colibri-aster.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-aster.dts | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts index ee0569efb711..f6fbd57b4f3d 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts @@ -46,7 +46,7 @@ debounce = <25>; id-gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbc_det_1>; + pinctrl-0 = <&pinctrl_usbc_det>; }; gpio-keys { @@ -62,12 +62,10 @@ gpio-key,wakeup; }; }; +}; - regulators { - reg_usb_host_vbus: usb_host_vbus { - status = "okay"; - }; - }; +®_usb_host_vbus { + status = "okay"; }; &backlight { @@ -88,7 +86,7 @@ &gpio5 4 GPIO_ACTIVE_HIGH >; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ecspi4 &pinctrl_spi_cs1 &pinctrl_csi_gpio_2>; + pinctrl-0 = <&pinctrl_ecspi4 &pinctrl_csi_gpio_2>; status = "okay"; spidev0: spidev@0 { @@ -155,15 +153,15 @@ gpio { pinctrl_gpios: gpios { fsl,pins = < - MX6QDL_PAD_GPIO_9__GPIO1_IO09 PAD_CTRL_HYS_PU /* SODIMM 28 */ - MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 PAD_CTRL_HYS_PU /* SODIMM 30 */ + MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */ + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* SODIMM 30 */ >; }; pinctrl_mxt_ts: mxt-ts { fsl,pins = < - MX6QDL_PAD_EIM_CS1__GPIO2_IO24 PAD_CTRL_HYS_PD /* SODIMM 107 */ - MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 PAD_CTRL_HYS_PD /* SODIMM 106 */ + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x130b0 /* SODIMM 107 */ + MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x130b0 /* SODIMM 106 */ >; }; }; |