diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-05-07 15:50:03 +0300 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:45:42 +0100 |
| commit | 7426066dca0b792217106e4814eec4516c61c9a7 (patch) | |
| tree | 950975073224c55cba7509ed99faaad1bdb240da /arch/arm/boot/dts/imx7-colibri.dtsi | |
| parent | b2c78dd5fd5e30689a396ea91e65fe64d3fd442e (diff) | |
ARM: dts (ds): imx7: merge changes from toradex_4.9-2.3.x-imx-next
Merge changes from Toradex Linux 4.9 BSP.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 798db85a5b50..4e3a50f8db64 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -49,6 +49,12 @@ enable-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; }; + pxp_v4l2_out { + compatible = "fsl,imx7d-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", \ + "fsl,imx6sl-pxp-v4l2"; + status = "okay"; + }; + reg_module_3v3: regulator-module-3v3 { compatible = "regulator-fixed"; regulator-name = "+V3.3"; @@ -80,6 +86,11 @@ clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; }; }; + + m4_tcm: tcml@007f8000 { + compatible = "fsl, m4_tcml"; + reg = <0x007f8000 0x8000>; + }; }; &adc1 { @@ -258,6 +269,16 @@ &pinctrl_lcdif_ctrl>; }; +&ocram { + reg = <0x00901000 0xf000>; +}; + +&rpmsg { + vdev-nums = <1>; + reg = <0x8fff0000 0x10000>; + status = "okay"; +}; + &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; @@ -652,6 +673,12 @@ >; }; + pinctrl_usbc_det: gpio_usbc_det { + fsl,pins = < + MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x14 + >; + }; + pinctrl_usbh_reg: gpio-usbh-vbus { fsl,pins = < MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 /* SODIMM 129 USBH PEN */ @@ -767,6 +794,12 @@ >; }; + pinctrl_gpiokeys: gpiokeysgrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x19 + >; + }; + pinctrl_i2c1: i2c1-grp { fsl,pins = < MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA 0x4000007f |