Commit 41a6f0e3 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.17/intel-thc' into for-linus 

- support for Wake-on-touch in intel-thc (Even Xu)

- support for "Input max input size control" and "Input interrupt delay"
  I2C features in order to improve compatibility of THC devices with
  legacy HIDI2C touch devices (Even Xu)
parents bfb01957 7852beb1

Documentation/hid/intel-thc-hid.rst

+28 −0
Original line number Diff line number Diff line
@@ -188,6 +188,34 @@ Control register. 
Reset line is controlled by BIOS (or EFI) through ACPI _RST method, driver needs to call this

device ACPI _RST method to reset touch IC during initialization.



2.3 Max input size control

--------------------------



This is a new feature introduced in Panther Lake platform, THC hardware allows driver to set

a max input size for RxDMA. After this max size gets set and enabled, for every input report

packet reading, THC hardware sequencer will first read incoming input packet size, then compare

input packet size with the given max size:



- if input packet size <= max size, THC continues using input packet size to finish the reading

- if input packet size > max size, there is potential input data crash risk during

  transferring, THC will use max size instead of input packet size for reading



This feature is used to avoid data corruption which will cause RxDMA buffer overrun issue for

I2C bus, and enhance whole system stability.



2.4 Interrupt delay

-------------------



Because of MCU performance limitation, some touch devices cannot de-assert interrupt pin

immediately after input data is transferred, which cause an interrupt toggle delay. But THC

always detects next interrupt immediately after last input interrupt is handled. In this

case, the delayed interrupt de-assertion will be recognized as a new interrupt signal by THC,

and causes THC to start an input report reading spuriously.



In order to avoid this situation, THC introduced interrupt delay new feature in Panther Lake

platform, where THC allows driver to set an interrupt delay. After this feature is enabled,

THC will delay this given time for next interrupt detection.



3. High level concept

=====================

drivers/hid/intel-thc-hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
obj-$(CONFIG_INTEL_THC_HID) += intel-thc.o

intel-thc-objs += intel-thc/intel-thc-dev.o

intel-thc-objs += intel-thc/intel-thc-dma.o

intel-thc-objs += intel-thc/intel-thc-wot.o



obj-$(CONFIG_INTEL_QUICKSPI) += intel-quickspi.o

intel-quickspi-objs += intel-quickspi/pci-quickspi.o

drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c

+139 −79
Original line number Diff line number Diff line
@@ -11,13 +11,20 @@ 
#include <linux/sizes.h>

#include <linux/pm_runtime.h>



#include <linux/gpio/consumer.h>



#include "intel-thc-dev.h"

#include "intel-thc-hw.h"

#include "intel-thc-wot.h"



#include "quicki2c-dev.h"

#include "quicki2c-hid.h"

#include "quicki2c-protocol.h"



static struct quicki2c_ddata ptl_ddata = {

	.max_detect_size = MAX_RX_DETECT_SIZE_PTL,

};



/* THC QuickI2C ACPI method to get device properties */

/* HIDI2C device method */

static guid_t i2c_hid_guid =
@@ -27,19 +34,26 @@ static guid_t i2c_hid_guid = 
static guid_t thc_platform_guid =

	GUID_INIT(0x84005682, 0x5b71, 0x41a4, 0x8d, 0x66, 0x81, 0x30, 0xf7, 0x87, 0xa1, 0x38);



/* QuickI2C Wake-on-Touch GPIO resource */

static const struct acpi_gpio_params wake_gpio = { 0, 0, true };



static const struct acpi_gpio_mapping quicki2c_gpios[] = {

	{ "wake-on-touch", &wake_gpio, 1 },

	{ }

};



/**

 * quicki2c_acpi_get_dsm_property - Query device ACPI DSM parameter

 *

 * @adev: point to ACPI device

 * @adev: Point to ACPI device

 * @guid: ACPI method's guid

 * @rev: ACPI method's revision

 * @func: ACPI method's function number

 * @type: ACPI parameter's data type

 * @prop_buf: point to return buffer

 * @prop_buf: Point to return buffer

 *

 * This is a helper function for device to query its ACPI DSM parameters.

 *

 * Return: 0 if success or ENODEV on failed.

 * Return: 0 if success or ENODEV on failure.

 */

static int quicki2c_acpi_get_dsm_property(struct acpi_device *adev, const guid_t *guid,

					  u64 rev, u64 func, acpi_object_type type, void *prop_buf)
