diff --git a/arch/arm64/boot/dts/vendor/qcom/lagoon.dtsi b/arch/arm64/boot/dts/vendor/qcom/lagoon.dtsi
index a0e8acd126c539141a5a986e2d618a2858f2336f..0948ae703bdb306e5fc322096a4239c38f6bd6ab 100644
--- a/arch/arm64/boot/dts/vendor/qcom/lagoon.dtsi
+++ b/arch/arm64/boot/dts/vendor/qcom/lagoon.dtsi
@@ -1558,8 +1558,6 @@
 		reg = <0xc264000 0x4>,
 		      <0x1fd3000 0x4>;
 		reg-names = "pshold-base", "tcsr-boot-misc-detect";
-		qcom,force-warm-reboot;
-
 	};
 
 	qcom_seecom: qseecom@c1700000 {
diff --git a/arch/arm64/configs/vendor/fairphone/FP4.config b/arch/arm64/configs/vendor/fairphone/FP4.config
index 9e90c98ad74495d3aee0e76494913420030c3d81..e6294fe6560e0a3c99ad68f869c4e363dd58c37a 100644
--- a/arch/arm64/configs/vendor/fairphone/FP4.config
+++ b/arch/arm64/configs/vendor/fairphone/FP4.config
@@ -54,8 +54,8 @@ CONFIG_SDFAT_FS=y
 CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y
 CONFIG_TOUCHSCREEN_HIMAX_COMMON=y
 CONFIG_TOUCHSCREEN_HIMAX_IC_HX83112=y
-# CONFIG_TOUCHSCREEN_HIMAX_DEBUG is not set
-# CONFIG_TOUCHSCREEN_HIMAX_INSPECT is not set
+CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y
+CONFIG_TOUCHSCREEN_HIMAX_INSPECT=y
 
 # USB
 # CONFIG_USB_ISP1760 is not set