@@ -40,11 +40,14 @@
#define STMPE_REG_WDW_TR_Y 0x44
#define STMPE_REG_WDW_BL_X 0x46
#define STMPE_REG_WDW_BL_Y 0x48
+#define STMPE_REG_TSC_DATA_X 0x4D
+#define STMPE_REG_TSC_DATA_Y 0x4F
#define STMPE_REG_TSC_DATA_XYZ 0x52
#define STMPE_REG_TSC_FRACTION_Z 0x56
#define STMPE_REG_TSC_I_DRIVE 0x58
#define OP_MOD_XYZ 0
+#define OP_MOD_XY 1
#define STMPE_TSC_CTRL_TSC_EN (1<<0)
@@ -87,6 +90,7 @@ struct stmpe_touch {
u8 settling;
u8 fraction_z;
u8 i_drive;
+ u8 op_mod;
struct {
struct {
u16 x;
@@ -174,6 +178,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)
{
u8 data_set[4];
int x, y, z;
+ bool report_pressure = false;
struct stmpe_touch *ts = data;
/*
@@ -191,18 +196,35 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)
stmpe_set_bits(ts->stmpe, STMPE_REG_TSC_CTRL,
STMPE_TSC_CTRL_TSC_EN, 0);
- stmpe_block_read(ts->stmpe, STMPE_REG_TSC_DATA_XYZ, 4, data_set);
-
- x = (data_set[0] << 4) | (data_set[1] >> 4);
- y = ((data_set[1] & 0xf) << 8) | data_set[2];
- z = data_set[3];
+ switch (ts->op_mod) {
+ case OP_MOD_XYZ:
+ stmpe_block_read(ts->stmpe,
+ STMPE_REG_TSC_DATA_XYZ, 4, data_set);
+ x = (data_set[0] << 4) | (data_set[1] >> 4);
+ y = ((data_set[1] & 0xf) << 8) | data_set[2];
+ z = data_set[3];
+ report_pressure = true;
+ break;
+ case OP_MOD_XY:
+ stmpe_block_read(ts->stmpe,
+ STMPE_REG_TSC_DATA_X, 2, data_set);
+ x = (data_set[0] << 8) | (data_set[1]);
+ stmpe_block_read(ts->stmpe,
+ STMPE_REG_TSC_DATA_Y, 2, data_set);
+ y = (data_set[0] << 8) | (data_set[1]);
+ break;
+ default:
+ goto _skip_input_events;
+ }
input_report_abs(ts->idev, ABS_X, x);
input_report_abs(ts->idev, ABS_Y, y);
- input_report_abs(ts->idev, ABS_PRESSURE, z);
+ if (report_pressure)
+ input_report_abs(ts->idev, ABS_PRESSURE, z);
input_report_key(ts->idev, BTN_TOUCH, 1);
input_sync(ts->idev);
+_skip_input_events:
/* flush the FIFO after we have read out our values. */
__stmpe_reset_fifo(ts->stmpe);
@@ -219,7 +241,7 @@ static irqreturn_t stmpe_ts_handler(int irq, void *data)
static int stmpe_init_hw(struct stmpe_touch *ts)
{
int ret;
- u8 tsc_cfg, tsc_cfg_mask;
+ u8 tsc_cfg, tsc_cfg_mask, tsc_ctrl, tsc_ctrl_mask;
struct stmpe *stmpe = ts->stmpe;
struct device *dev = ts->dev;
@@ -306,10 +328,13 @@ static int stmpe_init_hw(struct stmpe_touch *ts)
return ret;
}
+ tsc_ctrl = STMPE_OP_MODE(ts->op_mod);
+ tsc_ctrl_mask = STMPE_OP_MODE(0xff);
+
ret = stmpe_set_bits(stmpe, STMPE_REG_TSC_CTRL,
- STMPE_OP_MODE(0xff), STMPE_OP_MODE(OP_MOD_XYZ));
+ tsc_ctrl_mask, tsc_ctrl);
if (ret) {
- dev_err(dev, "Could not set mode\n");
+ dev_err(dev, "Could not set control registers\n");
return ret;
}
@@ -357,6 +382,8 @@ static void stmpe_ts_get_platform_info(struct platform_device *pdev,
ts->stmpe->mod_12b = val;
if (!of_property_read_u32(np, "st,ref-sel", &val))
ts->stmpe->ref_sel = val;
+ if (!of_property_read_u32(np, "st,op-mod", &val))
+ ts->op_mod = val;
if (!of_property_read_u32(np, "st,adc-freq", &val))
ts->stmpe->adc_freq = val;
if (!of_property_read_u32(np, "st,ave-ctrl", &val))
While the default acquisition covers the pressure (z) too, the XY mode is only concerend with the horizontal and vertical input position acquisition. It uses dedicated registers for each axes to do so, while the XYZ acquisition packs the read values more densely. Signed-off-by: Leif Middelschulte <leif.middelschulte@klsmartin.com> --- drivers/input/touchscreen/stmpe-ts.c | 45 ++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 9 deletions(-)