[PATCH 0/2] Bluetooth: hci_bcm: drop BCM43241 support from rfkill_gpio

[PATCH 0/2] Bluetooth: hci_bcm: drop BCM43241 support from rfkill_gpio

[Heikki Krogerus]

Now that drivers/bluetooth/hci_bcm.c is able to handle the GPIOs
assigned to BCM43241, there is absolutely no reason to continue
supporting the module in rfkill_gpio.


Heikki Krogerus (2):
  Bluetooth: hci_bcm/rfkill-gpio: move all Broadcom ACPI IDs to BCM HCI
    driver
  Bluetooth: hci_bcm: new ACPI IDs

 drivers/bluetooth/hci_bcm.c | 7 +++++++
 net/rfkill/rfkill-gpio.c    | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

-- 
2.6.4

[PATCH 1/2] Bluetooth: hci_bcm/rfkill-gpio: move all Broadcom ACPI IDs to BCM HCI driver

[Heikki Krogerus]

The IDs should all be for Broadcom BCM43241 module, and
hci_bcm is now the proper driver for them. This removes one
of two different ways of handling PM with the module.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
---
 drivers/bluetooth/hci_bcm.c | 4 ++++
 net/rfkill/rfkill-gpio.c    | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 5c7c696..abf13a7 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -814,7 +814,11 @@ static const struct hci_uart_proto bcm_proto = {
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id bcm_acpi_match[] = {
+	{ "BCM2E1A", 0 },
 	{ "BCM2E39", 0 },
+	{ "BCM2E3D", 0 },
+	{ "BCM2E40", 0 },
+	{ "BCM2E64", 0 },
 	{ "BCM2E65", 0 },
 	{ "BCM2E67", 0 },
 	{ },
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 9312722..4b1e3f3 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -163,10 +163,6 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id rfkill_acpi_match[] = {
-	{ "BCM2E1A", RFKILL_TYPE_BLUETOOTH },
-	{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
-	{ "BCM2E40", RFKILL_TYPE_BLUETOOTH },
-	{ "BCM2E64", RFKILL_TYPE_BLUETOOTH },
 	{ "BCM4752", RFKILL_TYPE_GPS },
 	{ "LNV4752", RFKILL_TYPE_GPS },
 	{ },
-- 
2.6.4

Re: [PATCH 1/2] Bluetooth: hci_bcm/rfkill-gpio: move all Broadcom ACPI IDs to BCM HCI driver

[Marcel Holtmann]

Hi Heikki,

> The IDs should all be for Broadcom BCM43241 module, and
> hci_bcm is now the proper driver for them. This removes one
> of two different ways of handling PM with the module.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Cc: Johannes Berg <johannes@sipsolutions.net>
> ---
> drivers/bluetooth/hci_bcm.c | 4 ++++
> net/rfkill/rfkill-gpio.c    | 4 ----
> 2 files changed, 4 insertions(+), 4 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel

[PATCH 2/2] Bluetooth: hci_bcm: new ACPI IDs

[Heikki Krogerus]

These are used at least by Acer with BCM43241.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/bluetooth/hci_bcm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index abf13a7..5f3de18 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -816,11 +816,14 @@ static const struct hci_uart_proto bcm_proto = {
 static const struct acpi_device_id bcm_acpi_match[] = {
 	{ "BCM2E1A", 0 },
 	{ "BCM2E39", 0 },
+	{ "BCM2E3A", 0 },
 	{ "BCM2E3D", 0 },
+	{ "BCM2E3F", 0 },
 	{ "BCM2E40", 0 },
 	{ "BCM2E64", 0 },
 	{ "BCM2E65", 0 },
 	{ "BCM2E67", 0 },
+	{ "BCM2E7B", 0 },
 	{ },
 };
 MODULE_DEVICE_TABLE(acpi, bcm_acpi_match);
-- 
2.6.4

Re: [PATCH 2/2] Bluetooth: hci_bcm: new ACPI IDs

[Marcel Holtmann]

Hi Heikki,

> These are used at least by Acer with BCM43241.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/bluetooth/hci_bcm.c | 3 +++
> 1 file changed, 3 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel