Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / drivers / input / twl4030.c

diff --git a/drivers/input/twl4030.c b/drivers/input/twl4030.c
index a5ded35d9226bcc7bc3be46c972b9b9fc3c31d0f..3a1c46b3046b6aea3653a32fd1bd418cf8926bc0 100644 (file)
--- a/drivers/input/twl4030.c
+++ b/drivers/input/twl4030.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * TWL4030 input
  *
  * Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <twl4030.h>
@@ -47,3 +46,42 @@ int twl4030_input_usb(void)
 
        return 0;
 }
+
+int twl4030_keypad_scan(unsigned char *matrix)
+{
+       u8 data;
+       u8 c, r;
+
+       twl4030_i2c_read_u8(TWL4030_CHIP_KEYPAD,
+                           TWL4030_KEYPAD_KEYP_CTRL_REG, &data);
+
+       data |= TWL4030_KEYPAD_CTRL_SOFT_NRST | TWL4030_KEYPAD_CTRL_KBD_ON;
+       data &= ~TWL4030_KEYPAD_CTRL_SOFTMODEN;
+
+       twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD,
+                            TWL4030_KEYPAD_KEYP_CTRL_REG, data);
+
+       for (c = 0; c < 8; c++) {
+               data = 0xff & ~(1 << c);
+               twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD,
+                                    TWL4030_KEYPAD_KBC_REG, data);
+
+               data = 0xff;
+               twl4030_i2c_read_u8(TWL4030_CHIP_KEYPAD,
+                                   TWL4030_KEYPAD_KBR_REG, &data);
+
+               for (r = 0; r < 8; r++)
+                       matrix[c * 8 + r] = !(data & (1 << r));
+       }
+
+       data = 0xff & ~(TWL4030_KEYPAD_CTRL_SOFT_NRST);
+       twl4030_i2c_write_u8(TWL4030_CHIP_KEYPAD,
+                            TWL4030_KEYPAD_KEYP_CTRL_REG, data);
+
+       return 0;
+}
+
+int twl4030_keypad_key(unsigned char *matrix, u8 c, u8 r)
+{
+       return matrix[c * 8 + r];
+}