lkml.org 
[lkml]   [2018]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 086/102] Input: ALPS - fix TrackStick detection on Thinkpad L570 and Latitude 7370
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Masaki Ota <masaki.ota@jp.alps.com>

    commit 567b9b549cfa1cbc202762ae97b5385c29ade1e3 upstream.

    The primary interface for the touchpad device in Thinkpad L570 is SMBus,
    so ALPS overlooked PS2 interface Firmware setting of TrackStick, and
    shipped with TrackStick otp bit is disabled.

    The address 0xD7 contains device number information, so we can identify
    the device by checking this value, but to access it we need to enable
    Command mode, and then re-enable the device. Devices shipped in Thinkpad
    L570 report either 0x0C or 0x1D as device numbers, if we see them we assume
    that the devices are DualPoints.

    The same issue exists on Dell Latitude 7370.

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196929
    Fixes: 646580f793 ("Input: ALPS - fix multi-touch decoding on SS4 plus touchpads")
    Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
    Tested-by: Aaron Ma <aaron.ma@canonical.com>
    Tested-by: Jonathan Liu <net147@gmail.com>
    Tested-by: Jaak Ristioja <jaak@ristioja.ee>
    Cc: stable@vger.kernel.org
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---
    1 file changed, 21 insertions(+), 3 deletions(-)

    --- a/drivers/input/mouse/alps.c
    +++ b/drivers/input/mouse/alps.c
    @@ -2538,13 +2538,31 @@ static int alps_update_btn_info_ss4_v2(u
    }

    static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],
    - struct alps_data *priv)
    + struct alps_data *priv,
    + struct psmouse *psmouse)
    {
    bool is_dual = false;
    + int reg_val = 0;
    + struct ps2dev *ps2dev = &psmouse->ps2dev;

    - if (IS_SS4PLUS_DEV(priv->dev_id))
    + if (IS_SS4PLUS_DEV(priv->dev_id)) {
    is_dual = (otp[0][0] >> 4) & 0x01;

    + if (!is_dual) {
    + /* For support TrackStick of Thinkpad L/E series */
    + if (alps_exit_command_mode(psmouse) == 0 &&
    + alps_enter_command_mode(psmouse) == 0) {
    + reg_val = alps_command_mode_read_reg(psmouse,
    + 0xD7);
    + }
    + alps_exit_command_mode(psmouse);
    + ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);
    +
    + if (reg_val == 0x0C || reg_val == 0x1D)
    + is_dual = true;
    + }
    + }
    +
    if (is_dual)
    priv->flags |= ALPS_DUALPOINT |
    ALPS_DUALPOINT_WITH_PRESSURE;
    @@ -2567,7 +2585,7 @@ static int alps_set_defaults_ss4_v2(stru

    alps_update_btn_info_ss4_v2(otp, priv);

    - alps_update_dual_info_ss4_v2(otp, priv);
    + alps_update_dual_info_ss4_v2(otp, priv, psmouse);

    return 0;
    }

    \
     
     \ /
      Last update: 2018-04-06 16:33    [W:4.093 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site