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/imx6q-apalis-eval.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/imx6q-apalis-eval.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-eval.dts | 116 |
1 files changed, 110 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index d064780561fa..d2cb080993e9 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -80,7 +80,31 @@ }; }; - lcd_display: disp0 { + v4l2_cap_0 { + compatible = "fsl,imx6q-v4l2-capture"; + ipu_id = <0>; + csi_id = <0>; + mclk_source = <0>; + status = "okay"; + }; + + v4l2_cap_1 { // second parallel camera + compatible = "fsl,imx6q-v4l2-capture"; + ipu_id = <1>; + csi_id = <1>; + mclk_source = <0>; + status = "okay"; + }; + + v4l2_cap_2 { // mipi-csi2 camera + compatible = "fsl,imx6q-v4l2-capture"; + ipu_id = <0>; + csi_id = <1>; + mclk_source = <0>; + status = "okay"; + }; + + lcd_display: display@di0 { compatible = "fsl,imx-parallel-display"; #address-cells = <1>; #size-cells = <0>; @@ -151,12 +175,42 @@ }; &backlight { +#if 0 /* PWM polarity: if 1 is brightest */ + pwms = <&pwm4 0 5000000 0>; +#if 0 /* Fusion 7 needs 10kHz PWM frequency */ + pwms = <&pwm4 0 100000 0>; +#endif +#else /* PWM polarity: if 0 is brightest */ + pwms = <&pwm4 0 5000000 1>; +#endif brightness-levels = <0 127 191 223 239 247 251 255>; default-brightness-level = <1>; power-supply = <®_3v3_sw>; status = "okay"; }; +/* Apalis SPI1 */ +&ecspi1 { + status = "okay"; + + spidev0: spidev@1 { + compatible = "toradex,evalspi"; + reg = <0>; + spi-max-frequency = <18000000>; + }; +}; + +/* Apalis SPI2 */ +&ecspi2 { + status = "okay"; + + spidev1: spidev@2 { + compatible = "toradex,evalspi"; + reg = <0>; + spi-max-frequency = <18000000>; + }; +}; + &can1 { xceiver-supply = <®_3v3_sw>; status = "okay"; @@ -167,7 +221,19 @@ status = "okay"; }; -&hdmi { +&hdmi_audio { + status = "okay"; +}; + +&hdmi_cec { + status = "okay"; +}; + +&hdmi_core { + status = "okay"; +}; + +&hdmi_video { status = "okay"; }; @@ -285,10 +351,42 @@ }; }; +/* + * DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 + */ +&i2cddc { + status = "okay"; + + hdmi_ddc: edid@50 { + compatible = "fsl,imx6-hdmi-i2c"; + reg = <0x50>; + }; +}; + &ipu1_di1_disp1 { remote-endpoint = <&lcd_display_in>; }; +&lcd { + status = "okay"; +}; + +&mxcfb1 { + status = "okay"; +}; + +&mxcfb2 { + status = "okay"; +}; + +&mxcfb3 { + status = "okay"; +}; + +&mxcfb4 { + status = "okay"; +}; + &ldb { status = "okay"; }; @@ -296,10 +394,8 @@ &pcie { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_reset_moci>; - /* active-high meaning opposite of regular PERST# active-low polarity */ - reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>; - reset-gpio-active-high; - vpcie-supply = <®_pcie_switch>; + reset-gpio = <&gpio1 2 0>; + reset-ep-gpio = <&gpio1 28 0>; status = "okay"; }; @@ -331,6 +427,10 @@ status = "okay"; }; +&sound_hdmi { + status = "okay"; +}; + &sound_spdif { status = "okay"; }; @@ -381,6 +481,10 @@ status = "okay"; }; +&vdac { + status = "okay"; +}; + &iomuxc { /* * Mux the Apalis GPIOs |