diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-06-11 14:35:58 +0200 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-13 16:05:17 +0200 |
| commit | c82eadaeaa32df34ddd267c4bcf5a4be629faae5 (patch) | |
| tree | 157022bc45167cc3077d40d61c4e555cb991a3d7 /arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | |
| parent | 81ba15be9b6cace090aa5853b218c9d990a7c8a3 (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>
(cherry picked from commit 6466d65d1b4375ef009d58ed52428a5a0baa4ff9)
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 18b26bb87b3c..44b60609e41c 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -79,6 +79,14 @@ mmc1 = &usdhc1; /* MMC 4bit slot */ }; + extcon_usbc_det: usbc_det { + compatible = "linux,extcon-usb-gpio"; + debounce = <25>; + id-gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbc_det>; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -148,6 +156,14 @@ }; &backlight { + #if 0 /* PWM polarity: if 1 is brightest */ + pwms = <&pwm3 0 5000000 0>; + #if 0 /* Fusion 7 needs 10kHz PWM frequency */ + pwms = <&pwm3 0 100000 0>; + #endif + #else /* PWM polarity: if 0 is brightest */ + pwms = <&pwm3 0 5000000 1>; + #endif brightness-levels = <0 127 191 223 239 247 251 255>; default-brightness-level = <1>; status = "okay"; @@ -166,10 +182,12 @@ spi-max-frequency = <10000000>; status = "okay"; }; -}; - -&hdmi { - status = "okay"; + spidev0: spidev@1 { + compatible = "toradex,evalspi"; + reg = <0>; + spi-max-frequency = <23000000>; + status = "disabled"; + }; }; /* @@ -219,6 +237,9 @@ &pinctrl_weim_gpio_1 &pinctrl_weim_gpio_2 &pinctrl_weim_gpio_3 &pinctrl_weim_gpio_4 &pinctrl_weim_gpio_5 &pinctrl_weim_gpio_6 + &pinctrl_csi_gpio_1 + &pinctrl_gpio_1 + &pinctrl_gpio_2 &pinctrl_usbh_oc_1 &pinctrl_usbc_id_1 >; @@ -241,6 +262,18 @@ remote-endpoint = <&lcd_display_in>; }; +&lcd { + status = "okay"; +}; + +&mxcfb1 { + status = "okay"; +}; + +&mxcfb2 { + status = "okay"; +}; + &pwm1 { status = "okay"; }; @@ -280,6 +313,7 @@ &usbotg { status = "okay"; + extcon = <&extcon_usbc_det>, <&extcon_usbc_det>; }; /* Colibri MMC */ @@ -289,7 +323,7 @@ &weim { status = "okay"; - + fsl,weim-cs-gpr = <&gpr>; /* weim memory map: 32MB on CS0, CS1, CS2 and CS3 */ ranges = <0 0 0x08000000 0x02000000 1 0 0x0a000000 0x02000000 |