@@ -67,11 +81,10 @@ static int quicki2c_acpi_get_dsm_property(struct acpi_device *adev, const guid_t 


/**

 * quicki2c_acpi_get_dsd_property - Query device ACPI DSD parameter

 *

 * @adev: point to ACPI device

 * @adev: Point to ACPI device

 * @dsd_method_name: ACPI method's property name

 * @type: ACPI parameter's data type

 * @prop_buf: point to return buffer

 * @prop_buf: Point to return buffer

 *

 * This is a helper function for device to query its ACPI DSD parameters.

 *
@@ -100,13 +113,12 @@ static int quicki2c_acpi_get_dsd_property(struct acpi_device *adev, acpi_string 
}



/**

 * quicki2c_get_acpi_resources - Query all quicki2c devices' ACPI parameters

 *

 * @qcdev: point to quicki2c device

 * quicki2c_get_acpi_resources - Query all QuickI2C devices' ACPI parameters

 * @qcdev: Point to quicki2c_device structure

 *

 * This function gets all quicki2c devices' ACPI resource.

 * This function gets all QuickI2C devices' ACPI resource.

 *

 * Return: 0 if success or error code on failed.

 * Return: 0 if success or error code on failure.

 */

static int quicki2c_get_acpi_resources(struct quicki2c_device *qcdev)

{
@@ -192,10 +204,9 @@ static int quicki2c_get_acpi_resources(struct quicki2c_device *qcdev) 
}



/**

 * quicki2c_irq_quick_handler - The ISR of the quicki2c driver

 *

 * quicki2c_irq_quick_handler - The ISR of the QuickI2C driver

 * @irq: The irq number

 * @dev_id: pointer to the device structure

 * @dev_id: Pointer to the quicki2c_device structure

 *

 * Return: IRQ_WAKE_THREAD if further process needed.

 */
@@ -214,13 +225,13 @@ static irqreturn_t quicki2c_irq_quick_handler(int irq, void *dev_id) 


/**

 * try_recover - Try to recovery THC and Device

 * @qcdev: pointer to quicki2c device

 * @qcdev: Pointer to quicki2c_device structure

 *

 * This function is a error handler, called when fatal error happens.

 * It try to reset Touch Device and re-configure THC to recovery

 * transferring between Device and THC.

 * This function is an error handler, called when fatal error happens.

 * It try to reset touch device and re-configure THC to recovery

 * communication between touch device and THC.

 *

 * Return: 0 if successful or error code on failed

 * Return: 0 if successful or error code on failure

 */

static int try_recover(struct quicki2c_device *qcdev)

{
@@ -264,7 +275,7 @@ static int handle_input_report(struct quicki2c_device *qcdev) 
			continue;

		}



		/* discard samples before driver probe complete */

		/* Discard samples before driver probe complete */

		if (qcdev->state != QUICKI2C_ENABLED)

			continue;
@@ -276,10 +287,9 @@ static int handle_input_report(struct quicki2c_device *qcdev) 
}



/**

 * quicki2c_irq_thread_handler - IRQ thread handler of quicki2c driver

 *

 * quicki2c_irq_thread_handler - IRQ thread handler of QuickI2C driver

 * @irq: The IRQ number

 * @dev_id: pointer to the quicki2c device structure

 * @dev_id: Pointer to the quicki2c_device structure

 *

 * Return: IRQ_HANDLED to finish this handler.

 */
@@ -325,20 +335,21 @@ static irqreturn_t quicki2c_irq_thread_handler(int irq, void *dev_id) 
}



/**

 * quicki2c_dev_init - Initialize quicki2c device

 *

 * @pdev: pointer to the thc pci device

 * @mem_addr: The pointer of MMIO memory address

 * quicki2c_dev_init - Initialize QuickI2C device

 * @pdev: Pointer to the THC PCI device

 * @mem_addr: The Pointer of MMIO memory address

 * @ddata: Point to quicki2c_ddata structure

 *

 * Alloc quicki2c device structure and initialized THC device,

 * Alloc quicki2c_device structure and initialized THC device,

 * then configure THC to HIDI2C mode.

 *

 * If success, enable THC hardware interrupt.

 *

 * Return: pointer to the quicki2c device structure if success

 * or NULL on failed.

 * Return: Pointer to the quicki2c_device structure if success

 * or NULL on failure.

 */

static struct quicki2c_device *quicki2c_dev_init(struct pci_dev *pdev, void __iomem *mem_addr)

