Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3d20725 authored Jan 04, 2016 by Heikki Krogerus Committed by Marcel Holtmann Jan 04, 2016

Bluetooth: hci_bcm: move all Broadcom ACPI IDs to BCM HCI driver



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.

Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 59869ebf

drivers/bluetooth/hci_bcm.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -814,7 +814,11 @@ static const struct hci_uart_proto bcm_proto = {

	#ifdef CONFIG_ACPI		#ifdef CONFIG_ACPI
	static const struct acpi_device_id bcm_acpi_match[] = {		static const struct acpi_device_id bcm_acpi_match[] = {
			{ "BCM2E1A", 0 },
	{ "BCM2E39", 0 },		{ "BCM2E39", 0 },
			{ "BCM2E3D", 0 },
			{ "BCM2E40", 0 },
			{ "BCM2E64", 0 },
	{ "BCM2E65", 0 },		{ "BCM2E65", 0 },
	{ "BCM2E67", 0 },		{ "BCM2E67", 0 },
	{ },		{ },

net/rfkill/rfkill-gpio.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -163,10 +163,6 @@ static int rfkill_gpio_remove(struct platform_device *pdev)

	#ifdef CONFIG_ACPI		#ifdef CONFIG_ACPI
	static const struct acpi_device_id rfkill_acpi_match[] = {		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 },		{ "BCM4752", RFKILL_TYPE_GPS },
	{ "LNV4752", RFKILL_TYPE_GPS },		{ "LNV4752", RFKILL_TYPE_GPS },
	{ },		{ },