diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:00:27 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 23:00:27 +0200 |
commit | 3d12971ebd5c48f4d1d80ac993bf82af7545c239 (patch) | |
tree | d9374f07425f1f30e0419b20f151b9d8de4cd030 /arch/arm/boot/dts/imx6q-gw54xx.dts | |
parent | Merge tag 'arm-soc/for-4.14/devicetree' of http://github.com/Broadcom/stblinux into next/dt (diff) | |
parent | ARM: dts: imx6q-bx50v3: Enable i2c recovery mechanism (diff) | |
download | linux-dev-3d12971ebd5c48f4d1d80ac993bf82af7545c239.tar.xz linux-dev-3d12971ebd5c48f4d1d80ac993bf82af7545c239.zip |
Merge tag 'imx-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "i.MX device tree updates for 4.14" from Shawn Guo:
- A series from Andrew Lunn updating imx6-rdu2 board to enable
on-board Marvell switch support.
- A series from Jagan Teki updating imx6ul-isiot and imx6ul-geam to
enable audio card and FEC support.
- Add support for Toradex Ixora V1.1 and Apalis Evaluation Board
along with some cleanups.
- Enable DRM display support for imx6ul-evk and imx7d-sdb board.
- Add i.MX53 based Beckhoff CX9020 board support.
- Add GPMI NAND and APBH DMA devices for i.MX7 and enables NAND support
for imx7-colibri board.
- Enables the ADV7180 analog video decoder sensor connected to the
IMX6 IPU on various Gateworks Ventana boards.
- Minor updates on misc boards and some random cleanups.
* tag 'imx-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (47 commits)
ARM: dts: imx6q-bx50v3: Enable i2c recovery mechanism
ARM: dts: imx6q-apalis-eval: add support for Apalis Evaluation Board
ARM: dts: imx6: add support for Toradex Ixora V1.1 carrier board
ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: use i2c from dwc hdmi
ARM: dts: imx6q-apalis-ixora: add camera i2c bus definition
ARM: dts: imx6q-apalis-ixora: get rid of obsolete fusion comment
ARM: dts: imx6qdl-apalis: reword cam i2c comment
ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: get rid of tegra legacy gen1_i2c comment
ARM: dts: imx6q-apalis-ixora: combine aliases
ARM: dts: imx6qdl-apalis: split usdhc1 pinctrl to support 4- and 8-bit
ARM: dts: imx6q-apalis-ixora: fix usdhc2 pinctrl property
ARM: dts: imx6ul-liteboard: Support poweroff
ARM: dts: imx: add CX9020 Embedded PC device tree
ARM: dts: imx53: add alternative UART2 configuration
ARM: dts: imx53: add srtc node
dt-bindings: arm: Add entry for Beckhoff CX9020
ARM: dts: i.MX25: add RNGB node to dtsi
ARM: dts: imx6ul-14x14-evk: Remove unrelated pin from ENET group
ARM: dts: imx7d-sdb: Add flexcan support
ARM: dts: imx7-colibri: add NAND support
...
Diffstat (limited to 'arch/arm/boot/dts/imx6q-gw54xx.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-gw54xx.dts | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-gw54xx.dts b/arch/arm/boot/dts/imx6q-gw54xx.dts index 6e8f53e92a2d..56e5b5050fcf 100644 --- a/arch/arm/boot/dts/imx6q-gw54xx.dts +++ b/arch/arm/boot/dts/imx6q-gw54xx.dts @@ -18,6 +18,64 @@ compatible = "gw,imx6q-gw54xx", "gw,ventana", "fsl,imx6q"; }; +&i2c3 { + adv7180: camera@20 { + compatible = "adi,adv7180"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_adv7180>; + reg = <0x20>; + powerdown-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; + interrupt-parent = <&gpio3>; + interrupts = <30 IRQ_TYPE_LEVEL_LOW>; + + port { + adv7180_to_ipu2_csi1_mux: endpoint { + remote-endpoint = <&ipu2_csi1_mux_from_parallel_sensor>; + bus-width = <8>; + }; + }; + }; +}; + +&ipu2_csi1_from_ipu2_csi1_mux { + bus-width = <8>; +}; + +&ipu2_csi1_mux_from_parallel_sensor { + remote-endpoint = <&adv7180_to_ipu2_csi1_mux>; + bus-width = <8>; +}; + +&ipu2_csi1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu2_csi1>; +}; + &sata { status = "okay"; }; + +&iomuxc { + pinctrl_adv7180: adv7180grp { + fsl,pins = < + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x0001b0b0 + MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x4001b0b0 + >; + }; + + pinctrl_ipu2_csi1: ipu2_csi1grp { + fsl,pins = < + MX6QDL_PAD_EIM_EB2__IPU2_CSI1_DATA19 0x1b0b0 + MX6QDL_PAD_EIM_D16__IPU2_CSI1_DATA18 0x1b0b0 + MX6QDL_PAD_EIM_D18__IPU2_CSI1_DATA17 0x1b0b0 + MX6QDL_PAD_EIM_D19__IPU2_CSI1_DATA16 0x1b0b0 + MX6QDL_PAD_EIM_D20__IPU2_CSI1_DATA15 0x1b0b0 + MX6QDL_PAD_EIM_D26__IPU2_CSI1_DATA14 0x1b0b0 + MX6QDL_PAD_EIM_D27__IPU2_CSI1_DATA13 0x1b0b0 + MX6QDL_PAD_EIM_A17__IPU2_CSI1_DATA12 0x1b0b0 + MX6QDL_PAD_EIM_D29__IPU2_CSI1_VSYNC 0x1b0b0 + MX6QDL_PAD_EIM_EB3__IPU2_CSI1_HSYNC 0x1b0b0 + MX6QDL_PAD_EIM_A16__IPU2_CSI1_PIXCLK 0x1b0b0 + >; + }; +}; |