diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 4e37aa1f0f3391afc29dc5185f9a0fee682195e4..a3be8c618f904edfea29e4561ff09176d01b591b 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 4a495db259052636381d13c735a633db3abbfe48..30245b7ef9ae55294ab25ae44c1d0b26f774affd 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 62fa5eae3acce31b63328103e6fb0b9719e3ebc0..6e3e91ca7dad4f0e0543717291aa5c5435be6817 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 aaf4b9d94377f120e74ccc60aaa820a396443455..379be9b3c2db200bb85dce0c25594a39fb2076ca 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 3354558c04ff28ee2fe6ef4f45017336faf23071..5a4b4feb8ad31b7f42744f707a617c67c3ba05b9 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 f8e53f26e1622e01a34bd5f5d390a0a9a3e7c17f..c63f8f13b73ba426202ff270c4e4f941c92bbc8d 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 ed059528cb6ef052d79054183368088cbbce0b60..f350be92ae9f2934964396a47bb7d2f898da535c 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 4222b30524be87561c87a70c17ba8566e4b00341..fe88826bcbd4909f60acdfc24a9c72a09e4c95b6 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 9967112824f9276586f544d185feab0b73b7ea51..6a31fd1188ff52f8dc613c0aabf8742b3fa14beb 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 8e1595bb7e550d8c93feef8687c617eb9f7a1915..98b3bdd587cbca2a2c37f63014940096fbbcf3f7 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 b86e2eca4950e75eae61def521aee288577f7668..cd4f3cfe96e6d8ee53711c3e56ddf0df4d45d988 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 91acce35065ae3109437aeb8632fd456983cf722..af25b2e9fac92d39ed7a9da0ec2f63e1c654a842 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 9d7d0f9a5c162ef692f220c394a10a9b6804744c..237525c58e0f82fbdd320f4150e2c3b6cb199782 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 e720901d8231beed24d61209b5e423628bbddbf0..45e2da7e2965fbbaf267458ed2fbe5e37aefe07c 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 5fadbe1e8c7d11533266907da0897617c96b9da2..a51b1995eb611ba04277a830e16946479f3a7247 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 46edd382d8b212088392c29585a1513d52817e2b..0e5fb4d5470c1226f2b60be2e790f469a8b33682 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 e241e3646c9a5cd5467e5f64cab0b8fe6292e23a..2456a573171b692bfed90fc3785dcffc29b3e460 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 cc0d1f9d3b48818305e8bbe1c90cd328fd5afe77..17c9db18e5668e3035263e671339dfe74b28543c 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 112929c508e940a469cd52733274c24fb22556ca..42241152ac1126164bee5cc4efa4316fdb18c3bc 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 2d603e43fcda94551269fc0f98ff655ce197ea5f..222e37007b25559ad91eaead322570b877b80ea9 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 8be4b0f17b9d95fd5d662c4995c0801b0febd473..a97b204abd1c8acc3d4d8537f4e07adfefabecef 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 01e8b8e4a6fbe311d1fad22050c8818414d54acf..01eca13d7eb63c84de5f91f8e308402f3b35d08d 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 e4e78e5d4bf80b18e19f091f3c7394421e145d9a..ceee7534b3732cba735b1856dd145dd471c1496d 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 6d64dbb31d212f839563af01aedf48f41201ab90..02276c728bc871663c48f48ce2067c8384e6761e 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 1796274f327c557f0170b7cea60934a64c792a53..0a6a55921c0390f83c031f1658701d74da2839b3 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 f8da0e15d5e5b9fb58e0e1035c572bd811725a70..f6db51ccc4042c11559faea9a7e17620318aafda 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 983a837077d9456bc2ef7f7c80dc727aa8b42cbf..f96b3c1605a5c47cd378cf12e1019b6b2ba568df 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 d4089670c23b54237c3592f4916e06958d21c398..e34d56ae4d090a7e8cb1d80f73fb6588e823f27b 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 e34bd7482ff0353248c1381909b5eb66a0b60af0..a73456edc4bc030ace149213837998943c469ccf 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 780295c5827927ef7beffc28faaf8cb055a9a6db..b279c2f319024de502f6ede5e7e26c7b51792336 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 a6afc7c8d07768abd6788a384766dc29df04e058..9f684827102aa867a7fde783bd9671744e7130b0 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 e58913258af8e7d2c85e45f48d22b8b17cb8e318..1a204bde6d644500842b232476e28e314e31fe2e 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 0e1ff725cb21e1d9b66c8f75aa9f06522c1d9bd0..6be49fb2716855175cd742bf68172c6712755303 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 af9e3883919a36cefa67c260f158449cf88a46f8..ff89ec0fb470bd4575cb6b945a18095606d78156 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 3f0ca0616737d7fa95784361da34b1c12d9ccda9..8308963a05ca28c272909595b1943feab7eac311 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 637b144334d83fadddeac7a645af590c945700f6..e22505de62920abf93da4badacd90956f7d8a44f 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 0014319f76049db11606a5118e1d8b5899607dda..0f401b09c6292e6cb758ca4b30c0618a658784a3 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 5b204e2285eec34e518d24069fab0e9d922684e2..c1f2fbc004a4f2cea2c062034086b47db1e03457 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 e1a33b8cbe3e1b50b7a331479d819bd091aa0fd3..e80c860240d7b862d89feb9e0cd54b65be3fbb17 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 e17938fcd6b81be361386b402d83ef1446f089e9..9e7ef70424a0af6b36d6b10837e9024e0e0909f3 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 bf9d5ee74b39284f2bdd620920664714116bfa09..964698cab406b5942b2ff25ee769a3ea51b4c0db 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 {
 };
 
 &parallel_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 e734d69aa21421e962672fda39ab55ef7310c86c..878e24f2035b86660a276ecf313adf25b1588420 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 23b942f4eae73f3afafcf56b65eefa9f7ae3eb2b..caa8d77f24aae6586a3c2577b9c5675b5646b125 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 {
 };
 
 &parallel_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 774ca1664049ebaa24134bbd63d4748e40505efe..1b18cfd62e528d6d2fe8e989857c407023d975bd 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 b13f23143158f1ed03f4d626d3a2be37442bfab7..7082bbcb47b6007b461d0e8ad80b03cb2e3c751f 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 884efbb35cd38e553c854493d63c6376222395e9..e2d9b9b43f861be910ca5e90472ec41b824d9600 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 {
 };
 
 &parallel_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 56a62a9769b5150d624349452ecff66c6525c6b9..15608f1c8fc2124b1aa9ed8e2e34d60f6f4583db 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 {
+				};
+			};
 		};
 	};