ARM64: dts: colibri-imx8x: enable dpu g2d also for lcdif dtb

The dprX_channelY, pixel-combiner and prgX nodes need to be enabled
to use the g2d functionality.

Thus move those nodes into the common fsl-imx8qxp-colibri-eval-v3.dtsi, so that
fsl-imx8qxp-colibri-eval-v3.dts also gets them enabled.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

5 files changed, 77 insertions, 259 deletions

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
index 3ebbcef280ad..eccec4ba19a9 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
@@ -23,39 +23,6 @@
 	status = "disabled";
 };
 
-/* Display Prefetch Resolve, (Tiling) */
-&dpr1_channel1 {
-	status = "okay";
-};
-
-&dpr1_channel2 {
-	status = "okay";
-};
-
-&dpr1_channel3 {
-	status = "okay";
-};
-
-&dpr2_channel1 {
-	status = "okay";
-};
-
-&dpr2_channel2 {
-	status = "okay";
-};
-
-&dpr2_channel3 {
-	status = "okay";
-};
-
-&dpu1 {
-	status = "okay";
-};
-
-&gpu_3d0 {
-	status = "okay";
-};
-
 /* DSI/LVDS port 0 */
 &i2c0_mipi_lvds0 {
 	status = "okay";
@@ -151,43 +118,3 @@
 		};
 	};
 };
-
-&pixel_combiner {
-	status = "okay";
-};
-
-&prg1 {
-	status = "okay";
-};
-
-&prg2 {
-	status = "okay";
-};
-
-&prg3 {
-	status = "okay";
-};
-
-&prg4 {
-	status = "okay";
-};
-
-&prg5 {
-	status = "okay";
-};
-
-&prg6 {
-	status = "okay";
-};
-
-&prg7 {
-	status = "okay";
-};
-
-&prg8 {
-	status = "okay";
-};
-
-&prg9 {
-	status = "okay";
-};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
index 8fe89b10aa6a..867de348041f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
@@ -75,10 +75,6 @@
 	status = "okay";
 };
 
-&dpu1 {
-	status = "okay";
-};
-
 /* Colibri Ethernet */
 &fec1 {
 	status = "okay";
@@ -95,10 +91,6 @@
 	pad-wakeup-num = <1>;
  };
 
-&gpu_3d0 {
-	status = "okay";
-};
-
 &i2c1 {
 	status = "okay";
 
@@ -109,10 +101,6 @@
 	};
 };
 
-&imx8_gpu_ss {
-	status = "okay";
-};
-
 /* Colibri SPI */
 &lpspi2 {
 	status = "okay";
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
index fe35cadd2f9c..71a1654a1163 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
@@ -40,43 +40,6 @@
 	status = "okay";
 };
 
-/* Display Prefetch Resolve, (Tiling) */
-&dpr1_channel1 {
-	status = "okay";
-};
-
-&dpr1_channel2 {
-	status = "okay";
-};
-
-&dpr1_channel3 {
-	status = "okay";
-};
-
-&dpr2_channel1 {
-	status = "okay";
-};
-
-&dpr2_channel2 {
-	status = "okay";
-};
-
-&dpr2_channel3 {
-	status = "okay";
-};
-
-&dpu1 {
-	status = "okay";
-};
-
-&gpu_3d0 {
-	status = "okay";
-};
-
-&imx8_gpu_ss {
-	status = "okay";
-};
-
 &iomuxc {
 	pinctrl-names = "default";
 
@@ -153,53 +116,3 @@
 &i2c1 {
 	status = "okay";
 };
-
-&pixel_combiner {
-	status = "okay";
-};
-
-&prg1 {
-	status = "okay";
-};
-
-&prg2 {
-	status = "okay";
-};
-
-&prg3 {
-	status = "okay";
-};
-
-&prg4 {
-	status = "okay";
-};
-
-&prg5 {
-	status = "okay";
-};
-
-&prg6 {
-	status = "okay";
-};
-
-&prg7 {
-	status = "okay";
-};
-
-&prg8 {
-	status = "okay";
-};
-
-&prg9 {
-	status = "okay";
-};
-
-/* Colibri PWM_B */
-&pwm0 {
-	status = "disabled";
-};
-
-/* Colibri PWM_C */
-&pwm1 {
-	status = "disabled";
-};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
index a8d4eb7c8edf..5a5ed0f3f441 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
@@ -52,43 +52,6 @@
 	status = "okay";
 };
 
