lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 100/261] platform/x86: intel-vbtn: Split keymap into buttons and switches parts
    Date
    From: Hans de Goede <hdegoede@redhat.com>

    [ Upstream commit f6ba524970c4b73b234bf41ecd6628f5803b1559 ]

    Split the sparse keymap into 2 separate keymaps, a buttons and a switches
    keymap and combine the 2 to a single map again in intel_vbtn_input_setup().

    This is a preparation patch for not telling userspace that we have switches
    when we do not have them (and for doing the same for the buttons).

    Fixes: de9647efeaa9 ("platform/x86: intel-vbtn: Only activate tablet mode switch on 2-in-1's")
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/platform/x86/intel-vbtn.c | 28 +++++++++++++++++++++++++---
    1 file changed, 25 insertions(+), 3 deletions(-)

    diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
    index 3b3789bb8ec5..2ab3dbd26b5e 100644
    --- a/drivers/platform/x86/intel-vbtn.c
    +++ b/drivers/platform/x86/intel-vbtn.c
    @@ -39,14 +39,20 @@ static const struct key_entry intel_vbtn_keymap[] = {
    { KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } }, /* volume-down key release */
    { KE_KEY, 0xC8, { KEY_ROTATE_LOCK_TOGGLE } }, /* rotate-lock key press */
    { KE_KEY, 0xC9, { KEY_ROTATE_LOCK_TOGGLE } }, /* rotate-lock key release */
    +};
    +
    +static const struct key_entry intel_vbtn_switchmap[] = {
    { KE_SW, 0xCA, { .sw = { SW_DOCK, 1 } } }, /* Docked */
    { KE_SW, 0xCB, { .sw = { SW_DOCK, 0 } } }, /* Undocked */
    { KE_SW, 0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tablet */
    { KE_SW, 0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Laptop */
    - { KE_END },
    };

    +#define KEYMAP_LEN \
    + (ARRAY_SIZE(intel_vbtn_keymap) + ARRAY_SIZE(intel_vbtn_switchmap) + 1)
    +
    struct intel_vbtn_priv {
    + struct key_entry keymap[KEYMAP_LEN];
    struct input_dev *input_dev;
    bool wakeup_mode;
    };
    @@ -54,13 +60,29 @@ struct intel_vbtn_priv {
    static int intel_vbtn_input_setup(struct platform_device *device)
    {
    struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
    - int ret;
    + int ret, keymap_len = 0;
    +
    + if (true) {
    + memcpy(&priv->keymap[keymap_len], intel_vbtn_keymap,
    + ARRAY_SIZE(intel_vbtn_keymap) *
    + sizeof(struct key_entry));
    + keymap_len += ARRAY_SIZE(intel_vbtn_keymap);
    + }
    +
    + if (true) {
    + memcpy(&priv->keymap[keymap_len], intel_vbtn_switchmap,
    + ARRAY_SIZE(intel_vbtn_switchmap) *
    + sizeof(struct key_entry));
    + keymap_len += ARRAY_SIZE(intel_vbtn_switchmap);
    + }
    +
    + priv->keymap[keymap_len].type = KE_END;

    priv->input_dev = devm_input_allocate_device(&device->dev);
    if (!priv->input_dev)
    return -ENOMEM;

    - ret = sparse_keymap_setup(priv->input_dev, intel_vbtn_keymap, NULL);
    + ret = sparse_keymap_setup(priv->input_dev, priv->keymap, NULL);
    if (ret)
    return ret;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 18:07    [W:4.751 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site