Input: allow matching device IDs on property bits

Let's allow matching input devices on their property bits, both in-kernel
and when generating module aliases.

Tested-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 02e6ea7955fe1a2431dd58375b0386d9184b6639..762bfb9487dc961cf1c7d12a18a0d10dd3386b4c 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -960,7 +960,8 @@ bool input_match_device_id(const struct input_dev *dev,
            !bitmap_subset(id->ledbit, dev->ledbit, LED_MAX) ||
            !bitmap_subset(id->sndbit, dev->sndbit, SND_MAX) ||
            !bitmap_subset(id->ffbit, dev->ffbit, FF_MAX) ||
-           !bitmap_subset(id->swbit, dev->swbit, SW_MAX)) {
+           !bitmap_subset(id->swbit, dev->swbit, SW_MAX) ||
+           !bitmap_subset(id->propbit, dev->propbit, INPUT_PROP_MAX)) {
                return false;
        }
 

diff --git a/include/linux/input.h b/include/linux/input.h
index 2a44650e449d4e0aeb9c0f2bb7b9c5ee0c7f255a..7c7516eb7d76c64071e51c199fdb0fd0f4e3c934 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -234,6 +234,10 @@ struct input_dev {
 #error "SW_MAX and INPUT_DEVICE_ID_SW_MAX do not match"
 #endif
 
+#if INPUT_PROP_MAX != INPUT_DEVICE_ID_PROP_MAX
+#error "INPUT_PROP_MAX and INPUT_DEVICE_ID_PROP_MAX do not match"
+#endif
+
 #define INPUT_DEVICE_ID_MATCH_DEVICE \
        (INPUT_DEVICE_ID_MATCH_BUS | INPUT_DEVICE_ID_MATCH_VENDOR | INPUT_DEVICE_ID_MATCH_PRODUCT)
 #define INPUT_DEVICE_ID_MATCH_DEVICE_AND_VERSION \

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 3f74ef2281e8afac1e4667b4fbf4abcc5f89ff17..72f0b7f19c59f4f5addc43e57111adfe155ac7d5 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -293,6 +293,7 @@ struct pcmcia_device_id {
 #define INPUT_DEVICE_ID_SND_MAX                0x07
 #define INPUT_DEVICE_ID_FF_MAX         0x7f
 #define INPUT_DEVICE_ID_SW_MAX         0x0f
+#define INPUT_DEVICE_ID_PROP_MAX       0x1f
 
 #define INPUT_DEVICE_ID_MATCH_BUS      1
 #define INPUT_DEVICE_ID_MATCH_VENDOR   2
@@ -308,6 +309,7 @@ struct pcmcia_device_id {
 #define INPUT_DEVICE_ID_MATCH_SNDBIT   0x0400
 #define INPUT_DEVICE_ID_MATCH_FFBIT    0x0800
 #define INPUT_DEVICE_ID_MATCH_SWBIT    0x1000
+#define INPUT_DEVICE_ID_MATCH_PROPBIT  0x2000
 
 struct input_device_id {
 
@@ -327,6 +329,7 @@ struct input_device_id {
        kernel_ulong_t sndbit[INPUT_DEVICE_ID_SND_MAX / BITS_PER_LONG + 1];
        kernel_ulong_t ffbit[INPUT_DEVICE_ID_FF_MAX / BITS_PER_LONG + 1];
        kernel_ulong_t swbit[INPUT_DEVICE_ID_SW_MAX / BITS_PER_LONG + 1];
+       kernel_ulong_t propbit[INPUT_DEVICE_ID_PROP_MAX / BITS_PER_LONG + 1];
 
        kernel_ulong_t driver_info;
 };

diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index e4d90e50f6fece5db963af40a395d8ff4a4e8ecc..812657ab5aa3908322d58e461a4889001327bfde 100644 (file)
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -105,6 +105,7 @@ int main(void)
        DEVID_FIELD(input_device_id, sndbit);
        DEVID_FIELD(input_device_id, ffbit);
        DEVID_FIELD(input_device_id, swbit);
+       DEVID_FIELD(input_device_id, propbit);
 
        DEVID(eisa_device_id);
        DEVID_FIELD(eisa_device_id, sig);

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 29d6699d5a06c1eddb52e9aa4175766297754e4c..bc25898f6df0997b13f5752f97dd90879f4a0d37 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -761,7 +761,7 @@ static void do_input(char *alias,
                        sprintf(alias + strlen(alias), "%X,*", i);
 }
 
-/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwX where X is comma-separated %02X. */
+/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwXprX where X is comma-separated %02X. */
 static int do_input_entry(const char *filename, void *symval,
                          char *alias)
 {
@@ -779,6 +779,7 @@ static int do_input_entry(const char *filename, void *symval,
        DEF_FIELD_ADDR(symval, input_device_id, sndbit);
        DEF_FIELD_ADDR(symval, input_device_id, ffbit);
        DEF_FIELD_ADDR(symval, input_device_id, swbit);
+       DEF_FIELD_ADDR(symval, input_device_id, propbit);
 
        sprintf(alias, "input:");
 
@@ -816,6 +817,9 @@ static int do_input_entry(const char *filename, void *symval,
        sprintf(alias + strlen(alias), "w*");
        if (flags & INPUT_DEVICE_ID_MATCH_SWBIT)
                do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX);
+       sprintf(alias + strlen(alias), "pr*");
+       if (flags & INPUT_DEVICE_ID_MATCH_PROPBIT)
+               do_input(alias, *propbit, 0, INPUT_DEVICE_ID_PROP_MAX);
        return 1;
 }
 ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);