drivers: ht16k33: convert from kscan to input

Convert the ht16k33 to use the input subsystem. This can still be used
with the kscan API with the zephyr,kscan-input driver, or use the
input-keymap one to generate input codes instead.

Signed-off-by: Fabio Baltieri <[email protected]>

Author: fabiobaltieri

drivers/kscan/CMakeLists.txt

@@ -4,7 +4,6 @@ zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/kscan.h)
 
 zephyr_library()
 
-zephyr_library_sources_ifdef(CONFIG_KSCAN_HT16K33	kscan_ht16k33.c)
 zephyr_library_sources_ifdef(CONFIG_KSCAN_INPUT		kscan_input.c)
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE	    kscan_handlers.c)

drivers/kscan/Kconfig

@@ -10,7 +10,6 @@ menuconfig KSCAN
 
 if KSCAN
 
-source "drivers/kscan/Kconfig.ht16k33"
 source "drivers/kscan/Kconfig.input"
 
 module = KSCAN

drivers/kscan/Kconfig.ht16k33

@@ -15,8 +15,7 @@ menuconfig HT16K33
 
 config HT16K33_KEYSCAN
 	bool "Keyscan support"
-	depends on (HT16K33 && KSCAN)
-	select KSCAN_HT16K33
+	depends on (HT16K33 && INPUT)
 	help
 	  Enable keyscan child device support in the HT16K33 LED
 	  driver.

drivers/kscan/kscan_ht16k33.c

@@ -13,9 +13,9 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
+#include <zephyr/input/input.h>
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/led.h>
-#include <zephyr/drivers/led/ht16k33.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/logging/log.h>
 
@@ -77,7 +77,6 @@ struct ht16k33_data {
 #ifdef CONFIG_HT16K33_KEYSCAN
 	struct k_mutex lock;
 	const struct device *child;
-	kscan_callback_t kscan_cb;
 	struct gpio_callback irq_cb;
 	struct k_thread irq_thread;
 	struct k_sem irq_sem;
@@ -230,15 +229,13 @@ static bool ht16k33_process_keyscan_data(const struct device *dev)
 			pressed = true;
 		}
 
-		if (data->kscan_cb == NULL) {
-			continue;
-		}
-
 		for (col = 0; col < HT16K33_KEYSCAN_COLS; col++) {
-			if (changed & BIT(col)) {
-				data->kscan_cb(data->child, row, col,
-					state & BIT(col));
+			if ((changed & BIT(col)) == 0) {
+				continue;
 			}
+			input_report_abs(dev, INPUT_ABS_X, col, false, K_FOREVER);
+			input_report_abs(dev, INPUT_ABS_Y, row, false, K_FOREVER);
+			input_report_key(dev, INPUT_BTN_TOUCH, state & BIT(col), true, K_FOREVER);
 		}
 	}
 
@@ -285,20 +282,6 @@ static void ht16k33_timer_callback(struct k_timer *timer)
 	data = CONTAINER_OF(timer, struct ht16k33_data, timer);
 	k_sem_give(&data->irq_sem);
 }
-
-int ht16k33_register_keyscan_callback(const struct device *parent,
-				      const struct device *child,
-				      kscan_callback_t callback)
-{
-	struct ht16k33_data *data = parent->data;
-
-	k_mutex_lock(&data->lock, K_FOREVER);
-	data->child = child;
-	data->kscan_cb = callback;
-	k_mutex_unlock(&data->lock);
-
-	return 0;
-}
 #endif /* CONFIG_HT16K33_KEYSCAN */
 
 static int ht16k33_init(const struct device *dev)

drivers/led/Kconfig.ht16k33

@@ -13,8 +13,8 @@
                 /* Uncomment to use IRQ instead of polling: */
 		/* irq-gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; */
 
-		keyscan {
-			compatible = "holtek,ht16k33-keyscan";
+		kscan-input {
+			compatible = "zephyr,kscan-input";
 		};
 	};
 };

drivers/led/ht16k33.c

@@ -2,5 +2,5 @@ CONFIG_LOG=y
 CONFIG_I2C=y
 CONFIG_LED=y
 CONFIG_KSCAN=y
-CONFIG_KSCAN_INIT_PRIORITY=95
+CONFIG_INPUT=y
 CONFIG_HT16K33_KEYSCAN=y