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/imx6q-apalis-ixora.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/imx6q-apalis-ixora.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-ixora.dts | 96 |
1 files changed, 95 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 0509d204838e..82865c502dea 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -147,14 +147,47 @@ gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; }; }; + + v4l2_cap_0 { + compatible = "fsl,imx6q-v4l2-capture"; + ipu_id = <0>; + csi_id = <0>; + mclk_source = <0>; + status = "okay"; + }; +#if 0 + v4l2_out { + compatible = "fsl,mxc_v4l2_output"; + status = "okay"; + }; +#endif }; &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>; status = "okay"; }; +/* Apalis SPI1 */ +&ecspi1 { + status = "okay"; + + spidev0: spidev@1 { + compatible = "toradex,evalspi"; + reg = <0>; + spi-max-frequency = <18000000>; + }; +}; + &can1 { status = "okay"; }; @@ -163,7 +196,19 @@ status = "okay"; }; -&hdmi { +&hdmi_audio { + status = "okay"; +}; + +&hdmi_cec { + status = "okay"; +}; + +&hdmi_core { + status = "okay"; +}; + +&hdmi_video { status = "okay"; }; @@ -263,6 +308,38 @@ }; }; +/* + * DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 + */ +&i2cddc { + status = "okay"; + + hdmi_ddc: edid@50 { + compatible = "fsl,imx6-hdmi-i2c"; + reg = <0x50>; + }; +}; + +&lcd { + status = "okay"; +}; + +&mxcfb1 { + status = "okay"; +}; + +&mxcfb2 { + status = "okay"; +}; + +&mxcfb3 { + status = "okay"; +}; + +&mxcfb4 { + status = "okay"; +}; + &ipu1_di1_disp1 { remote-endpoint = <&lcd_display_in>; }; @@ -308,6 +385,10 @@ status = "okay"; }; +&sound_hdmi { + status = "okay"; +}; + &sound_spdif { status = "okay"; }; @@ -322,6 +403,13 @@ &uart2 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2_dte &pinctrl_uart24_forceoff>; +#if 0 + linux,rs485-enabled-at-boot-time; + rs485-rts-active-low; + rs485-rx-during-tx; +#endif }; &uart4 { @@ -367,4 +455,10 @@ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0 >; }; + + pinctrl_uart24_forceoff: uart24_forceoff { + fsl,pins = < + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x1b0b0 + >; + }; }; |