[src/trunk]: src/sys/dev/fdt Add support for lid switch event co...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d23c2c0c228
branches:  trunk
changeset: 318524:2d23c2c0c228
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Apr 28 11:49:06 2018 +0000
description:
Add support for lid switch event codes.

diffstat:

 sys/dev/fdt/gpiokeys.c |  61 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 18 deletions(-)

diffs (106 lines):

diff -r 210e93e4523d -r 2d23c2c0c228 sys/dev/fdt/gpiokeys.c
--- a/sys/dev/fdt/gpiokeys.c    Sat Apr 28 10:53:02 2018 +0000
+++ b/sys/dev/fdt/gpiokeys.c    Sat Apr 28 11:49:06 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiokeys.c,v 1.6 2017/12/10 17:03:07 bouyer Exp $ */
+/* $NetBSD: gpiokeys.c,v 1.7 2018/04/28 11:49:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpiokeys.c,v 1.6 2017/12/10 17:03:07 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpiokeys.c,v 1.7 2018/04/28 11:49:06 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -50,8 +50,16 @@
 
 #define GPIOKEYS_POLL_INTERVAL mstohz(200)
 
-#define KEY_POWER      116
-#define KEY_SLEEP      142
+/* Event types */
+#define        EV_KEY          1
+#define        EV_SW           5
+
+/* Key and button events */
+#define        KEY_POWER       116
+#define        KEY_SLEEP       142
+
+/* Switch events */
+#define        SW_LID          0
 
 static int     gpiokeys_match(device_t, cfdata_t, void *);
 static void    gpiokeys_attach(device_t, device_t, void *);
@@ -148,7 +156,7 @@
        const struct fdt_attach_args *faa = aux;
        const int phandle = faa->faa_phandle;
        struct gpiokeys_key *key;
-       u_int debounce, code;
+       u_int debounce, input_type, code;
        int use_wskbddev = 0;
        int child, len;
 
@@ -159,6 +167,8 @@
        aprint_normal(":");
 
        for (child = OF_child(phandle); child; child = OF_peer(child)) {
+               if (of_getprop_uint32(child, "linux,input-type", &input_type))
+                       input_type = EV_KEY;    /* default */
                if (of_getprop_uint32(child, "linux,code", &code))
                        continue;
                if (of_getprop_uint32(child, "debounce-interval", &debounce))
@@ -183,22 +193,37 @@
                if (key->key_pin)
                        key->key_state = fdtbus_gpio_read(key->key_pin);
 
-               switch (code) {
-               case KEY_POWER:
-                       key->key_pswitch.smpsw_name = key->key_label;
-                       key->key_pswitch.smpsw_type = PSWITCH_TYPE_POWER;
+               switch (input_type) {
+               case EV_KEY:
+                       switch (code) {
+                       case KEY_POWER:
+                               key->key_pswitch.smpsw_name = key->key_label;
+                               key->key_pswitch.smpsw_type = PSWITCH_TYPE_POWER;
+                               break;
+                       case KEY_SLEEP:
+                               key->key_pswitch.smpsw_name = key->key_label;
+                               key->key_pswitch.smpsw_type = PSWITCH_TYPE_SLEEP;
+                               break;
+                       default:
+                               key->key_usbcode = linux_key_to_usb(code);
+                               if (key->key_usbcode != 0) {
+                                       use_wskbddev++;
+                               } else {
+                                       key->key_pswitch.smpsw_name = key->key_label;
+                                       key->key_pswitch.smpsw_type = PSWITCH_TYPE_HOTKEY;
+                               }
+                               break;
+                       }
                        break;
-               case KEY_SLEEP:
+               case EV_SW:
                        key->key_pswitch.smpsw_name = key->key_label;
-                       key->key_pswitch.smpsw_type = PSWITCH_TYPE_SLEEP;
-                       break;
-               default:
-                       key->key_usbcode = linux_key_to_usb(code);
-                       if (key->key_usbcode != 0) {
-                               use_wskbddev++;
-                       } else {
-                               key->key_pswitch.smpsw_name = key->key_label;
+                       switch (code) {
+                       case SW_LID:
+                               key->key_pswitch.smpsw_type = PSWITCH_TYPE_LID;
+                               break;
+                       default:
                                key->key_pswitch.smpsw_type = PSWITCH_TYPE_HOTKEY;
+                               break;
                        }
                        break;
                }