[RFKILL]: Add support for ultrawideband

This patch will add support for UWB keys to rfkill,
support for this has been requested by Inaky.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/input.h b/include/linux/input.h
index 36e00aa6f03bcf84705ba49ed0cefc7f3729257b..6eb3aead7f1d93775ba4020e9d252df5210c757a 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -360,6 +360,7 @@ struct input_absinfo {
 
 #define KEY_BLUETOOTH          237
 #define KEY_WLAN               238
+#define KEY_UWB                        239
 
 #define KEY_UNKNOWN            240
 

diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index c4546e15c85395d52b880b7e82cf281654ab3e57..f9a50dab4168cc5e1a242597c2e62ad970fa5d1a 100644 (file)
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -31,10 +31,12 @@
  * enum rfkill_type - type of rfkill switch.
  * RFKILL_TYPE_WLAN: switch is no a Wireless network devices.
  * RFKILL_TYPE_BlUETOOTH: switch is on a bluetooth device.
+ * RFKILL_TYPE_UWB: switch is on a Ultra wideband device.
  */
 enum rfkill_type {
        RFKILL_TYPE_WLAN ,
        RFKILL_TYPE_BLUETOOTH,
+       RFKILL_TYPE_UWB,
        RFKILL_TYPE_MAX,
 };
 

diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c
index 9f746be588543813b8e9e686ffef3979b6ddb046..8e4516a5fe3237a4e93fa8946841341c71309f48 100644 (file)
--- a/net/rfkill/rfkill-input.c
+++ b/net/rfkill/rfkill-input.c
@@ -81,6 +81,7 @@ static void rfkill_schedule_toggle(struct rfkill_task *task)
 
 static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN);
 static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH);
+static DEFINE_RFKILL_TASK(rfkill_uwb, RFKILL_TYPE_UWB);
 
 static void rfkill_event(struct input_handle *handle, unsigned int type,
                        unsigned int code, int down)
@@ -93,6 +94,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
                case KEY_BLUETOOTH:
                        rfkill_schedule_toggle(&rfkill_bt);
                        break;
+               case KEY_UWB:
+                       rfkill_schedule_toggle(&rfkill_uwb);
+                       break;
                default:
                        break;
                }
@@ -148,6 +152,11 @@ static const struct input_device_id rfkill_ids[] = {
                .evbit = { BIT(EV_KEY) },
                .keybit = { [LONG(KEY_BLUETOOTH)] = BIT(KEY_BLUETOOTH) },
        },
+       {
+               .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
+               .evbit = { BIT(EV_KEY) },
+               .keybit = { [LONG(KEY_UWB)] = BIT(KEY_UWB) },
+       },
        { }
 };
 

diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index 50e010272e471fb674e2769a1ca0332be3d9f70b..03ed7fd8afe0e8cf4923920f40d234cd3e6149e9 100644 (file)
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -106,6 +106,9 @@ static ssize_t rfkill_type_show(struct device *dev,
        case RFKILL_TYPE_BLUETOOTH:
                type = "bluetooth";
                break;
+       case RFKILL_TYPE_UWB:
+               type = "ultrawideband";
+               break;
        default:
                BUG();
        }