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

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

Merge "arm64: defconfig: add trusted touch support to GKI defconfig"

parents fb09ecb9 4f7f4c27

arch/arm64/configs/vendor/genericarmv8-64_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ CONFIG_INPUT_TOUCHSCREEN=y 
CONFIG_TOUCHSCREEN_ATMEL_MXT=m

CONFIG_TOUCHSCREEN_ST=y

CONFIG_ST_TRUSTED_TOUCH=y

CONFIG_TOUCHSCREEN_FTS=y

CONFIG_FTS_TRUSTED_TOUCH=y

CONFIG_INPUT_MISC=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIO_AMBAKMI=y

arch/arm64/configs/vendor/lahaina_GKI.config

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ CONFIG_TOUCHSCREEN_USB_COMPOSITE=m 
CONFIG_TOUCHSCREEN_ST=m

CONFIG_ST_TRUSTED_TOUCH=y

CONFIG_TOUCHSCREEN_FTS=m

CONFIG_FTS_TRUSTED_TOUCH=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=m

CONFIG_SPS=m

CONFIG_SPS_SUPPORT_NDP_BAM=y

drivers/input/touchscreen/focaltech_touch/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -12,3 +12,12 @@ config TOUCHSCREEN_FTS_DIRECTORY 
	string "Focaltech ts directory name"

	default "focaltech_touch"

	depends on TOUCHSCREEN_FTS



config FTS_TRUSTED_TOUCH

	bool "Focaltech Trusted Touch"

	depends on TOUCHSCREEN_FTS

	help

	  Say Y here to enable Focaltech Trusted Touch.

	  If unsure, say N.



#endif

drivers/input/touchscreen/focaltech_touch/focaltech_core.c

+955 −46

File changed.

Preview size limit exceeded, changes collapsed.

drivers/input/touchscreen/focaltech_touch/focaltech_core.h

+44 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <linux/sched.h>

#include <linux/kthread.h>

#include <linux/dma-mapping.h>

#include <linux/haven/hh_irq_lend.h>

#include "focaltech_common.h"



/*****************************************************************************
@@ -138,6 +139,33 @@ struct ts_event { 
	int area;

};



enum trusted_touch_mode_config {

	TRUSTED_TOUCH_VM_MODE,

	TRUSTED_TOUCH_MODE_NONE

};



#ifdef CONFIG_FTS_TRUSTED_TOUCH

#define TRUSTED_TOUCH_MEM_LABEL 0x7



struct trusted_touch_vm_info {

	enum hh_irq_label irq_label;

	enum hh_vm_names vm_name;

	u32 hw_irq;

	hh_memparcel_handle_t vm_mem_handle;

	u32 *iomem_bases;

	u32 *iomem_sizes;

	u32 iomem_list_size;

	void *mem_cookie;

#ifdef CONFIG_ARCH_QTI_VM

	atomic_t tvm_owns_iomem;

	atomic_t tvm_owns_irq;

#else

	atomic_t pvm_owns_iomem;

	atomic_t pvm_owns_irq;

#endif

};

#endif



struct fts_ts_data {

	struct i2c_client *client;

	struct spi_device *spi;
@@ -190,6 +218,20 @@ struct fts_ts_data { 
#elif defined(CONFIG_HAS_EARLYSUSPEND)

	struct early_suspend early_suspend;

#endif



#ifdef CONFIG_FTS_TRUSTED_TOUCH

	struct trusted_touch_vm_info *vm_info;

	struct mutex fts_clk_io_ctrl_mutex;

	const char *touch_environment;

	struct completion trusted_touch_powerdown;

	struct completion resource_checkpoint;

	struct clk *core_clk;

	struct clk *iface_clk;

	atomic_t trusted_touch_initialized;

	atomic_t trusted_touch_enabled;

	atomic_t delayed_vm_probe_pending;

	atomic_t trusted_touch_mode;

#endif

};



/*****************************************************************************
@@ -258,4 +300,6 @@ int fts_ex_mode_recovery(struct fts_ts_data *ts_data); 


void fts_irq_disable(void);

void fts_irq_enable(void);

int fts_ts_handle_trusted_touch_pvm(struct fts_ts_data *ts_data, int value);

int fts_ts_handle_trusted_touch_tvm(struct fts_ts_data *ts_data, int value);

#endif /* __LINUX_FOCALTECH_CORE_H__ */