From 27df0cdf8826de23c7e3f71f945c9ea397c4106f Mon Sep 17 00:00:00 2001 From: Robby Cai Date: Wed, 6 Jan 2021 18:57:40 +0800 Subject: MLK-25215-3 ARM64: dts: imx8mp-evk: add dual isp cameras basler and ov2775 add dual isp supports with basler camera and ov2775 Signed-off-by: Robby Cai Reviewed-by: Guoniu.zhou (cherry picked from commit 2bd39f91a47ad50981f96dd46b1f9e50a0cc0266) (cherry picked from commit af20fa807f455ef846f7ffcebc6f489f285b1622) Signed-off-by: Andrey Zhizhikin --- arch/arm64/boot/dts/freescale/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/arm64/boot/dts/freescale/Makefile') diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 27d3bbdc6748..42311ea3392f 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -72,7 +72,9 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb imx8mp-evk-root.dtb imx8mp-evk-inmate.d imx8mp-evk-jdi-wuxga-lvds-panel.dtb imx8mp-ab2.dtb imx8mp-evk-sof-wm8960.dtb \ imx8mp-evk-dsp.dtb imx8mp-evk-ov2775.dtb imx8mp-evk-basler.dtb imx8mp-evk-pcie-ep.dtb \ imx8mp-evk-spdif-lb.dtb imx8mp-evk-dsp-lpa.dtb imx8mp-evk-ov2775-ov5640.dtb \ - imx8mp-evk-basler-ov5640.dtb imx8mp-evk-dual-ov2775.dtb + imx8mp-evk-basler-ov5640.dtb imx8mp-evk-dual-ov2775.dtb \ + imx8mp-evk-basler-ov2775.dtb \ + imx8mp-evk-iqaudio-dacplus.dtb imx8mp-evk-iqaudio-dacpro.dtb imx8mp-evk-hifiberry-dacplus.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-ddr4-evk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb imx8mq-evk-rpmsg.dtb imx8mq-evk-pcie1-m2.dtb imx8mq-evk-usd-wifi.dtb \ imx8mq-evk-usdhc2-m2.dtb imx8mq-evk-pcie-ep.dtb -- cgit v1.2.3 From a687b8a79615654987bd83eb868f4c21a4a8f77d Mon Sep 17 00:00:00 2001 From: Robby Cai Date: Wed, 6 Jan 2021 19:03:37 +0800 Subject: MLK-25215-4 ARM64: dts: imx8mp-evk: add dual baslers cameras support add dual baslers camera support to work with dual ISPs Signed-off-by: Robby Cai Reviewed-by: Guoniu.zhou (cherry picked from commit a755ce242b551dafcca648f9d54585fd9ba02493) (cherry picked from commit b8ac5f33cdaa0d957e6ffb5096809a830452fffb) Signed-off-by: Andrey Zhizhikin --- arch/arm64/boot/dts/freescale/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm64/boot/dts/freescale/Makefile') diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 42311ea3392f..f0a219d49db9 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -73,7 +73,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb imx8mp-evk-root.dtb imx8mp-evk-inmate.d imx8mp-evk-dsp.dtb imx8mp-evk-ov2775.dtb imx8mp-evk-basler.dtb imx8mp-evk-pcie-ep.dtb \ imx8mp-evk-spdif-lb.dtb imx8mp-evk-dsp-lpa.dtb imx8mp-evk-ov2775-ov5640.dtb \ imx8mp-evk-basler-ov5640.dtb imx8mp-evk-dual-ov2775.dtb \ - imx8mp-evk-basler-ov2775.dtb \ + imx8mp-evk-basler-ov2775.dtb imx8mp-evk-dual-basler.dtb \ imx8mp-evk-iqaudio-dacplus.dtb imx8mp-evk-iqaudio-dacpro.dtb imx8mp-evk-hifiberry-dacplus.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-ddr4-evk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb imx8mq-evk-rpmsg.dtb imx8mq-evk-pcie1-m2.dtb imx8mq-evk-usd-wifi.dtb \ -- cgit v1.2.3 From 2ec117e72a1643ffdb8cee69695553165a9b8953 Mon Sep 17 00:00:00 2001 From: Robby Cai Date: Wed, 10 Mar 2021 10:01:35 +0800 Subject: MLK-25337 ARM64: dts: imx8mp: fix build break for dtbs The commit af20fa807f455ef846f7ffcebc6f489f285b1622 introduced a break when cherry-pick from mainline. make[3]: *** No rule to make target 'arch/arm64/boot/dts/freescale/imx8mp-evk-iqaudio-dacplus.dtb', needed by '__build'. Stop. make[3]: *** Waiting for unfinished jobs.... DTC arch/arm64/boot/dts/freescale/imx8mp-evk-dual-basler.dtb make[2]: *** [../scripts/Makefile.build:500: arch/arm64/boot/dts/freescale] Error 2 make[1]: *** [/home/nxa14866/ProjectA/linux-imx_bk/Makefile:1269: dtbs] Error 2 make[1]: Leaving directory '/home/nxa14866/ProjectA/linux-imx_bk/build_v8' make: *** [Makefile:179: sub-make] Error 2 The patch removed build for imx8mp-evk-iqaudio-dacplus.dtb because it's not in this branch. Signed-off-by: Robby Cai (cherry picked from commit aa26d4f35de3b5a4d27d597e837280b6148e32ee) Signed-off-by: Andrey Zhizhikin --- arch/arm64/boot/dts/freescale/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm64/boot/dts/freescale/Makefile') diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index f0a219d49db9..ff796d1b8d99 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -73,8 +73,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb imx8mp-evk-root.dtb imx8mp-evk-inmate.d imx8mp-evk-dsp.dtb imx8mp-evk-ov2775.dtb imx8mp-evk-basler.dtb imx8mp-evk-pcie-ep.dtb \ imx8mp-evk-spdif-lb.dtb imx8mp-evk-dsp-lpa.dtb imx8mp-evk-ov2775-ov5640.dtb \ imx8mp-evk-basler-ov5640.dtb imx8mp-evk-dual-ov2775.dtb \ - imx8mp-evk-basler-ov2775.dtb imx8mp-evk-dual-basler.dtb \ - imx8mp-evk-iqaudio-dacplus.dtb imx8mp-evk-iqaudio-dacpro.dtb imx8mp-evk-hifiberry-dacplus.dtb + imx8mp-evk-basler-ov2775.dtb imx8mp-evk-dual-basler.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mp-ddr4-evk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb imx8mq-evk-rpmsg.dtb imx8mq-evk-pcie1-m2.dtb imx8mq-evk-usd-wifi.dtb \ imx8mq-evk-usdhc2-m2.dtb imx8mq-evk-pcie-ep.dtb -- cgit v1.2.3 From 817fc45854dab8690034a898f17ef16a5bb611a1 Mon Sep 17 00:00:00 2001 From: Oliver Brown Date: Thu, 11 Mar 2021 21:43:16 -0600 Subject: MLK-25341: arm64: dts: imx8qm: Add MIPI and LDB to HDMI/DP device tree files MIPI1 and LVDS1 should be enabled in the HDMI configuration. Added DP configuration for MEK board. Signed-off-by: Oliver Brown (cherry picked from commit cfdd6c60d3bf1da3d5d4c71b6f4834dc503bcbc0) Signed-off-by: Andrey Zhizhikin --- arch/arm64/boot/dts/freescale/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm64/boot/dts/freescale/Makefile') diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index ff796d1b8d99..3e9642a8514f 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -98,6 +98,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek.dtb imx8qm-mek-ov5640.dtb \ imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ imx8qm-mek-usdhc3-m2.dtb imx8qm-mek-usd-wifi.dtb \ + imx8qm-mek-dp.dtb \ imx8qm-lpddr4-val.dtb imx8qm-lpddr4-val-mqs.dtb \ imx8qm-lpddr4-val-spdif.dtb imx8qm-mek-ca53.dtb \ imx8qm-mek-ca72.dtb imx8qm-lpddr4-val-ca53.dtb \ -- cgit v1.2.3