From 58343a5e889efac2f1021906547a84c3fac5b025 Mon Sep 17 00:00:00 2001
From: Han Gao <gaohan@iscas.ac.cn>
Date: Sun, 2 Jun 2024 00:20:17 +0800
Subject: [PATCH] dts: remove unused node & fix build error

Signed-off-by: Han Gao <gaohan@iscas.ac.cn>
---
 .../boot/dts/thead/th1520-huiwei-dsi0.dts     |  4 ++-
 .../boot/dts/thead/th1520-huiwei-product.dts  | 10 ++++++-
 arch/riscv/boot/dts/thead/th1520-huiwei.dtsi  | 27 -------------------
 drivers/input/fingerprint/Makefile            |  4 +--
 4 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/arch/riscv/boot/dts/thead/th1520-huiwei-dsi0.dts b/arch/riscv/boot/dts/thead/th1520-huiwei-dsi0.dts
index 6e2cf4b9f..151c7aa80 100644
--- a/arch/riscv/boot/dts/thead/th1520-huiwei-dsi0.dts
+++ b/arch/riscv/boot/dts/thead/th1520-huiwei-dsi0.dts
@@ -3,7 +3,7 @@
  * Copyright (C) 2022 Alibaba Group Holding Limited.
  */
 
-#include "th1520-lpi4a.dtsi"
+#include "th1520-huiwei.dtsi"
 
 / {
 	model = "T-HEAD Light Lichee Pi 4A configuration for 8GB DDR board";
@@ -157,3 +157,5 @@
                 };
 	};
 };
+
+/delete-node/ &iso7816;
diff --git a/arch/riscv/boot/dts/thead/th1520-huiwei-product.dts b/arch/riscv/boot/dts/thead/th1520-huiwei-product.dts
index 4975b90b0..d05d5777c 100644
--- a/arch/riscv/boot/dts/thead/th1520-huiwei-product.dts
+++ b/arch/riscv/boot/dts/thead/th1520-huiwei-product.dts
@@ -5,7 +5,7 @@
 
 /dts-v1/;
 
-#include "th1520-huiwei.dtsi"
+#include "th1520-huiwei-dsi0.dts"
 
 &lightsound {
         status = "okay";
@@ -30,3 +30,11 @@
                 };
         };
 };
+
+&dpu_enc0 {
+        status = "okay";
+};
+
+&dsi0 {
+        status = "okay";
+};
diff --git a/arch/riscv/boot/dts/thead/th1520-huiwei.dtsi b/arch/riscv/boot/dts/thead/th1520-huiwei.dtsi
index 1779bae29..10f0c1d0c 100644
--- a/arch/riscv/boot/dts/thead/th1520-huiwei.dtsi
+++ b/arch/riscv/boot/dts/thead/th1520-huiwei.dtsi
@@ -1553,19 +1553,6 @@
 	status = "disabled";
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c3>;
-
-	touch@14 {
-		#gpio-cells = <2>;
-		compatible = "goodix,gt9271";
-		reg = <0x14>;
-		interrupt-parent = <&ao_gpio_porta>;
-		interrupts = <3 0>;
-		irq-gpios = <&ao_gpio_porta 3 0>;
-		reset-gpios = <&pcal6408ahk_d 0 0>;
-		AVDD28-supply = <&reg_tp_pwr_en>;
-		tp-size = <9271>;
-		status = "disable";
-	};
 };
 
 &i2c4 {
@@ -1918,20 +1905,6 @@
 			};
 		};
 	};
-
-	panel0@0 {
-		reg = <0>;
-		backlight = <&lcd0_backlight>;
-		reset-gpio = <&pcal6408ahk_d 7 0>; /* active low */
-		hsvcc-supply = <&soc_vdd18_lcd0_en_reg>;
-		vspn3v3-supply = <&soc_vdd33_lcd0_en_reg>;
-
-		port {
-				panel0_in: endpoint {
-						remote-endpoint = <&dsi0_out>;
-				};
-		};
-	};
 };
 
 &disp1_out {
diff --git a/drivers/input/fingerprint/Makefile b/drivers/input/fingerprint/Makefile
index 31289c6e6..b9f67ff94 100644
--- a/drivers/input/fingerprint/Makefile
+++ b/drivers/input/fingerprint/Makefile
@@ -2,6 +2,6 @@
 # Makefile for all kinds of Fingerprint
 #
 
-obj-$(CONFIG_GOODIX_FINGERPRINT) += goodix/
-obj-$(CONFIG_FPC_FINGERPRINT) += fpc/
+# obj-$(CONFIG_GOODIX_FINGERPRINT) += goodix/
+# obj-$(CONFIG_FPC_FINGERPRINT) += fpc/
 obj-$(CONFIG_MICROARRAY_FINGERPRINT) += microarray_fp/