lkml.org 
[lkml]   [2020]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v11 07/56] Input: atmel_mxt_ts - implement T9 vector/orientation support
    Date
    From: Nick Dyer <nick.dyer@itdev.co.uk>

    The atmel touch messages contain orientation information as a byte in a
    packed format which can be passed straight on to Android if the input
    device configuration is correct.

    This requires vector reports to be enabled in maXTouch config (zero
    DISVECT bit 3 in T9 CTRL field)

    Android converts the format in InputReader.cpp, search for
    ORIENTATION_CALIBRATION_VECTOR.

    Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
    Acked-by: Benson Leung <bleung@chromium.org>
    Acked-by: Yufeng Shen <miletus@chromium.org>
    (cherry picked from ndyer/linux/for-upstream commit a6f0ee919d2631678169b23fb18f55b6dbabcd4c)
    Signed-off-by: George G. Davis <george_davis@mentor.com>
    Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
    ---
    drivers/input/touchscreen/atmel_mxt_ts.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
    index f6465edaa57e..df2e0ba76e63 100644
    --- a/drivers/input/touchscreen/atmel_mxt_ts.c
    +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
    @@ -817,6 +817,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
    int y;
    int area;
    int amplitude;
    + u8 vector;

    id = message[0] - data->T9_reportid_min;
    status = message[1];
    @@ -831,9 +832,10 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)

    area = message[5];
    amplitude = message[6];
    + vector = message[7];

    dev_dbg(dev,
    - "[%u] %c%c%c%c%c%c%c%c x: %5u y: %5u area: %3u amp: %3u\n",
    + "[%u] %c%c%c%c%c%c%c%c x: %5u y: %5u area: %3u amp: %3u vector: %02X\n",
    id,
    (status & MXT_T9_DETECT) ? 'D' : '.',
    (status & MXT_T9_PRESS) ? 'P' : '.',
    @@ -843,7 +845,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
    (status & MXT_T9_AMP) ? 'A' : '.',
    (status & MXT_T9_SUPPRESS) ? 'S' : '.',
    (status & MXT_T9_UNGRIP) ? 'U' : '.',
    - x, y, area, amplitude);
    + x, y, area, amplitude, vector);

    input_mt_slot(input_dev, id);

    @@ -868,6 +870,7 @@ static void mxt_proc_t9_message(struct mxt_data *data, u8 *message)
    input_report_abs(input_dev, ABS_MT_POSITION_Y, y);
    input_report_abs(input_dev, ABS_MT_PRESSURE, amplitude);
    input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area);
    + input_report_abs(input_dev, ABS_MT_ORIENTATION, vector);
    } else {
    /* Touch no longer active, close out slot */
    input_mt_report_slot_inactive(input_dev);
    @@ -2180,8 +2183,9 @@ static int mxt_initialize_input_device(struct mxt_data *data)
    0, 255, 0, 0);
    }

    - if (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100 &&
    - data->t100_aux_vect) {
    + if (data->multitouch == MXT_TOUCH_MULTI_T9 ||
    + (data->multitouch == MXT_TOUCH_MULTITOUCHSCREEN_T100 &&
    + data->t100_aux_vect)) {
    input_set_abs_params(input_dev, ABS_MT_ORIENTATION,
    0, 255, 0, 0);
    }
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-05-08 07:58    [W:4.067 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site