diff mbox

net: rfkill-gpio: more ACPI IDs for BCM Blutooth modules

Message ID 1450876021-806-1-git-send-email-heikki.krogerus@linux.intel.com (mailing list archive)
State Not Applicable
Delegated to: Johannes Berg
Headers show

Commit Message

Heikki Krogerus Dec. 23, 2015, 1:07 p.m. UTC
These are used with BCM43241 Wi-Fi/Bluetooth Combo Device.

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

Comments

Marcel Holtmann Dec. 23, 2015, 3:28 p.m. UTC | #1
Hi Heikki,

> These are used with BCM43241 Wi-Fi/Bluetooth Combo Device.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> net/rfkill/rfkill-gpio.c | 3 +++
> 1 file changed, 3 insertions(+)
> 
> diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
> index 9312722..ba6d61d 100644
> --- a/net/rfkill/rfkill-gpio.c
> +++ b/net/rfkill/rfkill-gpio.c
> @@ -164,9 +164,12 @@ 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 },
> +	{ "BCM2E3A", RFKILL_TYPE_BLUETOOTH },
> 	{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
> +	{ "BCM2E3F", RFKILL_TYPE_BLUETOOTH },
> 	{ "BCM2E40", RFKILL_TYPE_BLUETOOTH },
> 	{ "BCM2E64", RFKILL_TYPE_BLUETOOTH },
> +	{ "BCM2E7B", RFKILL_TYPE_BLUETOOTH },
> 	{ "BCM4752", RFKILL_TYPE_GPS },
> 	{ "LNV4752", RFKILL_TYPE_GPS },
> 	{ },

I am actually not convinced that these should be added here. We are driving the Broadcom chips via drivers/bluetooth/hci_bcm.c and I pretty sure that these devices should be added there. We moved a few of the existing ones already over, but I have the feeling that in the end all should be moved.

Regards

Marcel

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Heikki Krogerus Dec. 28, 2015, 8:49 a.m. UTC | #2
On Wed, Dec 23, 2015 at 04:28:59PM +0100, Marcel Holtmann wrote:
> Hi Heikki,
> 
> > These are used with BCM43241 Wi-Fi/Bluetooth Combo Device.
> > 
> > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > ---
> > net/rfkill/rfkill-gpio.c | 3 +++
> > 1 file changed, 3 insertions(+)
> > 
> > diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
> > index 9312722..ba6d61d 100644
> > --- a/net/rfkill/rfkill-gpio.c
> > +++ b/net/rfkill/rfkill-gpio.c
> > @@ -164,9 +164,12 @@ 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 },
> > +	{ "BCM2E3A", RFKILL_TYPE_BLUETOOTH },
> > 	{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
> > +	{ "BCM2E3F", RFKILL_TYPE_BLUETOOTH },
> > 	{ "BCM2E40", RFKILL_TYPE_BLUETOOTH },
> > 	{ "BCM2E64", RFKILL_TYPE_BLUETOOTH },
> > +	{ "BCM2E7B", RFKILL_TYPE_BLUETOOTH },
> > 	{ "BCM4752", RFKILL_TYPE_GPS },
> > 	{ "LNV4752", RFKILL_TYPE_GPS },
> > 	{ },
> 
> I am actually not convinced that these should be added here. We are driving
> the Broadcom chips via drivers/bluetooth/hci_bcm.c and I pretty sure that
> these devices should be added there. We moved a few of the existing ones
> already over, but I have the feeling that in the end all should be moved.

I totally agree! That is so much better! Frederic did tell me about
adding ACPI support to that driver, but I forgot. Sorry about that.

So Johannes, forget about this patch. I'll create a patch where I'll
propose these ID's to that driver instead. I can also prepare patch
where we move the other BCM2Exx ACPI IDs to
drivers/bluetooth/hci_bcm.c at the same time if you like.


Thanks,
diff mbox

Patch

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 9312722..ba6d61d 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -164,9 +164,12 @@  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 },
+	{ "BCM2E3A", RFKILL_TYPE_BLUETOOTH },
 	{ "BCM2E3D", RFKILL_TYPE_BLUETOOTH },
+	{ "BCM2E3F", RFKILL_TYPE_BLUETOOTH },
 	{ "BCM2E40", RFKILL_TYPE_BLUETOOTH },
 	{ "BCM2E64", RFKILL_TYPE_BLUETOOTH },
+	{ "BCM2E7B", RFKILL_TYPE_BLUETOOTH },
 	{ "BCM4752", RFKILL_TYPE_GPS },
 	{ "LNV4752", RFKILL_TYPE_GPS },
 	{ },