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

Commit db6e456c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: enable goodix touch driver compilation for apq8009"

parents 9aeb7f25 7c3ed968

arch/arm/configs/msm8909-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -254,6 +254,9 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_KEYBOARD_GPIO=y

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_GT9XX_v28=y

CONFIG_TOUCHSCREEN_GT9XX_UPDATE=y

CONFIG_TOUCHSCREEN_GT9XX_TOOL=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_STMVL53L0X=y

arch/arm/configs/msm8909_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -271,6 +271,9 @@ CONFIG_KEYBOARD_GPIO=y 
CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_GT9XX_v28=y

CONFIG_TOUCHSCREEN_GT9XX_UPDATE=y

CONFIG_TOUCHSCREEN_GT9XX_TOOL=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_STMVL53L0X=y

arch/arm64/boot/dts/qcom/apq8009-dragon.dts

+44 −0
Original line number Diff line number Diff line
@@ -361,3 +361,47 @@ 
&blsp1_uart1 {

	status = "disabled";

};



&i2c_5 {

	status = "okay";

	goodix_ts@5d {

		compatible = "goodix,gt9xx";

		status = "okay";

		reg = <0x5d>;

		vdd_ana-supply = <&pm8916_l17>;

		vcc_i2c-supply = <&pm8916_l6>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <13 0x2008>;

		pinctrl-names = "gdix_ts_int_default", "gdix_ts_int_output_low",

			"gdix_ts_int_output_high", "gdix_ts_int_input",

			"gdix_ts_rst_default", "gdix_ts_rst_output_low",

			"gdix_ts_rst_output_high", "gdix_ts_rst_input";

		pinctrl-0 = <&ts_int_default>;

		pinctrl-1 = <&ts_int_output_low>;

		pinctrl-2 = <&ts_int_output_high>;

		pinctrl-3 = <&ts_int_input>;

		pinctrl-4 = <&ts_rst_default>;

		pinctrl-5 = <&ts_rst_output_low>;

		pinctrl-6 = <&ts_rst_output_high>;

		pinctrl-7 = <&ts_rst_input>;

		reset-gpios = <&msm_gpio 16 0x00>;

		irq-gpios = <&msm_gpio 13 0x2008>;

		irq-flags = <2>;

		touchscreen-max-id = <5>;

		touchscreen-size-x = <479>;

		touchscreen-size-y = <853>;

		touchscreen-max-w = <1024>;

		touchscreen-max-p = <1024>;

		goodix,type-a-report = <0>;

		goodix,driver-send-cfg = <1>;

		goodix,wakeup-with-reset = <0>;

		goodix,resume-in-workqueue = <1>;

		goodix,int-sync = <1>;

		goodix,swap-x2y = <0>;

		goodix,esd-protect = <1>;

		goodix,pen-suppress-finger = <0>;

		goodix,auto-update = <1>;

		goodix,auto-update-cfg = <0>;

		goodix,power-off-sleep = <0>;

	};

};

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

+97 −0
Original line number Diff line number Diff line
@@ -922,6 +922,103 @@ 
			};

		};



		/* add pingrp for goodix touch */

		ts_int_default: ts_int_default {

			mux {

				pins = "gpio13";

				function = "gpio";

			};

			config {

				pins = "gpio13";

				drive-strength = <16>;

				/*bias-pull-up;*/

				input-enable;

				bias-disable;

			};

		};



		ts_int_output_high: ts_int_output_high {

			mux {

				pins = "gpio13";

				function = "gpio";

			};

			config {

				pins = "gpio13";

				output-high;

			};

		};



		ts_int_output_low: ts_int_output_low {

			mux {

				pins = "gpio13";

				function = "gpio";

			};

			config {

				pins = "gpio13";

				output-low;

			};

		};



		ts_int_input: ts_int_input {

			mux {

				pins = "gpio13";

				function = "gpio";

			};

			config {

				pins = "gpio13";

				input-enable;

				bias-disable;

			};

		};



		ts_rst_default: ts_rst_default {

			mux {

				pins = "gpio16";

				function = "gpio";

			};

			config {

				pins = "gpio16";

				drive-strength = <16>;

				/*bias-pull-up;*/

				input-enable;

				bias-disable;

			};

		};



		ts_rst_output_high: ts_rst_output_high {

			mux {

				pins = "gpio16";

				function = "gpio";

			};

			config {

				pins = "gpio16";

				output-high;

			};

		};



		ts_rst_output_low: ts_rst_output_low {

			mux {

				pins = "gpio16";

				function = "gpio";

			};

			config {

				pins = "gpio16";

				output-low;

			};

		};



		ts_rst_input: ts_rst_input {

			mux {

				pins = "gpio16";

				function = "gpio";

			};

			config {

				pins = "gpio16";

				input-enable;

				bias-disable;

			};

		};



		/* add pingrp for touchscreen */

		pmx_ts_int_active {

			ts_int_active: ts_int_active {