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

Commit a142beb8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add ATEML touch support for atoll target"

parents f010ff7f 38345889

arch/arm64/boot/dts/qcom/atoll-idp.dtsi

+21 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -221,6 +221,7 @@ 
&qupv3_se7_i2c {

	status = "ok";



	qcom,i2c-touch-active = "synaptics,tcm-i2c";

	synaptics_tcm@20 {

		compatible = "synaptics,tcm-i2c";

		reg = <0x20>;
@@ -244,6 +245,25 @@ 
		synaptics,power-delay-ms = <200>;

		synaptics,ubl-i2c-addr = <0x20>;

	};



	atmel_mxt_ts@4a {

		compatible = "atmel,maxtouch";

		reg = <0x4a>;

		interrupt-parent = <&tlmm>;

		interrupts = <9 0x2008>;

		avdd-supply = <&pm6150l_l7>;

		vdd-supply = <&pm6150_l10>;

		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;



		reset-gpios = <&tlmm 8 0x00>;

		irq-gpios = <&tlmm 9 0x2008>;



		atmel,xy_switch;

		atmel,panel-coords = <0 0 479 799>;

		atmel,display-coords = <0 0 339 769>;

	};

};



&dsi_rm69299_visionox_amoled_video {

drivers/input/touchscreen/atmel_mxt_ts.c

+6 −0
Original line number Diff line number Diff line
@@ -3381,6 +3381,9 @@ static int mxt_parse_device_properties(struct mxt_data *data) 


#ifdef CONFIG_OF



static bool mxt_enable;

module_param_named(enable, mxt_enable, bool, 0664);



static int mxt_check_dedicated_touch(struct device_node *dt, const char *prop,

		const char *active_prop)

{
@@ -3389,6 +3392,9 @@ static int mxt_check_dedicated_touch(struct device_node *dt, const char *prop, 
	char *temp;

	int ret = 0;



	if (mxt_enable)

		return 0;



	ret = of_property_read_string(dt->parent, active_prop, &active_touch);

	if (ret < 0) {

		pr_info(" %s:not dedicated active touch", __func__);