diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2015-05-07 15:54:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-24 11:15:54 -0700 |
| commit | c93b76b34b4d8dbe8e3443eb27e49ac60034342b (patch) | |
| tree | 018e5514a107c1db6329900afcfcb5905f55b0ac /drivers/nfc | |
| parent | 41c95b04385863f694fcf96e08994ebc722b7b9f (diff) | |
| download | op-kernel-dev-c93b76b34b4d8dbe8e3443eb27e49ac60034342b.zip op-kernel-dev-c93b76b34b4d8dbe8e3443eb27e49ac60034342b.tar.gz | |
mei: bus: report also uuid in module alias
In order to automate modules matching add device uuid
which is reported in client enumeration, keep also
the name that is needed in for nfc distinguishing radio vendor
Report mei:name:uuid
Cc: linux-api@vger.kernel.org
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/mei_phy.h | 3 | ||||
| -rw-r--r-- | drivers/nfc/microread/mei.c | 2 | ||||
| -rw-r--r-- | drivers/nfc/pn544/mei.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/nfc/mei_phy.h b/drivers/nfc/mei_phy.h index d669900..06608c2 100644 --- a/drivers/nfc/mei_phy.h +++ b/drivers/nfc/mei_phy.h @@ -3,7 +3,10 @@ #include <linux/mei_cl_bus.h> #include <net/nfc/hci.h> +#include <linux/uuid.h> +#define MEI_NFC_UUID __UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50, \ + 0x94, 0xd4, 0x50, 0x26, 0x67, 0x23, 0x77, 0x5c) #define MEI_NFC_HEADER_SIZE 10 #define MEI_NFC_MAX_HCI_PAYLOAD 300 diff --git a/drivers/nfc/microread/mei.c b/drivers/nfc/microread/mei.c index 2d1395b..f9f5fc9 100644 --- a/drivers/nfc/microread/mei.c +++ b/drivers/nfc/microread/mei.c @@ -67,7 +67,7 @@ static int microread_mei_remove(struct mei_cl_device *device) } static struct mei_cl_device_id microread_mei_tbl[] = { - { MICROREAD_DRIVER_NAME }, + { MICROREAD_DRIVER_NAME, MEI_NFC_UUID}, /* required last entry */ { } diff --git a/drivers/nfc/pn544/mei.c b/drivers/nfc/pn544/mei.c index 330cd40..101a37e 100644 --- a/drivers/nfc/pn544/mei.c +++ b/drivers/nfc/pn544/mei.c @@ -67,7 +67,7 @@ static int pn544_mei_remove(struct mei_cl_device *device) } static struct mei_cl_device_id pn544_mei_tbl[] = { - { PN544_DRIVER_NAME }, + { PN544_DRIVER_NAME, MEI_NFC_UUID}, /* required last entry */ { } |
