Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba8d902 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge branch '1877os-t-FP4_touch' into 'v1-t' 

Revert "arm64: dts: vendor: lagoon.dtsi: Force warm reboot"

See merge request !22
parents 5e580c09 36c195d7

arch/arm64/boot/dts/vendor/qcom/lagoon.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -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 {

arch/arm64/configs/vendor/fairphone/FP4.config

+2 −2
Original line number Diff line number Diff line
@@ -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