[2/3] arm64: dts: rockchip: Split px30-engicam-px30-core-ctouch2-of10

Message ID 20240521153800.3478838-3-francesco.nicolettap@amarulasolutions.com
State New
Headers show
Series
  • Add of7 DTS support and of10 GPU bindings
Related show

Commit Message

Francesco Nicoletta Puzzillo May 21, 2024, 3:37 p.m. UTC
Add a new generic ctouch2-of file and move part of the ctouch2-of10
devicetree in preparation of the ctouch2-of7, which uses nearly the same
bindings of the ctouch2-of10.

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
---
 .../px30-engicam-px30-core-ctouch2-of.dtsi    | 79 +++++++++++++++++++
 .../px30-engicam-px30-core-ctouch2-of10.dts   | 61 +-------------
 2 files changed, 80 insertions(+), 60 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of.dtsi

Patch

diff --git a/arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of.dtsi b/arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of.dtsi
new file mode 100644
index 000000000000..ab35ca02edd1
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of.dtsi
@@ -0,0 +1,79 @@ 
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd
+ * Copyright (c) 2020 Engicam srl
+ * Copyright (c) 2020 Amarula Solutions(India)
+ */
+
+/dts-v1/;
+#include "px30.dtsi"
+#include "px30-engicam-ctouch2.dtsi"
+#include "px30-engicam-px30-core.dtsi"
+
+/ {
+	compatible = "engicam,px30-core", "rockchip,px30";
+
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		pwms = <&pwm0 0 25000 0>;
+	};
+
+	chosen {
+		stdout-path = "serial2:115200n8";
+	};
+
+	panel {
+		backlight = <&backlight>;
+		power-supply = <&vcc3v3_lcd>;
+		data-mapping = "vesa-24";
+
+		port {
+			panel_in_lvds: endpoint {
+				remote-endpoint = <&lvds_out_panel>;
+			};
+		};
+	};
+};
+
+&display_subsystem {
+	status = "okay";
+};
+
+&dsi_dphy {
+	status = "okay";
+};
+
+&lvds {
+	status = "okay";
+
+	ports {
+		port@1 {
+			reg = <1>;
+
+			lvds_out_panel: endpoint {
+				remote-endpoint = <&panel_in_lvds>;
+			};
+		};
+	};
+};
+
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+};
+
+&vopl_mmu {
+	status = "okay";
+};
+
+&gpu {
+	mali-supply = <&vdd_log>;
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of10.dts b/arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of10.dts
index 392147245ce7..e3040397dff1 100644
--- a/arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of10.dts
+++ b/arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-ctouch2-of10.dts
@@ -9,74 +9,15 @@ 
 #include "px30.dtsi"
 #include "px30-engicam-ctouch2.dtsi"
 #include "px30-engicam-px30-core.dtsi"
+#include "px30-engicam-px30-core-ctouch2-of.dtsi"
 
 / {
 	model = "Engicam PX30.Core C.TOUCH 2.0 10.1\" Open Frame";
 	compatible = "engicam,px30-core-ctouch2-of10", "engicam,px30-core",
 		     "rockchip,px30";
 
-	backlight: backlight {
-		compatible = "pwm-backlight";
-		pwms = <&pwm0 0 25000 0>;
-	};
-
-	chosen {
-		stdout-path = "serial2:115200n8";
-	};
 
 	panel {
 		compatible = "ampire,am-1280800n3tzqw-t00h";
-		backlight = <&backlight>;
-		power-supply = <&vcc3v3_lcd>;
-		data-mapping = "vesa-24";
-
-		port {
-			panel_in_lvds: endpoint {
-				remote-endpoint = <&lvds_out_panel>;
-			};
-		};
 	};
 };
-
-&display_subsystem {
-	status = "okay";
-};
-
-&dsi_dphy {
-	status = "okay";
-};
-
-&lvds {
-	status = "okay";
-
-	ports {
-		port@1 {
-			reg = <1>;
-
-			lvds_out_panel: endpoint {
-				remote-endpoint = <&panel_in_lvds>;
-			};
-		};
-	};
-};
-
-&vopb {
-	status = "okay";
-};
-
-&vopb_mmu {
-	status = "okay";
-};
-
-&vopl {
-	status = "okay";
-};
-
-&vopl_mmu {
-	status = "okay";
-};
-
-&gpu {
-	mali-supply = <&vdd_log>;
-	status = "okay";
-};