Touch driver porting (8a9834c3) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/msm8953-pinctrl.dtsi

+61 −59

Original line number	Diff line number	Diff line
		@@ -1432,65 +1432,67 @@
		};
		};

		spi3 {
		spi3_default: spi3_default {
		/* active state */
		mux {
		/* MOSI, MISO, CLK */
		pins = "gpio8", "gpio9", "gpio11";
		function = "blsp_spi3";
		};

		config {
		pins = "gpio8", "gpio9", "gpio11";
		drive-strength = <12>; /* 12 MA */
		bias-disable = <0>; /* No PULL */
		};
		};

		spi3_sleep: spi3_sleep {
		/* suspended state */
		mux {
		/* MOSI, MISO, CLK */
		pins = "gpio8", "gpio9", "gpio11";
		function = "gpio";
		};

		config {
		pins = "gpio8", "gpio9", "gpio11";
		drive-strength = <2>; /* 2 MA */
		bias-pull-down; /* PULL Down */
		};
		};

		spi3_cs0_active: cs0_active {
		/* CS */
		mux {
		pins = "gpio10";
		function = "blsp_spi3";
		};

		config {
		pins = "gpio10";
		drive-strength = <2>;
		bias-disable = <0>;
		};
		};

		spi3_cs0_sleep: cs0_sleep {
		/* CS */
		mux {
		pins = "gpio10";
		function = "gpio";
		};

		config {
		pins = "gpio10";
		drive-strength = <2>;
		bias-disable = <0>;
		};
		};
		};
		/[20200429][TracyChui]Touch driver porting start/
		// spi3 {
		// spi3_default: spi3_default {
		// /* active state */
		// mux {
		// /* MOSI, MISO, CLK */
		// pins = "gpio8", "gpio9", "gpio11";
		// function = "blsp_spi3";
		// };

		// config {
		// pins = "gpio8", "gpio9", "gpio11";
		// drive-strength = <12>; /* 12 MA */
		// bias-disable = <0>; /* No PULL */
		// };
		// };

		// spi3_sleep: spi3_sleep {
		// /* suspended state */
		// mux {
		// /* MOSI, MISO, CLK */
		// pins = "gpio8", "gpio9", "gpio11";
		// function = "gpio";
		// };

		// config {
		// pins = "gpio8", "gpio9", "gpio11";
		// drive-strength = <2>; /* 2 MA */
		// bias-pull-down; /* PULL Down */
		// };
		// };

		// spi3_cs0_active: cs0_active {
		// /* CS */
		// mux {
		// pins = "gpio10";
		// function = "blsp_spi3";
		// };

		// config {
		// pins = "gpio10";
		// drive-strength = <2>;
		// bias-disable = <0>;
		// };
		// };

		// spi3_cs0_sleep: cs0_sleep {
		// /* CS */
		// mux {
		// pins = "gpio10";
		// function = "gpio";
		// };

		// config {
		// pins = "gpio10";
		// drive-strength = <2>;
		// bias-disable = <0>;
		// };
		// };
		// };
		/[20200429][TracyChui]Touch driver porting end/

		spi6 {
		spi6_default: spi6_default {

arch/arm64/boot/dts/qcom/msm8953.dtsi

+35 −28

Original line number	Diff line number	Diff line
		@@ -188,7 +188,9 @@
		i2c2 = &i2c_2;
		i2c3 = &i2c_3;
		i2c5 = &i2c_5;
		spi3 = &spi_3;
		/[20200429][TracyChui]Touch driver porting start/
		// spi3 = &spi_3;
		/[20200429][TracyChui]Touch driver porting end/
		spi6 = &spi_6;
		};

		@@ -687,31 +689,33 @@
		qcom,summing-threshold = <10>;
		};

		spi_3: spi@78b7000 { /* BLSP1 QUP3 */
		compatible = "qcom,spi-qup-v2";
		#address-cells = <1>;
		#size-cells = <0>;
		reg-names = "spi_physical", "spi_bam_physical";
		reg = <0x78b7000 0x600>,
		<0x7884000 0x1f000>;
		interrupt-names = "spi_irq", "spi_bam_irq";
		interrupts = <0 97 0>, <0 238 0>;
		spi-max-frequency = <19200000>;
		pinctrl-names = "spi_default", "spi_sleep";
		pinctrl-0 = <&spi3_default &spi3_cs0_active>;
		pinctrl-1 = <&spi3_sleep &spi3_cs0_sleep>;
		clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
		<&clock_gcc clk_gcc_blsp1_qup3_spi_apps_clk>;
		clock-names = "iface_clk", "core_clk";
		qcom,infinite-mode = <0>;
		qcom,use-bam;
		qcom,use-pinctrl;
		qcom,ver-reg-exists;
		qcom,bam-consumer-pipe-index = <8>;
		qcom,bam-producer-pipe-index = <9>;
		qcom,master-id = <86>;
		status = "disabled";
		};
		/[20200429][TracyChui]Touch driver porting start/
		// spi_3: spi@78b7000 { /* BLSP1 QUP3 */
		// compatible = "qcom,spi-qup-v2";
		// #address-cells = <1>;
		// #size-cells = <0>;
		// reg-names = "spi_physical", "spi_bam_physical";
		// reg = <0x78b7000 0x600>,
		// <0x7884000 0x1f000>;
		// interrupt-names = "spi_irq", "spi_bam_irq";
		// interrupts = <0 97 0>, <0 238 0>;
		// spi-max-frequency = <19200000>;
		// pinctrl-names = "spi_default", "spi_sleep";
		// pinctrl-0 = <&spi3_default &spi3_cs0_active>;
		// pinctrl-1 = <&spi3_sleep &spi3_cs0_sleep>;
		// clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
		// <&clock_gcc clk_gcc_blsp1_qup3_spi_apps_clk>;
		// clock-names = "iface_clk", "core_clk";
		// qcom,infinite-mode = <0>;
		// qcom,use-bam;
		// qcom,use-pinctrl;
		// qcom,ver-reg-exists;
		// qcom,bam-consumer-pipe-index = <8>;
		// qcom,bam-producer-pipe-index = <9>;
		// qcom,master-id = <86>;
		// status = "disabled";
		// };
		/[20200429][TracyChui]Touch driver porting end/

		spi_6: spi@7af6000 { /* BLSP2 QUP2 */
		compatible = "qcom,spi-qup-v2";
		@@ -813,7 +817,10 @@
		dmas = <&dma_blsp1 8 64 0x20000020 0x20>,
		<&dma_blsp1 9 32 0x20000020 0x20>;
		dma-names = "tx", "rx";
		status = "disabled";
		/[20200429][TracyChui]Touch driver porting start/
		//status = "disabled";
		status = "ok";
		/[20200429][TracyChui]Touch driver porting end/
		};

		i2c_5: i2c@7af5000 { /* BLSP2 QUP1 */

arch/arm64/boot/dts/qcom/sdm450-pmi632.dtsi

+19 −1

Original line number	Diff line number	Diff line
		@@ -402,3 +402,21 @@
		};
		};
		*/
		/[20200429][TracyChui]Touch driver porting start /
		&i2c_3 {
		status = "ok";
		himax_ts@48 {
		compatible = "himax,hxcommon";
		reg = <0x48>;
		interrupt-parent = <&tlmm>;
		interrupts = <65 0x2008>;
		vcc_i2c-supply = <&pm8953_l6>;
		vdd-ana-supply = <&pm8953_l10>;
		himax,display-coords = <0 1080 0 2160>;
		himax,panel-coords = <0 1080 0 2160>;
		himax,irq-gpio = <&tlmm 65 0x2008>;
		himax,rst-gpio = <&tlmm 64 0x00>;
		report_type = <1>;
		};
		};
		/[20200429][TracyChui]Touch driver porting end /

arch/arm64/configs/msm8953-perf_defconfig

+10 −5

Original line number	Diff line number	Diff line
		@@ -321,12 +321,17 @@ CONFIG_KEYBOARD_GPIO=y
		# CONFIG_INPUT_MOUSE is not set
		CONFIG_INPUT_JOYSTICK=y
		CONFIG_INPUT_TOUCHSCREEN=y
		CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v26=y
		CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v26=y
		CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y
		CONFIG_SECURE_TOUCH_SYNAPTICS_DSX_V26=y
		#[20200429][TracyChui]Touch driver porting start
		#CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v26=y
		#CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v26=y
		#CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y
		#CONFIG_SECURE_TOUCH_SYNAPTICS_DSX_V26=y
		CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y
		CONFIG_TOUCHSCREEN_HIMAX_I2C=y
		CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		# CONFIG_INPUT_HBTP_INPUT=y
		#[20200429][TracyChui]Touch driver porting end
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_UINPUT=y
		# CONFIG_SERIO_SERPORT is not set

arch/arm64/configs/msm8953_defconfig

+10 −5

Original line number	Diff line number	Diff line
		@@ -328,12 +328,17 @@ CONFIG_KEYBOARD_GPIO=y
		# CONFIG_INPUT_MOUSE is not set
		CONFIG_INPUT_JOYSTICK=y
		CONFIG_INPUT_TOUCHSCREEN=y
		CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v26=y
		CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v26=y
		CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y
		CONFIG_SECURE_TOUCH_SYNAPTICS_DSX_V26=y
		#[20200429][TracyChui]Touch driver porting start
		#CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v26=y
		#CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v26=y
		#CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y
		#CONFIG_SECURE_TOUCH_SYNAPTICS_DSX_V26=y
		CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y
		CONFIG_TOUCHSCREEN_HIMAX_I2C=y
		CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		# CONFIG_INPUT_HBTP_INPUT=y
		#[20200429][TracyChui]Touch driver porting end
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_UINPUT=y
		# CONFIG_SERIO_SERPORT is not set