mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-10 23:33:01 -04:00
Input: mt6779-keypad - prepare double keys support with calc_row_col
The MediaTek keypad can operate in two modes: single key or double key. The driver only supports single key mode. In double key mode, the row/column calculation based on the key is different. Add a calc_row_col function pointer which will be different based on single/double key mode. No functional change. Suggested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20220720-mt8183-keypad-v2-4-6d42c357cb76@baylibre.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
committed by
Dmitry Torokhov
parent
24f9cde381
commit
e76be36ad9
@@ -31,6 +31,8 @@ struct mt6779_keypad {
|
||||
struct clk *clk;
|
||||
u32 n_rows;
|
||||
u32 n_cols;
|
||||
void (*calc_row_col)(unsigned int key,
|
||||
unsigned int *row, unsigned int *col);
|
||||
DECLARE_BITMAP(keymap_state, MTK_KPD_NUM_BITS);
|
||||
};
|
||||
|
||||
@@ -67,8 +69,7 @@ static irqreturn_t mt6779_keypad_irq_handler(int irq, void *dev_id)
|
||||
continue;
|
||||
|
||||
key = bit_nr / 32 * 16 + bit_nr % 32;
|
||||
row = key / 9;
|
||||
col = key % 9;
|
||||
keypad->calc_row_col(key, &row, &col);
|
||||
|
||||
scancode = MATRIX_SCAN_CODE(row, col, row_shift);
|
||||
/* 1: not pressed, 0: pressed */
|
||||
@@ -94,6 +95,14 @@ static void mt6779_keypad_clk_disable(void *data)
|
||||
clk_disable_unprepare(data);
|
||||
}
|
||||
|
||||
static void mt6779_keypad_calc_row_col_single(unsigned int key,
|
||||
unsigned int *row,
|
||||
unsigned int *col)
|
||||
{
|
||||
*row = key / 9;
|
||||
*col = key % 9;
|
||||
}
|
||||
|
||||
static int mt6779_keypad_pdrv_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct mt6779_keypad *keypad;
|
||||
@@ -148,6 +157,8 @@ static int mt6779_keypad_pdrv_probe(struct platform_device *pdev)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
keypad->calc_row_col = mt6779_keypad_calc_row_col_single;
|
||||
|
||||
wakeup = device_property_read_bool(&pdev->dev, "wakeup-source");
|
||||
|
||||
dev_dbg(&pdev->dev, "n_row=%d n_col=%d debounce=%d\n",
|
||||
|
||||
Reference in New Issue
Block a user