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

Commit 3515162f authored by tracychui's avatar tracychui Committed by Prashantsinh Parmar
Browse files

Add Touch drivers for FP3 

Include the config and add all touch related drivers
and functions.

Issue: FP3-A11#202
Change-Id: I410640b03f15c06b9f67e6096aea4daa19a23a30
(cherry picked from commit 8a9834c3)
parent 76fb69a0

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

+0 −60
Original line number Diff line number Diff line
@@ -1421,66 +1421,6 @@ 
			};

		};



		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>;

				};

			};

		};



		spi6 {

			spi6_default: spi6_default {

				/* active state */

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

+2 −28
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ 
		i2c2 = &i2c_2;

		i2c3 = &i2c_3;

		i2c5 = &i2c_5;

		spi3 = &spi_3;

//		spi3 = &spi_3;

		spi6 = &spi_6;

	};
@@ -687,32 +687,6 @@ 
		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";

	};



	spi_6: spi@7af6000 { /* BLSP2 QUP2 */

		compatible = "qcom,spi-qup-v2";

		#address-cells = <1>;
@@ -813,7 +787,7 @@ 
		dmas = <&dma_blsp1 8 64 0x20000020 0x20>,

			<&dma_blsp1 9 32 0x20000020 0x20>;

		dma-names = "tx", "rx";

		status = "disabled";

		status = "ok";

	};



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

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

+16 −0
Original line number Diff line number Diff line
@@ -373,3 +373,19 @@ 
	};

};



&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>;

	};

};

arch/arm64/configs/msm8953-perf_defconfig

+4 −5
Original line number Diff line number Diff line
@@ -320,12 +320,11 @@ 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

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

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set

arch/arm64/configs/msm8953_defconfig

+4 −5
Original line number Diff line number Diff line
@@ -327,12 +327,11 @@ 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

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

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set