projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04f1b47
)
net: rfkill: gpio: add ACPI IDs for a Broadcom bluetooth chip
author
Heikki Krogerus
<heikki.krogerus@linux.intel.com>
Tue, 1 Apr 2014 14:02:55 +0000
(17:02 +0300)
committer
Johannes Berg
<johannes.berg@intel.com>
Fri, 11 Apr 2014 07:29:21 +0000
(09:29 +0200)
This adds ACPI IDs for Broadcom bluetooth chip BCM43241 used
on various Baytrail based boards such as Lenovo Miix 2 and
Asus Transformer Book T100TA.
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/rfkill/rfkill-gpio.c
patch
|
blob
|
history
diff --git
a/net/rfkill/rfkill-gpio.c
b/net/rfkill/rfkill-gpio.c
index
fec3dbf
..
436bffb
100644
(file)
--- a/
net/rfkill/rfkill-gpio.c
+++ b/
net/rfkill/rfkill-gpio.c
@@
-171,11
+171,16
@@
static int rfkill_gpio_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_ACPI
static const struct acpi_device_id rfkill_acpi_match[] = {
+ { "BCM2E1A", RFKILL_TYPE_BLUETOOTH },
+ { "BCM2E39", RFKILL_TYPE_BLUETOOTH },
+ { "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
{ "BCM4752", RFKILL_TYPE_GPS },
{ "LNV4752", RFKILL_TYPE_GPS },
{ },
};
+#endif
static struct platform_driver rfkill_gpio_driver = {
.probe = rfkill_gpio_probe,