static struct quicki2c_device *quicki2c_dev_init(struct pci_dev *pdev, void __iomem *mem_addr,

						 const struct quicki2c_ddata *ddata)

{

	struct device *dev = &pdev->dev;

	struct quicki2c_device *qcdev;
@@ -352,10 +363,11 @@ static struct quicki2c_device *quicki2c_dev_init(struct pci_dev *pdev, void __io 
	qcdev->dev = dev;

	qcdev->mem_addr = mem_addr;

	qcdev->state = QUICKI2C_DISABLED;

	qcdev->ddata = ddata;



	init_waitqueue_head(&qcdev->reset_ack_wq);



	/* thc hw init */

	/* THC hardware init */

	qcdev->thc_hw = thc_dev_init(qcdev->dev, qcdev->mem_addr);

	if (IS_ERR(qcdev->thc_hw)) {

		ret = PTR_ERR(qcdev->thc_hw);
@@ -392,15 +404,16 @@ static struct quicki2c_device *quicki2c_dev_init(struct pci_dev *pdev, void __io 


	thc_interrupt_enable(qcdev->thc_hw, true);



	thc_wot_config(qcdev->thc_hw, &quicki2c_gpios[0]);



	qcdev->state = QUICKI2C_INITED;



	return qcdev;

}



/**

 * quicki2c_dev_deinit - De-initialize quicki2c device

 *

 * @qcdev: pointer to the quicki2c device structure

 * quicki2c_dev_deinit - De-initialize QuickI2C device

 * @qcdev: Pointer to the quicki2c_device structure

 *

 * Disable THC interrupt and deinitilize THC.

 */
@@ -408,18 +421,63 @@ static void quicki2c_dev_deinit(struct quicki2c_device *qcdev) 
{

	thc_interrupt_enable(qcdev->thc_hw, false);

	thc_ltr_unconfig(qcdev->thc_hw);

	thc_wot_unconfig(qcdev->thc_hw);



	qcdev->state = QUICKI2C_DISABLED;

}



/**

 * quicki2c_dma_init - Configure THC DMA for quicki2c device

 * @qcdev: pointer to the quicki2c device structure

 * quicki2c_dma_adv_enable - Configure and enable DMA advanced features

 * @qcdev: Pointer to the quicki2c_device structure

 *

 * If platform supports THC DMA advanced features, such as max input size

 * control or interrupt delay, configures and enables them.

 */

static void quicki2c_dma_adv_enable(struct quicki2c_device *qcdev)

{

	/*

	 * If platform supports max input size control feature and touch device

	 * max input length <= THC detect capability, enable the feature with device

	 * max input length.

	 */

	if (qcdev->ddata->max_detect_size >=

	    le16_to_cpu(qcdev->dev_desc.max_input_len)) {

		thc_i2c_set_rx_max_size(qcdev->thc_hw,

					le16_to_cpu(qcdev->dev_desc.max_input_len));

		thc_i2c_rx_max_size_enable(qcdev->thc_hw, true);

	}



	/* If platform supports interrupt delay feature, enable it with given delay */

	if (qcdev->ddata->interrupt_delay) {

		thc_i2c_set_rx_int_delay(qcdev->thc_hw,

					 qcdev->ddata->interrupt_delay);

		thc_i2c_rx_int_delay_enable(qcdev->thc_hw, true);

	}

}



/**

 * quicki2c_dma_adv_disable - Disable DMA advanced features

 * @qcdev: Pointer to the quicki2c device structure

 *

 * Disable all DMA advanced features if platform supports.

 */

static void quicki2c_dma_adv_disable(struct quicki2c_device *qcdev)

{

	if (qcdev->ddata->max_detect_size)

		thc_i2c_rx_max_size_enable(qcdev->thc_hw, false);



	if (qcdev->ddata->interrupt_delay)

		thc_i2c_rx_int_delay_enable(qcdev->thc_hw, false);

}



/**

 * quicki2c_dma_init - Configure THC DMA for QuickI2C device

 * @qcdev: Pointer to the quicki2c_device structure

 *

 * This function uses TIC's parameters(such as max input length, max output

 * length) to allocate THC DMA buffers and configure THC DMA engines.

 *

 * Return: 0 if success or error code on failed.

 * Return: 0 if success or error code on failure.

 */

static int quicki2c_dma_init(struct quicki2c_device *qcdev)

{
@@ -451,12 +509,15 @@ static int quicki2c_dma_init(struct quicki2c_device *qcdev) 
		return ret;

	}



	return ret;

	if (qcdev->ddata)

		quicki2c_dma_adv_enable(qcdev);



	return 0;

}



/**

 * quicki2c_dma_deinit - Release THC DMA for quicki2c device

 * @qcdev: pointer to the quicki2c device structure

 * quicki2c_dma_deinit - Release THC DMA for QuickI2C device

 * @qcdev: Pointer to the quicki2c_device structure

 *

 * Stop THC DMA engines and release all DMA buffers.

 *
@@ -465,11 +526,14 @@ static void quicki2c_dma_deinit(struct quicki2c_device *qcdev) 
{

	thc_dma_unconfigure(qcdev->thc_hw);

	thc_dma_release(qcdev->thc_hw);



	if (qcdev->ddata)

		quicki2c_dma_adv_disable(qcdev);

}



/**

 * quicki2c_alloc_report_buf - Alloc report buffers

 * @qcdev: pointer to the quicki2c device structure

 * @qcdev: Pointer to the quicki2c_device structure

 *

 * Allocate report descriptor buffer, it will be used for restore TIC HID

 * report descriptor.
@@ -480,7 +544,7 @@ static void quicki2c_dma_deinit(struct quicki2c_device *qcdev) 
 * Allocate output report buffer, it will be used for store HID output report,

 * such as set feature.

 *

 * Return: 0 if success or error code on failed.

 * Return: 0 if success or error code on failure.

 */

static int quicki2c_alloc_report_buf(struct quicki2c_device *qcdev)

{
@@ -518,28 +582,27 @@ static int quicki2c_alloc_report_buf(struct quicki2c_device *qcdev) 
}



/*

 * quicki2c_probe: Quicki2c driver probe function

 *

 * @pdev: point to pci device

 * @id: point to pci_device_id structure

 * quicki2c_probe: QuickI2C driver probe function

 * @pdev: Point to PCI device

 * @id: Point to pci_device_id structure

 *

 * This function initializes THC and HIDI2C device, the flow is:

 * - do THC pci device initialization

 * - query HIDI2C ACPI parameters

 * - configure THC to HIDI2C mode

 * - go through HIDI2C enumeration flow

 *   |- read device descriptor

 *   |- reset HIDI2C device

 * - enable THC interrupt and DMA

 * - read report descriptor

 * - register HID device

 * - enable runtime power management

 *

 * Return 0 if success or error code on failed.

 * - Do THC pci device initialization

 * - Query HIDI2C ACPI parameters

 * - Configure THC to HIDI2C mode

 * - Go through HIDI2C enumeration flow

 *   |- Read device descriptor

 *   |- Reset HIDI2C device

 * - Enable THC interrupt and DMA

 * - Read report descriptor

 * - Register HID device

 * - Enable runtime power management

 *

 * Return 0 if success or error code on failure.

 */

static int quicki2c_probe(struct pci_dev *pdev,

			  const struct pci_device_id *id)

static int quicki2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	const struct quicki2c_ddata *ddata = (const struct quicki2c_ddata *)id->driver_data;

	struct quicki2c_device *qcdev;

	void __iomem *mem_addr;

	int ret;
@@ -577,7 +640,7 @@ static int quicki2c_probe(struct pci_dev *pdev, 


	pdev->irq = pci_irq_vector(pdev, 0);



	qcdev = quicki2c_dev_init(pdev, mem_addr);

	qcdev = quicki2c_dev_init(pdev, mem_addr, ddata);

	if (IS_ERR(qcdev)) {

		dev_err_once(&pdev->dev, "QuickI2C device init failed\n");

		ret = PTR_ERR(qcdev);
@@ -668,11 +731,10 @@ static int quicki2c_probe(struct pci_dev *pdev, 


/**

 * quicki2c_remove - Device Removal Routine

 * @pdev: Point to PCI device structure

 *

 * @pdev: PCI device structure

 *

 * This is called by the PCI subsystem to alert the driver

 * that it should release a PCI device.

 * This is called by the PCI subsystem to alert the driver that it should

 * release a PCI device.

 */

static void quicki2c_remove(struct pci_dev *pdev)

{
@@ -694,12 +756,10 @@ static void quicki2c_remove(struct pci_dev *pdev) 


/**

 * quicki2c_shutdown - Device Shutdown Routine

 * @pdev: Point to PCI device structure

 *

 * @pdev: PCI device structure

 *

 * This is called from the reboot notifier

 * it's a simplified version of remove so we go down

 * faster.

 * This is called from the reboot notifier, it's a simplified version of remove

 * so we go down faster.

 */

static void quicki2c_shutdown(struct pci_dev *pdev)

{
@@ -930,12 +990,12 @@ static const struct dev_pm_ops quicki2c_pm_ops = { 
};



static const struct pci_device_id quicki2c_pci_tbl[] = {

	{PCI_VDEVICE(INTEL, THC_LNL_DEVICE_ID_I2C_PORT1), },

	{PCI_VDEVICE(INTEL, THC_LNL_DEVICE_ID_I2C_PORT2), },

	{PCI_VDEVICE(INTEL, THC_PTL_H_DEVICE_ID_I2C_PORT1), },

	{PCI_VDEVICE(INTEL, THC_PTL_H_DEVICE_ID_I2C_PORT2), },

	{PCI_VDEVICE(INTEL, THC_PTL_U_DEVICE_ID_I2C_PORT1), },

	{PCI_VDEVICE(INTEL, THC_PTL_U_DEVICE_ID_I2C_PORT2), },

	{ PCI_DEVICE_DATA(INTEL, THC_LNL_DEVICE_ID_I2C_PORT1, NULL) },

	{ PCI_DEVICE_DATA(INTEL, THC_LNL_DEVICE_ID_I2C_PORT2, NULL) },

	{ PCI_DEVICE_DATA(INTEL, THC_PTL_H_DEVICE_ID_I2C_PORT1, &ptl_ddata) },

	{ PCI_DEVICE_DATA(INTEL, THC_PTL_H_DEVICE_ID_I2C_PORT2, &ptl_ddata) },

	{ PCI_DEVICE_DATA(INTEL, THC_PTL_U_DEVICE_ID_I2C_PORT1, &ptl_ddata) },

	{ PCI_DEVICE_DATA(INTEL, THC_PTL_U_DEVICE_ID_I2C_PORT2, &ptl_ddata) },

	{ }

};

MODULE_DEVICE_TABLE(pci, quicki2c_pci_tbl);

drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h

+36 −19
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 
#include <linux/hid-over-i2c.h>

#include <linux/workqueue.h>



#define THC_LNL_DEVICE_ID_I2C_PORT1	0xA848

#define THC_LNL_DEVICE_ID_I2C_PORT2	0xA84A

#define THC_PTL_H_DEVICE_ID_I2C_PORT1	0xE348

#define THC_PTL_H_DEVICE_ID_I2C_PORT2	0xE34A

#define THC_PTL_U_DEVICE_ID_I2C_PORT1	0xE448

#define THC_PTL_U_DEVICE_ID_I2C_PORT2	0xE44A

#define PCI_DEVICE_ID_INTEL_THC_LNL_DEVICE_ID_I2C_PORT1		0xA848

#define PCI_DEVICE_ID_INTEL_THC_LNL_DEVICE_ID_I2C_PORT2		0xA84A

#define PCI_DEVICE_ID_INTEL_THC_PTL_H_DEVICE_ID_I2C_PORT1	0xE348

#define PCI_DEVICE_ID_INTEL_THC_PTL_H_DEVICE_ID_I2C_PORT2	0xE34A

#define PCI_DEVICE_ID_INTEL_THC_PTL_U_DEVICE_ID_I2C_PORT1	0xE448

#define PCI_DEVICE_ID_INTEL_THC_PTL_U_DEVICE_ID_I2C_PORT2	0xE44A



/* Packet size value, the unit is 16 bytes */

#define MAX_PACKET_SIZE_VALUE_LNL			256
@@ -36,6 +36,12 @@ 
#define QUICKI2C_DEFAULT_LP_LTR_VALUE		500

#define QUICKI2C_RPM_TIMEOUT_MS			500



/* PTL Max packet size detection capability is 255 Bytes */

#define MAX_RX_DETECT_SIZE_PTL			255



/* Default interrupt delay is 1ms, suitable for most devices */

#define DEFAULT_INTERRUPT_DELAY_US		(1 * USEC_PER_MSEC)



/*

 * THC uses runtime auto suspend to dynamically switch between THC active LTR

 * and low power LTR to save CPU power.
@@ -122,6 +128,16 @@ struct quicki2c_subip_acpi_config { 
	u64 HMSL;

};



/**

 * struct quicki2c_ddata - Driver specific data for quicki2c device

 * @max_detect_size: Identify max packet size detect for rx

 * @interrupt_delay: Identify interrupt detect delay for rx

 */

struct quicki2c_ddata {

	u32 max_detect_size;

	u32 interrupt_delay;

};



struct device;

struct pci_dev;

struct thc_device;
@@ -130,15 +146,15 @@ struct acpi_device; 


/**

 * struct quicki2c_device -  THC QuickI2C device struct

 * @dev: point to kernel device

 * @pdev: point to PCI device

 * @thc_hw: point to THC device

 * @hid_dev: point to hid device

 * @acpi_dev: point to ACPI device

 * @driver_data: point to quicki2c specific driver data

 * @dev: Point to kernel device

 * @pdev: Point to PCI device

 * @thc_hw: Point to THC device

 * @hid_dev: Point to HID device

 * @acpi_dev: Point to ACPI device

 * @ddata: Point to QuickI2C platform specific driver data

 * @state: THC I2C device state

 * @mem_addr: MMIO memory address

 * @dev_desc: device descriptor for HIDI2C protocol

 * @dev_desc: Device descriptor for HIDI2C protocol

 * @i2c_slave_addr: HIDI2C device slave address

 * @hid_desc_addr: Register address for retrieve HID device descriptor

 * @active_ltr_val: THC active LTR value
@@ -146,12 +162,12 @@ struct acpi_device; 
 * @i2c_speed_mode: 0 - standard mode, 1 - fast mode, 2 - fast mode plus

 * @i2c_clock_hcnt: I2C CLK high period time (unit in cycle count)

 * @i2c_clock_lcnt: I2C CLK low period time (unit in cycle count)

 * @report_descriptor: store a copy of device report descriptor

 * @input_buf: store a copy of latest input report data

 * @report_buf: store a copy of latest input/output report packet from set/get feature

 * @report_len: the length of input/output report packet

 * @reset_ack_wq: workqueue for waiting reset response from device

 * @reset_ack: indicate reset response received or not

 * @report_descriptor: Store a copy of device report descriptor

 * @input_buf: Store a copy of latest input report data

 * @report_buf: Store a copy of latest input/output report packet from set/get feature

 * @report_len: The length of input/output report packet

 * @reset_ack_wq: Workqueue for waiting reset response from device

 * @reset_ack: Indicate reset response received or not

 */

struct quicki2c_device {

	struct device *dev;
@@ -159,6 +175,7 @@ struct quicki2c_device { 
	struct thc_device *thc_hw;

	struct hid_device *hid_dev;

	struct acpi_device *acpi_dev;

	const struct quicki2c_ddata *ddata;

	enum quicki2c_dev_state state;



	void __iomem *mem_addr;

drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c

+15 −0
Original line number Diff line number Diff line
@@ -11,8 +11,11 @@ 
#include <linux/pci.h>

#include <linux/pm_runtime.h>



#include <linux/gpio/consumer.h>



#include "intel-thc-dev.h"

#include "intel-thc-hw.h"

#include "intel-thc-wot.h"



#include "quickspi-dev.h"

#include "quickspi-hid.h"
@@ -46,6 +49,15 @@ static guid_t thc_platform_guid = 
	GUID_INIT(0x84005682, 0x5b71, 0x41a4, 0x8d, 0x66, 0x81, 0x30,

		  0xf7, 0x87, 0xa1, 0x38);





/* QuickSPI Wake-on-Touch GPIO resource */

static const struct acpi_gpio_params wake_gpio = { 0, 0, true };



static const struct acpi_gpio_mapping quickspi_gpios[] = {

	{ "wake-on-touch", &wake_gpio, 1 },

	{ }

};



/**

 * thc_acpi_get_property - Query device ACPI parameter

 *
@@ -426,6 +438,8 @@ static struct quickspi_device *quickspi_dev_init(struct pci_dev *pdev, void __io 


	thc_interrupt_enable(qsdev->thc_hw, true);



	thc_wot_config(qsdev->thc_hw, &quickspi_gpios[0]);



	qsdev->state = QUICKSPI_INITIATED;



	return qsdev;
@@ -442,6 +456,7 @@ static void quickspi_dev_deinit(struct quickspi_device *qsdev) 
{

	thc_interrupt_enable(qsdev->thc_hw, false);

	thc_ltr_unconfig(qsdev->thc_hw);

	thc_wot_unconfig(qsdev->thc_hw);



	qsdev->state = QUICKSPI_DISABLED;

}