platform/x86: intel-vbtn: Split keymap into buttons and switches parts
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: de9647efea
("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>
alistair/sunxi64-5.8
parent
18937875a2
commit
f6ba524970
|
@ -40,14 +40,20 @@ static const struct key_entry intel_vbtn_keymap[] = {
|
||||||
{ KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } }, /* volume-down key release */
|
{ KE_IGNORE, 0xC7, { KEY_VOLUMEDOWN } }, /* volume-down key release */
|
||||||
{ KE_KEY, 0xC8, { KEY_ROTATE_LOCK_TOGGLE } }, /* rotate-lock key press */
|
{ KE_KEY, 0xC8, { KEY_ROTATE_LOCK_TOGGLE } }, /* rotate-lock key press */
|
||||||
{ KE_KEY, 0xC9, { KEY_ROTATE_LOCK_TOGGLE } }, /* rotate-lock key release */
|
{ 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, 0xCA, { .sw = { SW_DOCK, 1 } } }, /* Docked */
|
||||||
{ KE_SW, 0xCB, { .sw = { SW_DOCK, 0 } } }, /* Undocked */
|
{ KE_SW, 0xCB, { .sw = { SW_DOCK, 0 } } }, /* Undocked */
|
||||||
{ KE_SW, 0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tablet */
|
{ KE_SW, 0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tablet */
|
||||||
{ KE_SW, 0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Laptop */
|
{ 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 intel_vbtn_priv {
|
||||||
|
struct key_entry keymap[KEYMAP_LEN];
|
||||||
struct input_dev *input_dev;
|
struct input_dev *input_dev;
|
||||||
bool wakeup_mode;
|
bool wakeup_mode;
|
||||||
};
|
};
|
||||||
|
@ -55,13 +61,29 @@ struct intel_vbtn_priv {
|
||||||
static int intel_vbtn_input_setup(struct platform_device *device)
|
static int intel_vbtn_input_setup(struct platform_device *device)
|
||||||
{
|
{
|
||||||
struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
|
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);
|
priv->input_dev = devm_input_allocate_device(&device->dev);
|
||||||
if (!priv->input_dev)
|
if (!priv->input_dev)
|
||||||
return -ENOMEM;
|
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)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue