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

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

Merge "input: synaptics_dsx_2.6: Propagating security fixes from msm-3.18"

parents 06f2342e 12af8915
Loading
Loading
Loading
Loading
+19 −3
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ Required properties:
 - reg			               : i2c slave address of the device.
 - interrupt-parent	           : parent of interrupt.
 - synaptics,irq-gpio	       : irq gpio.
 - synaptics,reset-gpio	       : reset gpio.
 - synaptics,power-gpio	       : power switch gpio.
 - synaptics,irq-flags         : irq flags.

Optional property:
@@ -18,13 +20,23 @@ Optional property:
 - vcc_i2c-supply			   : analog voltage power supply needed to power device.
 - synaptics,pwr-reg-name	   : power reg name of digital voltage.
 - synaptics,bus-reg-name	   : bus reg name of analog voltage.
 - synaptics,irq-on-state      : status of irq gpio.
 - synaptics,irq-on-state	 : irq gpio active state.
 - synaptics,reset-on-state      : reset gpio active state.
 - synaptics,power-on-state      : power switch active state.
 - synaptics,ub-i2c-addr	 : microbootloader mode I2C slave address.
 - synaptics,cap-button-codes  : virtual key code mappings to be used.
 - synaptics,vir-button-codes  : virtual key code and the response region on panel.
 - synaptics,x-flip		       : modify orientation of the x axis.
 - synaptics,y-flip		       : modify orientation of the y axis.
 - synaptics,reset-delay-ms	   : reset delay for controller (ms), default 100.
 - synaptics,reset-active-ms	   : reset active duration for controller (ms), default 100.
 - synaptics,power-delay-ms	   : power delay for controller (ms), default 100.
 - synaptics,max-y-for-2d	   : maximal y value of the panel.
 - synaptics,swap-axes		   : specify whether to swap axes.
 - synaptics,resume-in-workqueue	: specify whether to defer the resume to workqueue.
 - clock-names			: Clock names used for secure touch. They are: "iface_clk", "core_clk"
 - clocks			: Defined if 'clock-names' DT property is defined. These clocks
				  are associated with the underlying I2C bus.

Example:
	i2c@78b7000 {
@@ -34,8 +46,8 @@ Example:
			reg = <0x4b>;
			interrupt-parent = <&tlmm>;
			interrupts = <65 0x2008>;
			vdd_ana-supply = <&pmtitanium_l17>;
			vcc_i2c-supply = <&pmtitanium_l6>;
			vdd_ana-supply = <&pm8953_l17>;
			vcc_i2c-supply = <&pm8953_l6>;
			synaptics,pwr-reg-name = "vdd_ana";
			synaptics,bus-reg-name = "vcc_i2c";
			synaptics,irq-gpio = <&tlmm 65 0x2008>;
@@ -46,5 +58,9 @@ Example:
			synaptics,max-y-for-2d = <1919>; /* remove if no virtual buttons */
			synaptics,cap-button-codes = <139 172 158>;
			synaptics,vir-button-codes = <139 180 2000 320 160 172 540 2000 320 160 158 900 2000 320 160>;
			/* Underlying clocks used by secure touch */
			clock-names = "iface_clk", "core_clk";
			clocks = <&clock_gcc clk_gcc_blsp1_ahb_clk>,
				<&clock_gcc clk_gcc_blsp1_qup3_i2c_apps_clk>;
		};
	};
+10 −0
Original line number Diff line number Diff line
@@ -114,4 +114,14 @@ config TOUCHSCREEN_SYNAPTICS_DSX_VIDEO_v26
	  To compile this driver as a module, choose M here: the
	  module will be called synaptics_dsx_video.

config SECURE_TOUCH_SYNAPTICS_DSX_V26
	bool "Secure Touch support for Synaptics V2.6 Touchscreen"
	depends on TOUCHSCREEN_SYNAPTICS_DSX_I2C_v26
	help
	  Say Y here
	  -Synaptics DSX V2.6 touch driver is connected
	  -To enable secure touch for Synaptics DSX V2.6 touch driver

	  If unsure, say N.

endif
+446 −69

File changed.

Preview size limit exceeded, changes collapsed.

+35 −11

File changed.

Preview size limit exceeded, changes collapsed.

+59 −19

File changed.

Preview size limit exceeded, changes collapsed.

Loading