diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-05-07 15:50:03 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-01-27 20:36:36 +0200 |
| commit | 3aed7ebf55f649829a1dee2f6009f90d48cf8c95 (patch) | |
| tree | e05dc61a2aef8c70bb33ee77da4e9608da236be5 /arch/arm/boot/dts/imx7-colibri.dtsi | |
| parent | a3cb524c20fa4feb98c85d743e49344d11c9d180 (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>
(cherry picked from commit e79a2c56ad4d547a45c726195b9024b189657128)
Conflicts:
arch/arm/boot/dts/imx7-colibri.dtsi
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
arch/arm/boot/dts/imx7d.dtsi
arch/arm/boot/dts/imx7s.dtsi
I reverted imx7d.dtsi and imx7s.dtsi completely this time. Then
I copied the parts over from imx7d to imx7s like we had it on the BSP
before to guarantee the same functionality on iMX7s as we already had.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Conflicts:
arch/arm/boot/dts/imx7-colibri.dtsi
arch/arm/boot/dts/imx7d.dtsi
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index d2e661d1e28f..725254ac978d 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 { @@ -259,6 +270,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>; @@ -345,7 +366,7 @@ &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4 - &pinctrl_gpio7 &pinctrl_usbc_det>; + &pinctrl_gpio7>; pinctrl_gpio1: gpio1-grp { fsl,pins = < @@ -768,6 +789,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 |