-/* Display Prefetch Resolve, (Tiling) */
-&dpr1_channel1 {
-	status = "okay";
-};
-
-&dpr1_channel2 {
-	status = "okay";
-};
-
-&dpr1_channel3 {
-	status = "okay";
-};
-
-&dpr2_channel1 {
-	status = "okay";
-};
-
-&dpr2_channel2 {
-	status = "okay";
-};
-
-&dpr2_channel3 {
-	status = "okay";
-};
-
-&dpu1 {
-	status = "okay";
-};
-
-&gpu_3d0 {
-	status = "okay";
-};
-
-&imx8_gpu_ss {
-	status = "okay";
-};
-
 &iomuxc {
 	pinctrl-names = "default";
 
@@ -170,53 +133,3 @@
 &i2c1 {
 	status = "okay";
 };
-
-&pixel_combiner {
-	status = "okay";
-};
-
-&prg1 {
-	status = "okay";
-};
-
-&prg2 {
-	status = "okay";
-};
-
-&prg3 {
-	status = "okay";
-};
-
-&prg4 {
-	status = "okay";
-};
-
-&prg5 {
-	status = "okay";
-};
-
-&prg6 {
-	status = "okay";
-};
-
-&prg7 {
-	status = "okay";
-};
-
-&prg8 {
-	status = "okay";
-};
-
-&prg9 {
-	status = "okay";
-};
-
-/* Colibri PWM_B */
-&pwm0 {
-	status = "disabled";
-};
-
-/* Colibri PWM_C */
-&pwm1 {
-	status = "disabled";
-};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
index 8c755fae4f22..968df56a3ce8 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
@@ -146,6 +146,35 @@
 	status = "okay";
 };
 
+/* Display Prefetch Resolve, (Tiling) */
+&dpr1_channel1 {
+	status = "okay";
+};
+
+&dpr1_channel2 {
+	status = "okay";
+};
+
+&dpr1_channel3 {
+	status = "okay";
+};
+
+&dpr2_channel1 {
+	status = "okay";
+};
+
+&dpr2_channel2 {
+	status = "okay";
+};
+
+&dpr2_channel3 {
+	status = "okay";
+};
+
+&dpu1 {
+	status = "okay";
+};
+
 /* Colibri Ethernet */
 &fec1 {
 	pinctrl-names = "default", "sleep";
@@ -209,6 +238,10 @@
 	status = "okay";
 };
 
+&gpu_3d0 {
+	status = "okay";
+};
+
 /* On-module I2C */
 &i2c0 {
 	#address-cells = <1>;
@@ -326,6 +359,10 @@
         };
 };
 
+&imx8_gpu_ss {
+	status = "okay";
+};
+
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog1>, <&pinctrl_hog2>,
@@ -881,6 +918,46 @@
 	debug_console;
 };
 
+&pixel_combiner {
+	status = "okay";
+};
+
+&prg1 {
+	status = "okay";
+};
+
+&prg2 {
+	status = "okay";
+};
+
+&prg3 {
+	status = "okay";
+};
+
+&prg4 {
+	status = "okay";
+};
+
+&prg5 {
+	status = "okay";
+};
+
+&prg6 {
+	status = "okay";
+};
+
+&prg7 {
+	status = "okay";
+};
+
+&prg8 {
+	status = "okay";
+};
+
+&prg9 {
+	status = "okay";
+};
+
 /* Colibri PWM_A */
 &pwm_adma_lcdif {
 	pinctrl-names = "default";