diff options
| -rw-r--r-- | arch/arm64/boot/dts/freescale/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp-mek-max9286.dts | 60 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640.dts | 71 | ||||
| -rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 68 |
4 files changed, 123 insertions, 78 deletions
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 3e6c57238c42..50e17190cdbf 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -38,7 +38,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek.dtb imx8qm-mek-max9286.dtb \ imx8qm-mek-hdmi.dtb imx8qm-mek-dsp.dtb \ imx8qm-lpddr4-val.dtb dtb-$(CONFIG_ARCH_MXC) += imx8qxp-ai_ml.dtb -dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb imx8qxp-mek-dsp.dtb imx8qxp-mek-max9286.dtb \ +dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb imx8qxp-mek-dsp.dtb imx8qxp-mek-ov5640.dtb \ imx8qxp-mek-enet2.dtb imx8qxp-mek-enet2-tja1100.dtb imx8qxp-mek-sof.dtb \ imx8qxp-mek-rpmsg.dtb \ imx8qxp-lpddr4-val.dtb diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-max9286.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-max9286.dts deleted file mode 100644 index 6661434e31e8..000000000000 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-max9286.dts +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -// Copyright NXP 2019 - -#include "imx8qxp-mek.dts" - -&isi_0 { - status = "okay"; -}; - -&isi_1 { - status = "okay"; -}; - -&isi_2 { - status = "okay"; -}; - -&isi_3 { - status = "okay"; -}; - -&mipi_csi_0 { - #address-cells = <1>; - #size-cells = <0>; - virtual-channel; - status = "okay"; - - /* Camera 0 MIPI CSI-2 (CSIS0) */ - port@0 { - reg = <0>; - mipi_csi0_ep: endpoint { - remote-endpoint = <&max9286_0_ep>; - data-lanes = <1 2 3 4>; - }; - }; -}; - -&i2c_mipi_csi0 { - max9286_mipi@6a { - compatible = "maxim,max9286_mipi"; - reg = <0x6a>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_mipi_csi0>; - clocks = <&clk_dummy>; - clock-names = "capture_mclk"; - mclk = <27000000>; - mclk_source = <0>; - pwn-gpios = <&lsio_gpio3 7 GPIO_ACTIVE_HIGH>; - virtual-channel; - status = "okay"; - port { - max9286_0_ep: endpoint { - remote-endpoint = <&mipi_csi0_ep>; - data-lanes = <1 2 3 4>; - }; - }; - }; - - /delete-node/ov5640_mipi@3c; -}; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640.dts new file mode 100644 index 000000000000..2ceac305f7ac --- /dev/null +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640.dts @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright NXP 2019 + +#include "imx8qxp-mek.dts" + +&isi_1 { + status = "disabled"; + + cap_device { + status = "disabled"; + }; +}; + +&isi_2 { + status = "disabled"; + + cap_device { + status = "disabled"; + }; +}; + +&isi_3 { + status = "disabled"; + + cap_device { + status = "disabled"; + }; +}; + +&mipi_csi_0 { + #address-cells = <1>; + #size-cells = <0>; + /delete-property/virtual-channel; + status = "okay"; + + /* Camera 0 MIPI CSI-2 (CSIS0) */ + port@0 { + reg = <0>; + mipi_csi0_ep: endpoint { + remote-endpoint = <&ov5640_mipi_ep>; + data-lanes = <1 2>; + }; + }; +}; + +&i2c_mipi_csi0 { + ov5640_mipi: ov5640_mipi@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mipi_csi0>; + clocks = <&xtal24m>; + clock-names = "xclk"; + csi_id = <0>; + powerdown-gpios = <&lsio_gpio3 7 GPIO_ACTIVE_HIGH>; + reset-gpios = <&lsio_gpio3 8 GPIO_ACTIVE_LOW>; + mclk = <24000000>; + mclk_source = <0>; + mipi_csi; + status = "okay"; + port { + ov5640_mipi_ep: endpoint { + remote-endpoint = <&mipi_csi0_ep>; + data-lanes = <1 2>; + clocks-lanes = <0>; + }; + }; + }; + + /delete-node/max9286_mipi@6a; +}; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts index d1da4a4877de..56e84e810207 100755 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts @@ -791,29 +791,66 @@ &isi_0 { status = "okay"; + + cap_device { + status = "okay"; + }; + + m2m_device { + status = "okay"; + }; }; -&irqsteer_csi0 { +&isi_1 { + status = "okay"; + + cap_device { + status = "okay"; + }; +}; + +&isi_2 { + status = "okay"; + + cap_device { + status = "okay"; + }; +}; + +&isi_3 { status = "okay"; + + cap_device { + status = "okay"; + }; }; &isi_4 { interface = <6 0 2>; - parallel_csi; + status = "okay"; + + cap_device { + status = "okay"; + }; +}; + +&irqsteer_csi0 { status = "okay"; }; + &mipi_csi_0 { #address-cells = <1>; #size-cells = <0>; + virtual-channel; status = "okay"; /* Camera 0 MIPI CSI-2 (CSIS0) */ port@0 { reg = <0>; mipi_csi0_ep: endpoint { - remote-endpoint = <&ov5640_mipi_ep>; - data-lanes = <1 2>; + remote-endpoint = <&max9286_0_ep>; + data-lanes = <1 2 3 4>; }; }; }; @@ -843,25 +880,22 @@ clock-frequency = <100000>; status = "okay"; - ov5640_mipi: ov5640_mipi@3c { - compatible = "ovti,ov5640"; - reg = <0x3c>; + max9286_mipi@6a { + compatible = "maxim,max9286_mipi"; + reg = <0x6a>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_mipi_csi0>; - clocks = <&xtal24m>; - clock-names = "xclk"; - csi_id = <0>; - powerdown-gpios = <&lsio_gpio3 7 GPIO_ACTIVE_HIGH>; - reset-gpios = <&lsio_gpio3 8 GPIO_ACTIVE_LOW>; - mclk = <24000000>; + clocks = <&clk_dummy>; + clock-names = "capture_mclk"; + mclk = <27000000>; mclk_source = <0>; - mipi_csi; + pwn-gpios = <&lsio_gpio3 7 GPIO_ACTIVE_HIGH>; + virtual-channel; status = "okay"; port { - ov5640_mipi_ep: endpoint { + max9286_0_ep: endpoint { remote-endpoint = <&mipi_csi0_ep>; - data-lanes = <1 2>; - clocks-lanes = <0>; + data-lanes = <1 2 3 4>; }; }; }; |