From d18253304c9a365269e7d301a83baeec1cf199f0 Mon Sep 17 00:00:00 2001
From: Dong Aisheng <aisheng.dong@nxp.com>
Date: Thu, 26 Oct 2023 20:05:47 +0800
Subject: [PATCH] LF-10676-5 arm64: dts: imx: fix graph_child_address build
warnings
Fix all the following build warnings:
Before:
1462 Warning (graph_child_address)
After:
69 Warning (graph_child_address)
Checked by:
$ make ARCH=arm64 W=1 dtbs 2>&1 | grep imx | grep graph_child_address | wc -l
122
e.g.
DTC arch/arm64/boot/dts/freescale/imx93-11x11-evk-mt9m114.dtb
../arch/arm64/boot/dts/freescale/imx93.dtsi:1288.28-1304.7: Warning (graph_child_address): /soc@0/bus@42800000/camera/csi@4ae00000: graph node has single child node 'port@0', #address-cells/#size-cells are not necessary
also defined at ../arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts:1090.11-1105.3
also defined at ../arch/arm64/boot/dts/freescale/imx93-11x11-evk-mt9m114.dts:133.11-135.3
../arch/arm64/boot/dts/freescale/imx93.dtsi:1306.33-1318.7: Warning (graph_child_address): /soc@0/bus@42800000/camera/pcsi@4ac10070: graph node has single child node 'port@0', #address-cells/#size-cells are not necessary
also defined at ../arch/arm64/boot/dts/freescale/imx93-11x11-evk-mt9m114.dts:120.15-131.3
../arch/arm64/boot/dts/freescale/imx93.dtsi:1449.11-1460.7: Warning (graph_child_address): /soc@0/system-controller@4ac10000/dpi/ports: graph node has single child node 'port@0', #address-cells/#size-cells are not necessary
../arch/arm64/boot/dts/freescale/imx93.dtsi:1512.34-1554.5: Warning (graph_child_address): /soc@0/lcd-controller@4ae30000: graph node has single child node 'port@0', #address-cells/#size-cells are not necessary
also defined at ../arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts:413.8-416.3
../arch/arm64/boot/dts/freescale/imx93.dtsi:1633.18-1648.5: Warning (graph_child_address): /ldb-display-controller/lvds-channel@0: graph node has single child node 'port@0', #address-cells/#size-cells are not necessary
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
arch/arm64/boot/dts/freescale/Makefile | 20 +++++-----
.../dts/freescale/imx8dx-mek-dsi-rm67191.dts | 12 +-----
.../boot/dts/freescale/imx8dx-mek-ov5640.dts | 5 +--
arch/arm64/boot/dts/freescale/imx8mm.dtsi | 6 +--
arch/arm64/boot/dts/freescale/imx8mn-ab2.dtsi | 4 +-
arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 5 +--
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 +--
.../freescale/imx8mp-evk-basler-ov2775.dts | 2 +-
.../freescale/imx8mp-evk-basler-ov5640.dts | 2 +-
.../boot/dts/freescale/imx8mp-evk-basler.dts | 2 +-
.../dts/freescale/imx8mp-evk-dual-basler.dts | 3 +-
.../dts/freescale/imx8mp-evk-dual-os08a20.dts | 2 +-
.../dts/freescale/imx8mp-evk-dual-ov2775.dts | 2 +-
.../freescale/imx8mp-evk-os08a20-ov5640.dts | 2 +-
.../boot/dts/freescale/imx8mp-evk-os08a20.dts | 2 +-
.../freescale/imx8mp-evk-ov2775-ov5640.dts | 2 +-
.../boot/dts/freescale/imx8mp-evk-ov2775.dts | 2 +-
arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 5 +--
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 30 +++-----------
.../dts/freescale/imx8mq-evk-dcss-adv7535.dts | 10 +----
.../dts/freescale/imx8mq-evk-dcss-rm67191.dts | 2 +-
.../boot/dts/freescale/imx8mq-evk-dp.dts | 2 +-
.../freescale/imx8mq-evk-lcdif-adv7535.dts | 8 +---
arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 4 +-
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 12 +++++-
arch/arm64/boot/dts/freescale/imx8q-val.dtsi | 5 +--
.../boot/dts/freescale/imx8qm-lpddr4-val.dts | 12 +-----
.../dts/freescale/imx8qm-mek-cockpit-a53.dts | 17 ++------
.../dts/freescale/imx8qm-mek-cockpit-a72.dts | 17 ++------
.../boot/dts/freescale/imx8qm-mek-domu.dts | 17 ++------
.../dts/freescale/imx8qm-mek-dsi-rm67191.dts | 12 +-----
.../boot/dts/freescale/imx8qm-mek-ov5640.dts | 3 +-
arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 17 ++------
.../boot/dts/freescale/imx8qm-ss-dc.dtsi | 5 +--
.../boot/dts/freescale/imx8qm-ss-hdmi.dtsi | 5 +--
.../boot/dts/freescale/imx8qm-ss-lvds.dtsi | 14 +++++++
.../boot/dts/freescale/imx8qm-ss-mipi.dtsi | 12 +-----
.../dts/freescale/imx8qxp-mek-ov5640.dtsi | 5 +--
.../boot/dts/freescale/imx8qxp-ss-lvds.dtsi | 40 ++++++++++++++-----
arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 6 +--
arch/arm64/boot/dts/freescale/imx8x-mek.dtsi | 22 ++--------
arch/arm64/boot/dts/freescale/imx8x-val.dtsi | 5 +--
.../dts/freescale/imx93-11x11-evk-mt9m114.dts | 5 +--
.../boot/dts/freescale/imx93-11x11-evk.dts | 5 +--
.../boot/dts/freescale/imx93-14x14-evk.dts | 5 +--
.../dts/freescale/imx93-9x9-qsb-mt9m114.dts | 5 +--
arch/arm64/boot/dts/freescale/imx93.dtsi | 23 +++++++++--
47 files changed, 145 insertions(+), 264 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 4e37aa1f0f339..a3be8c618f904 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -223,11 +223,11 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-zest.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mq-ddr3l-val.dtb imx8mq-ddr4-val.dtb imx8mq-ddr4-val-gpmi-nand.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk-pcie-ep.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mq-wevk.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-eval.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-ixora-v1.1.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-eval.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-ixora-v1.1.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-ixora-v1.2.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-eval.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-ixora-v1.1.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-eval.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-ixora-v1.1.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qm-apalis-v1.1-ixora-v1.2.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek.dtb imx8qm-mek-ov5640.dtb \
imx8qm-mek-enet2-tja1100.dtb imx8qm-mek-rpmsg.dtb \
imx8qm-mek-hdmi.dtb \
@@ -289,11 +289,11 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek-revd-dsi-rm67191.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek-revd-dsi-rm67199.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8qm-pcieax2pciebx1-revd.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek-revd-root.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qxp-ai_ml.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-aster.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris-v2.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qxp-ai_ml.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-aster.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-eval-v3.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris.dtb
+#dtb-$(CONFIG_ARCH_MXC) += imx8qxp-colibri-iris-v2.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8ulp-evk.dtb imx8ulp-evk-lpspi-slave.dtb \
imx8ulp-evk-i3c.dtb imx8ulp-evk-rk055hdmipi4m.dtb imx8ulp-evk-rk055hdmipi4mv2.dtb \
imx8ulp-evk-epdc.dtb imx8ulp-evk-sof-btsco.dtb \
diff --git a/arch/arm64/boot/dts/freescale/imx8dx-mek-dsi-rm67191.dts b/arch/arm64/boot/dts/freescale/imx8dx-mek-dsi-rm67191.dts
index 4a495db259052..30245b7ef9ae5 100644
--- a/arch/arm64/boot/dts/freescale/imx8dx-mek-dsi-rm67191.dts
+++ b/arch/arm64/boot/dts/freescale/imx8dx-mek-dsi-rm67191.dts
@@ -46,9 +46,6 @@ &mipi0_dsi_host {
#size-cells = <0>;
panel@0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "raydium,rm67191";
reg = <0>;
reset-gpios = <&pca9557_a 6 GPIO_ACTIVE_LOW>;
@@ -57,8 +54,7 @@ panel@0 {
width-mm = <68>;
height-mm = <121>;
- port@0 {
- reg = <0>;
+ port {
panel0_in: endpoint {
remote-endpoint = <&mipi0_panel_out>;
};
@@ -89,9 +85,6 @@ &mipi1_dsi_host {
#size-cells = <0>;
panel@0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "raydium,rm67191";
reg = <0>;
reset-gpios = <&pca9557_b 7 GPIO_ACTIVE_LOW>;
@@ -100,8 +93,7 @@ panel@0 {
width-mm = <68>;
height-mm = <121>;
- port@0 {
- reg = <0>;
+ port {
panel1_in: endpoint {
remote-endpoint = <&mipi1_panel_out>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8dx-mek-ov5640.dts b/arch/arm64/boot/dts/freescale/imx8dx-mek-ov5640.dts
index 62fa5eae3acce..6e3e91ca7dad4 100644
--- a/arch/arm64/boot/dts/freescale/imx8dx-mek-ov5640.dts
+++ b/arch/arm64/boot/dts/freescale/imx8dx-mek-ov5640.dts
@@ -28,14 +28,11 @@ cap_device {
};
&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>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&ov5640_mipi_ep>;
data-lanes = <1 2>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
index aaf4b9d94377f..379be9b3c2db2 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
@@ -1198,8 +1198,6 @@ aips4: bus@32c00000 {
ranges = <0x32c00000 0x32c00000 0x400000>;
lcdif: lcdif@32e00000 {
- #address-cells = <1>;
- #size-cells = <0>;
compatible = "fsl,imx8mm-lcdif";
reg = <0x32e00000 0x10000>;
clocks = <&clk IMX8MM_CLK_LCDIF_PIXEL>,
@@ -1217,9 +1215,7 @@ lcdif: lcdif@32e00000 {
power-domains = <&disp_blk_ctrl IMX8MM_DISPBLK_PD_LCDIF>;
status = "disabled";
- lcdif_disp0: port@0 {
- reg = <0>;
-
+ lcdif_disp0: port {
lcdif_to_dsim: endpoint {
remote-endpoint = <&dsim_from_lcdif>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-ab2.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-ab2.dtsi
index 3354558c04ff2..5a4b4feb8ad31 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-ab2.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn-ab2.dtsi
@@ -301,9 +301,7 @@ &micfil {
&mipi_csi_1 {
status = "disabled";
- /delete-property/ #address-cells;
- /delete-property/ #size-cells;
- /delete-node/ port@0;
+ /delete-node/ port;
};
&mipi_dsi {
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi
index f8e53f26e1622..c63f8f13b73ba 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi
@@ -413,11 +413,8 @@ &micfil {
};
&mipi_csi_1 {
- #address-cells = <1>;
- #size-cells = <0>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
mipi1_sensor_ep: endpoint {
remote-endpoint = <&ov5640_ep>;
data-lanes = <2>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index ed059528cb6ef..f350be92ae9f2 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -1184,8 +1184,6 @@ aips4: bus@32c00000 {
ranges;
lcdif: lcd-controller@32e00000 {
- #address-cells = <1>;
- #size-cells = <0>;
compatible = "fsl,imx8mn-lcdif";
reg = <0x32e00000 0x10000>;
clocks = <&clk IMX8MN_CLK_DISP_PIXEL_ROOT>,
@@ -1205,9 +1203,7 @@ lcdif: lcd-controller@32e00000 {
power-domains = <&disp_blk_ctrl IMX8MN_DISPBLK_PD_LCDIF>;
status = "disabled";
- lcdif_disp0: port@0 {
- reg = <0>;
-
+ lcdif_disp0: port {
lcdif_to_dsim: endpoint {
remote-endpoint = <&dsim_from_lcdif>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov2775.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov2775.dts
index 4222b30524be8..fe88826bcbd49 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov2775.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov2775.dts
@@ -90,7 +90,7 @@ ov2775_mipi_1_ep: endpoint {
&mipi_csi_0 {
status = "okay";
- port@0 {
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&basler_ep_0>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov5640.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov5640.dts
index 9967112824f92..6a31fd1188ff5 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov5640.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-basler-ov5640.dts
@@ -43,7 +43,7 @@ basler_ep_0: endpoint {
&mipi_csi_0 {
status = "okay";
- port@0 {
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&basler_ep_0>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-basler.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-basler.dts
index 8e1595bb7e550..98b3bdd587cbc 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-basler.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-basler.dts
@@ -42,7 +42,7 @@ basler_ep_0: endpoint {
&mipi_csi_0 {
status = "okay";
- port@0 {
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&basler_ep_0>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-basler.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-basler.dts
index b86e2eca4950e..cd4f3cfe96e6d 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-basler.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-basler.dts
@@ -100,8 +100,7 @@ &mipi_csi_0 {
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_266M>;
assigned-clock-rates = <266000000>;
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&basler_ep_0>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-os08a20.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-os08a20.dts
index 91acce35065ae..af25b2e9fac92 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-os08a20.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-os08a20.dts
@@ -101,7 +101,7 @@ &mipi_csi_0 {
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_266M>;
assigned-clock-rates = <266000000>;
- port@0 {
+ port {
endpoint {
remote-endpoint = <&os08a20_mipi_0_ep>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-ov2775.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-ov2775.dts
index 9d7d0f9a5c162..237525c58e0f8 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-ov2775.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-dual-ov2775.dts
@@ -109,7 +109,7 @@ &mipi_csi_0 {
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_266M>;
assigned-clock-rates = <266000000>;
- port@0 {
+ port {
endpoint {
remote-endpoint = <&ov2775_mipi_0_ep>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-os08a20-ov5640.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-os08a20-ov5640.dts
index e720901d8231b..45e2da7e2965f 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-os08a20-ov5640.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-os08a20-ov5640.dts
@@ -91,7 +91,7 @@ &dewarp {
&mipi_csi_0 {
status = "okay";
- port@0 {
+ port {
endpoint {
remote-endpoint = <&os08a20_mipi_0_ep>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-os08a20.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-os08a20.dts
index 5fadbe1e8c7d1..a51b1995eb611 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-os08a20.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-os08a20.dts
@@ -72,7 +72,7 @@ &dewarp {
&mipi_csi_0 {
status = "okay";
- port@0 {
+ port {
endpoint {
remote-endpoint = <&os08a20_mipi_0_ep>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-ov2775-ov5640.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-ov2775-ov5640.dts
index 46edd382d8b21..0e5fb4d5470c1 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-ov2775-ov5640.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-ov2775-ov5640.dts
@@ -95,7 +95,7 @@ &dewarp {
&mipi_csi_0 {
status = "okay";
- port@0 {
+ port {
endpoint {
remote-endpoint = <&ov2775_mipi_0_ep>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-ov2775.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-ov2775.dts
index e241e3646c9a5..2456a573171b6 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-ov2775.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-ov2775.dts
@@ -101,7 +101,7 @@ &dewarp {
&mipi_csi_0 {
status = "okay";
- port@0 {
+ port {
endpoint {
remote-endpoint = <&ov2775_mipi_0_ep>;
data-lanes = <4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
index cc0d1f9d3b488..17c9db18e5668 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
@@ -1432,12 +1432,9 @@ &mix_gpu_ml {
};
&mipi_csi_0 {
- #address-cells = <1>;
- #size-cells = <0>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&ov5640_mipi_0_ep>;
data-lanes = <2>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index 112929c508e94..42241152ac112 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -1396,8 +1396,6 @@ dsim_from_lcdif: endpoint {
};
lcdif1: lcd-controller@32e80000 {
- #address-cells = <1>;
- #size-cells = <0>;
compatible = "fsl,imx8mp-lcdif1";
reg = <0x32e80000 0x10000>;
clocks = <&clk IMX8MP_CLK_MEDIA_DISP1_PIX_ROOT>,
@@ -1416,9 +1414,7 @@ lcdif1: lcd-controller@32e80000 {
power-domains = <&media_blk_ctrl IMX8MP_MEDIABLK_PD_LCDIF_1>;
status = "disabled";
- lcdif1_disp: port@0 {
- reg = <0>;
-
+ lcdif1_disp: port {
lcdif_to_dsim: endpoint {
remote-endpoint = <&dsim_from_lcdif>;
};
@@ -1426,8 +1422,6 @@ lcdif_to_dsim: endpoint {
};
lcdif2: lcd-controller@32e90000 {
- #address-cells = <1>;
- #size-cells = <0>;
compatible = "fsl,imx8mp-lcdif2";
reg = <0x32e90000 0x10000>;
clocks = <&clk IMX8MP_CLK_MEDIA_DISP2_PIX_ROOT>,
@@ -1445,10 +1439,9 @@ lcdif2: lcd-controller@32e90000 {
power-domains = <&media_blk_ctrl IMX8MP_MEDIABLK_PD_LCDIF_2>;
status = "disabled";
- lcdif2_disp: port@0 {
+ lcdif2_disp: port {
#address-cells = <1>;
#size-cells = <0>;
- reg = <0>;
lcdif2_disp_ldb_ch0: endpoint@0 {
reg = <0>;
@@ -1998,8 +1991,6 @@ hdmi_pavi: hdmi-pai-pvi@32fc4000 {
};
lcdif3: lcd-controller@32fc6000 {
- #address-cells = <1>;
- #size-cells = <0>;
compatible = "fsl,imx8mp-lcdif1";
reg = <0x32fc6000 0x10000>;
clocks = <&hdmiphy 0>,
@@ -2016,9 +2007,7 @@ lcdif3: lcd-controller@32fc6000 {
interrupt-parent = <&irqsteer_hdmi>;
status = "disabled";
- lcdif3_disp: port@0 {
- reg = <0>;
-
+ lcdif3_disp: port {
lcdif3_to_hdmi: endpoint {
remote-endpoint = <&hdmi_from_lcdif3>;
};
@@ -2044,12 +2033,7 @@ hdmi: hdmi@32fd8000 {
assigned-clock-rates = <133000000>, <500000000>, <24000000>;
status = "disabled";
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
-
+ port {
hdmi_from_lcdif3: endpoint {
remote-endpoint = <&lcdif3_to_hdmi>;
};
@@ -2313,16 +2297,12 @@ ldb_ch0: endpoint {
};
lvds-channel@1 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <1>;
phys = <&ldb_phy2>;
phy-names = "ldb_phy";
status = "disabled";
- port@0 {
- reg = <0>;
-
+ port {
ldb_ch1: endpoint {
remote-endpoint = <&lcdif2_disp_ldb_ch1>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk-dcss-adv7535.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk-dcss-adv7535.dts
index 2d603e43fcda9..222e37007b255 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk-dcss-adv7535.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk-dcss-adv7535.dts
@@ -44,7 +44,7 @@ &dcss {
<800000000>,
<400000000>;
- port@0 {
+ port {
dcss_out: endpoint {
remote-endpoint = <&mipi_dsi_in>;
};
@@ -53,13 +53,7 @@ dcss_out: endpoint {
&adv_bridge {
status = "okay";
-
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
-
+ port {
adv7535_in: endpoint {
remote-endpoint = <&mipi_dsi_out>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk-dcss-rm67191.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk-dcss-rm67191.dts
index 8be4b0f17b9d9..a97b204abd1c8 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk-dcss-rm67191.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk-dcss-rm67191.dts
@@ -41,7 +41,7 @@ &dcss {
<25000000>,
<400000000>;
- port@0 {
+ port {
dcss_out: endpoint {
remote-endpoint = <&mipi_dsi_in>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk-dp.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk-dp.dts
index 01e8b8e4a6fbe..01eca13d7eb63 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk-dp.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk-dp.dts
@@ -13,7 +13,7 @@ &dcss {
status = "okay";
disp-dev = "hdmi_disp";
- port@0 {
+ port {
dcss_out: endpoint {
remote-endpoint = <&hdmi_in>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk-lcdif-adv7535.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk-lcdif-adv7535.dts
index e4e78e5d4bf80..ceee7534b3732 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk-lcdif-adv7535.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk-lcdif-adv7535.dts
@@ -45,13 +45,7 @@ lcdif_out: endpoint {
&adv_bridge {
status = "okay";
-
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
-
+ port {
adv7535_in: endpoint {
remote-endpoint = <&mipi_dsi_out>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
index 6d64dbb31d212..02276c728bc87 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
@@ -1236,9 +1236,7 @@ &irqsteer {
&dcss {
status = "okay";
- port@0 {
- reg = <0>;
-
+ port {
dcss_out: endpoint {
remote-endpoint = <&hdmi_in>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 1796274f327c5..0a6a55921c039 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -1147,6 +1147,16 @@ mipi_dsi_lcdif_in: endpoint@0 {
reg = <0>;
remote-endpoint = <&lcdif_mipi_dsi>;
};
+
+ endpoint@1 {
+ reg = <1>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ endpoint {
+ };
};
};
};
@@ -1403,8 +1413,6 @@ irqsteer: interrupt-controller@32e2d000 {
};
dcss: display-controller@32e00000 {
- #address-cells = <1>;
- #size-cells = <0>;
compatible = "nxp,imx8mq-dcss";
reg = <0x32e00000 0x2d000>, <0x32e2f000 0x1000>;
interrupts = <6>, <8>, <9>, <16>, <17>;
diff --git a/arch/arm64/boot/dts/freescale/imx8q-val.dtsi b/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
index f8da0e15d5e5b..f6db51ccc4042 100644
--- a/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8q-val.dtsi
@@ -820,14 +820,11 @@ &lpuart3 { /* GPS */
};
&mipi_csi_0 {
- #address-cells = <1>;
- #size-cells = <0>;
virtual-channel;
status = "okay";
/* Camera 0 MIPI CSI-2 (CSIS0) */
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&max9286_0_ep>;
data-lanes = <1 2 3 4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-lpddr4-val.dts b/arch/arm64/boot/dts/freescale/imx8qm-lpddr4-val.dts
index 983a837077d94..f96b3c1605a5c 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-lpddr4-val.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-lpddr4-val.dts
@@ -349,9 +349,6 @@ &i2c0_mipi0 {
status = "okay";
adv_bridge0: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -361,8 +358,7 @@ adv_bridge0: adv7535@3d {
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_0_in: endpoint {
remote-endpoint = <&mipi0_adv_out>;
};
@@ -396,9 +392,6 @@ &i2c0_mipi1 {
status = "okay";
adv_bridge1: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -408,8 +401,7 @@ adv_bridge1: adv7535@3d {
interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_1_in: endpoint {
remote-endpoint = <&mipi1_adv_out>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a53.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a53.dts
index d4089670c23b5..e34d56ae4d090 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a53.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a53.dts
@@ -560,9 +560,6 @@ &i2c0_mipi0 {
status = "okay";
adv_bridge0: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -572,8 +569,7 @@ adv_bridge0: adv7535@3d {
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_0_in: endpoint {
remote-endpoint = <&mipi0_adv_out>;
};
@@ -607,9 +603,6 @@ &i2c0_mipi1 {
status = "disabled";
adv_bridge1: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -619,8 +612,7 @@ adv_bridge1: adv7535@3d {
interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
status = "disabled";
- port@0 {
- reg = <0>;
+ port {
adv7535_1_in: endpoint {
remote-endpoint = <&mipi1_adv_out>;
};
@@ -1190,14 +1182,11 @@ &irqsteer_csi1 {
};
&mipi_csi_0 {
- #address-cells = <1>;
- #size-cells = <0>;
virtual-channel;
status = "okay";
/* Camera 0 MIPI CSI-2 (CSIS0) */
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&max9286_0_ep>;
data-lanes = <1 2 3 4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a72.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a72.dts
index e34bd7482ff03..a73456edc4bc0 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a72.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-cockpit-a72.dts
@@ -581,9 +581,6 @@ &i2c0_mipi0 {
status = "disabled";
adv_bridge0: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -593,8 +590,7 @@ adv_bridge0: adv7535@3d {
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
status = "disabled";
- port@0 {
- reg = <0>;
+ port {
adv7535_0_in: endpoint {
remote-endpoint = <&mipi0_adv_out>;
};
@@ -628,9 +624,6 @@ &i2c0_mipi1 {
status = "okay";
adv_bridge1: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -640,8 +633,7 @@ adv_bridge1: adv7535@3d {
interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_1_in: endpoint {
remote-endpoint = <&mipi1_adv_out>;
};
@@ -1219,14 +1211,11 @@ &irqsteer_csi1 {
};
&mipi_csi_0 {
- #address-cells = <1>;
- #size-cells = <0>;
virtual-channel;
status = "disabled";
/* Camera 0 MIPI CSI-2 (CSIS0) */
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&max9286_0_ep>;
data-lanes = <1 2 3 4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
index 780295c582792..b279c2f319024 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-domu.dts
@@ -1201,9 +1201,6 @@ &i2c0_mipi0 {
status = "okay";
adv_bridge0: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -1213,8 +1210,7 @@ adv_bridge0: adv7535@3d {
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_0_in: endpoint {
remote-endpoint = <&mipi0_adv_out>;
};
@@ -1248,9 +1244,6 @@ &i2c0_mipi1 {
status = "okay";
adv_bridge1: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -1260,8 +1253,7 @@ adv_bridge1: adv7535@3d {
interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_1_in: endpoint {
remote-endpoint = <&mipi1_adv_out>;
};
@@ -1363,14 +1355,11 @@ &irqsteer_csi1 {
};
&mipi_csi_0 {
- #address-cells = <1>;
- #size-cells = <0>;
virtual-channel;
status = "okay";
/* Camera 0 MIPI CSI-2 (CSIS0) */
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&max9286_0_ep>;
data-lanes = <1 2 3 4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-dsi-rm67191.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-dsi-rm67191.dts
index a6afc7c8d0776..9f684827102aa 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-dsi-rm67191.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-dsi-rm67191.dts
@@ -20,9 +20,6 @@ &mipi0_dsi_host {
status = "okay";
panel@0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "raydium,rm67191";
reg = <0>;
pinctrl-0 = <&pinctrl_mipi_dsi_0_1_en>;
@@ -33,8 +30,7 @@ panel@0 {
width-mm = <68>;
height-mm = <121>;
- port@0 {
- reg = <0>;
+ port {
panel0_in: endpoint {
remote-endpoint = <&mipi0_panel_out>;
};
@@ -63,9 +59,6 @@ &mipi1_dsi_host {
status = "okay";
panel@0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "raydium,rm67191";
reg = <0>;
reset-gpios = <&lsio_gpio1 7 GPIO_ACTIVE_LOW>;
@@ -74,8 +67,7 @@ panel@0 {
width-mm = <68>;
height-mm = <121>;
- port@0 {
- reg = <0>;
+ port {
panel1_in: endpoint {
remote-endpoint = <&mipi1_panel_out>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-ov5640.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-ov5640.dts
index e58913258af8e..1a204bde6d644 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek-ov5640.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-ov5640.dts
@@ -75,8 +75,7 @@ &mipi_csi_0 {
/delete-property/virtual-channel;
/* Camera 0 MIPI CSI-2 (CSIS0) */
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&ov5640_mipi_0_ep>;
data-lanes = <1 2>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
index 0e1ff725cb21e..6be49fb271685 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qm-mek.dts
@@ -704,9 +704,6 @@ &i2c0_mipi0 {
status = "okay";
adv_bridge0: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -716,8 +713,7 @@ adv_bridge0: adv7535@3d {
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_0_in: endpoint {
remote-endpoint = <&mipi0_adv_out>;
};
@@ -751,9 +747,6 @@ &i2c0_mipi1 {
status = "okay";
adv_bridge1: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -763,8 +756,7 @@ adv_bridge1: adv7535@3d {
interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_1_in: endpoint {
remote-endpoint = <&mipi1_adv_out>;
};
@@ -1339,14 +1331,11 @@ &irqsteer_csi1 {
};
&mipi_csi_0 {
- #address-cells = <1>;
- #size-cells = <0>;
virtual-channel;
status = "okay";
/* Camera 0 MIPI CSI-2 (CSIS0) */
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&max9286_0_ep>;
data-lanes = <1 2 3 4>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi
index af9e3883919a3..ff89ec0fb470b 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi
@@ -44,12 +44,9 @@ &dpu2 {
compatible = "fsl,imx8qm-dpu";
dpu2_disp0: port@0 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0>;
- dpu2_disp0_mipi1: endpoint@0 {
- reg = <0>;
+ dpu2_disp0_mipi1: endpoint {
remote-endpoint = <&mipi1_dsi_in>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi
index 3f0ca0616737d..8308963a05ca2 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-hdmi.dtsi
@@ -171,8 +171,6 @@ i2c0_hdmi: i2c@56266000 {
};
hdmi:hdmi@56268000 {
- #address-cells = <1>;
- #size-cells = <0>;
reg = <0x56268000 0x1000>,
<0x56261000 0x1000>;
interrupt-parent = <&irqsteer_hdmi>;
@@ -215,8 +213,7 @@ hdmi:hdmi@56268000 {
<&pd IMX_SC_R_HDMI_PLL_1>;
power-domain-names = "hdmi", "pll0", "pll1";
- port@0 {
- reg = <0>;
+ port {
hdmi_disp: endpoint {
remote-endpoint = <&dpu1_disp0_hdmi>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi
index 637b144334d83..e22505de62920 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi
@@ -200,6 +200,13 @@ ldb1_ch1: endpoint {
remote-endpoint = <&dpu1_disp1_ldb1_ch1>;
};
};
+
+ port@1 {
+ reg = <1>;
+
+ endpoint {
+ };
+ };
};
};
@@ -384,6 +391,13 @@ ldb2_ch1: endpoint {
remote-endpoint = <&dpu2_disp1_ldb2_ch1>;
};
};
+
+ port@1 {
+ reg = <1>;
+
+ endpoint {
+ };
+ };
};
};
};
diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-mipi.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-mipi.dtsi
index 0014319f76049..0f401b09c6292 100644
--- a/arch/arm64/boot/dts/freescale/imx8qm-ss-mipi.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-mipi.dtsi
@@ -198,12 +198,8 @@ ports {
#size-cells = <0>;
mipi0_in: port@0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
reg = <0>;
- mipi0_dsi_in: endpoint@0 {
- reg = <0>;
+ mipi0_dsi_in: endpoint {
remote-endpoint = <&dpu1_disp0_mipi0>;
};
};
@@ -390,12 +386,8 @@ ports {
#size-cells = <0>;
mipi1_in: port@0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
reg = <0>;
- mipi1_dsi_in: endpoint@0 {
- reg = <0>;
+ mipi1_dsi_in: endpoint {
remote-endpoint = <&dpu2_disp0_mipi1>;
};
};
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640.dtsi
index 5b204e2285eec..c1f2fbc004a4f 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-ov5640.dtsi
@@ -26,14 +26,11 @@ cap_device {
};
&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>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&ov5640_mipi_ep>;
data-lanes = <1 2>;
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-ss-lvds.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-ss-lvds.dtsi
index e1a33b8cbe3e1..e80c860240d7b 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp-ss-lvds.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-ss-lvds.dtsi
@@ -199,12 +199,8 @@ ports {
#size-cells = <0>;
mipi0_in: port@0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
reg = <0>;
- mipi0_dsi_in: endpoint@0 {
- reg = <0>;
+ mipi0_dsi_in: endpoint {
remote-endpoint = <&dpu_disp0_mipi_dsi>;
};
};
@@ -313,12 +309,8 @@ ports {
#size-cells = <0>;
mipi1_in: port@0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
reg = <0>;
- mipi1_dsi_in: endpoint@0 {
- reg = <0>;
+ mipi1_dsi_in: endpoint {
remote-endpoint = <&dpu_disp1_mipi_dsi>;
};
};
@@ -362,6 +354,13 @@ ldb1_ch0: endpoint {
remote-endpoint = <&dpu_disp0_ldb1_ch0>;
};
};
+
+ port@1 {
+ reg = <1>;
+
+ endpoint {
+ };
+ };
};
lvds-channel@1 {
@@ -379,6 +378,13 @@ ldb1_ch1: endpoint {
remote-endpoint = <&dpu_disp0_ldb1_ch1>;
};
};
+
+ port@1 {
+ reg = <1>;
+
+ endpoint {
+ };
+ };
};
};
@@ -418,6 +424,13 @@ ldb2_ch0: endpoint {
remote-endpoint = <&dpu_disp1_ldb2_ch0>;
};
};
+
+ port@1 {
+ reg = <1>;
+
+ endpoint {
+ };
+ };
};
lvds-channel@1 {
@@ -435,6 +448,13 @@ ldb2_ch1: endpoint {
remote-endpoint = <&dpu_disp1_ldb2_ch1>;
};
};
+
+ port@1 {
+ reg = <1>;
+
+ endpoint {
+ };
+ };
};
};
};
diff --git a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
index e17938fcd6b81..9e7ef70424a0a 100644
--- a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts
@@ -693,12 +693,8 @@ cap_device {
};
&mipi_csi0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
status = "okay";
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&ov5640_mipi_ep>;
data-lanes = <1 2>;
diff --git a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
index bf9d5ee74b392..964698cab406b 100644
--- a/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-mek.dtsi
@@ -572,9 +572,6 @@ it6263_0_in: endpoint {
};
adv_bridge0: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -584,8 +581,7 @@ adv_bridge0: adv7535@3d {
interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_0_in: endpoint {
remote-endpoint = <&mipi0_adv_out>;
};
@@ -659,9 +655,6 @@ it6263_1_in: endpoint {
};
adv_bridge1: adv7535@3d {
- #address-cells = <1>;
- #size-cells = <0>;
-
compatible = "adi,adv7535";
reg = <0x3d>;
adi,addr-cec = <0x3b>;
@@ -671,8 +664,7 @@ adv_bridge1: adv7535@3d {
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
adv7535_1_in: endpoint {
remote-endpoint = <&mipi1_adv_out>;
};
@@ -1247,14 +1239,11 @@ &irqsteer_csi0 {
&mipi_csi_0 {
- #address-cells = <1>;
- #size-cells = <0>;
virtual-channel;
status = "okay";
/* Camera 0 MIPI CSI-2 (CSIS0) */
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&max9286_0_ep>;
data-lanes = <1 2 3 4>;
@@ -1268,11 +1257,8 @@ &cameradev {
};
¶llel_csi {
- #address-cells = <1>;
- #size-cells = <0>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
parallel_csi_ep: endpoint {
remote-endpoint = <&ov5640_ep>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8x-val.dtsi b/arch/arm64/boot/dts/freescale/imx8x-val.dtsi
index e734d69aa2142..878e24f2035b8 100644
--- a/arch/arm64/boot/dts/freescale/imx8x-val.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-val.dtsi
@@ -531,14 +531,11 @@ &flexcan3 {
};
&mipi_csi_0 {
- #address-cells = <1>;
- #size-cells = <0>;
virtual-channel;
status = "okay";
/* Camera 0 MIPI CSI-2 (CSIS0) */
- port@0 {
- reg = <0>;
+ port {
mipi_csi0_ep: endpoint {
remote-endpoint = <&max9286_0_ep>;
data-lanes = <1 2 3 4>;
diff --git a/arch/arm64/boot/dts/freescale/imx93-11x11-evk-mt9m114.dts b/arch/arm64/boot/dts/freescale/imx93-11x11-evk-mt9m114.dts
index 23b942f4eae73..caa8d77f24aae 100644
--- a/arch/arm64/boot/dts/freescale/imx93-11x11-evk-mt9m114.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-11x11-evk-mt9m114.dts
@@ -118,12 +118,9 @@ cap_device {
};
¶llel_csi {
- #address-cells = <1>;
- #size-cells = <0>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
parallel_csi_ep: endpoint {
remote-endpoint = <&mt9m114_ep>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
index 774ca1664049e..1b18cfd62e528 100644
--- a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
@@ -1089,12 +1089,9 @@ cap_device {
};
&mipi_csi {
- #address-cells = <1>;
- #size-cells = <0>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
mipi_csi_ep: endpoint {
remote-endpoint = <&ar1302_mipi_ep>;
data-lanes = <2>;
diff --git a/arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts b/arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts
index b13f23143158f..7082bbcb47b60 100644
--- a/arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts
@@ -903,12 +903,9 @@ cap_device {
};
&mipi_csi {
- #address-cells = <1>;
- #size-cells = <0>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
mipi_csi_ep: endpoint {
remote-endpoint = <&ar1302_mipi_ep>;
data-lanes = <2>;
diff --git a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb-mt9m114.dts b/arch/arm64/boot/dts/freescale/imx93-9x9-qsb-mt9m114.dts
index 884efbb35cd38..e2d9b9b43f861 100644
--- a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb-mt9m114.dts
+++ b/arch/arm64/boot/dts/freescale/imx93-9x9-qsb-mt9m114.dts
@@ -121,12 +121,9 @@ cap_device {
};
¶llel_csi {
- #address-cells = <1>;
- #size-cells = <0>;
status = "okay";
- port@0 {
- reg = <0>;
+ port {
parallel_csi_ep: endpoint {
remote-endpoint = <&mt9m114_ep>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi
index 56a62a9769b51..15608f1c8fc21 100644
--- a/arch/arm64/boot/dts/freescale/imx93.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx93.dtsi
@@ -1463,6 +1463,12 @@ dpi_to_lcdif: endpoint {
remote-endpoint = <&lcdif_to_dpi>;
};
};
+
+ port@1 {
+ reg = <1>;
+ endpoint {
+ };
+ };
};
};
};
@@ -1512,12 +1518,16 @@ dsi_to_lcdif: endpoint {
remote-endpoint = <&lcdif_to_dsi>;
};
};
+
+ port@1 {
+ reg = <1>;
+ endpoint {
+ };
+ };
};
};
lcdif: lcd-controller@4ae30000 {
- #address-cells = <1>;
- #size-cells = <0>;
compatible = "fsl,imx93-lcdif";
reg = <0x4ae30000 0x10000>;
interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
@@ -1537,10 +1547,9 @@ lcdif: lcd-controller@4ae30000 {
power-domains = <&media_blk_ctrl IMX93_MEDIABLK_PD_LCDIF>;
status = "disabled";
- lcdif_disp: port@0 {
+ lcdif_disp: port {
#address-cells = <1>;
#size-cells = <0>;
- reg = <0>;
lcdif_to_dsi: endpoint@0 {
reg = <0>;
@@ -1651,6 +1660,12 @@ ldb_ch0: endpoint {
remote-endpoint = <&lcdif_to_ldb>;
};
};
+
+ port@1 {
+ reg = <1>;
+ endpoint {
+ };
+ };
};
};
--
GitLab