diff options
| author | Brian Wood <brian.j.wood@intel.com> | 2017-05-03 10:41:05 -0700 |
|---|---|---|
| committer | Eric Arseneau <earseneau@google.com> | 2017-05-04 12:27:17 -0700 |
| commit | 26fb7b6973d833c8035ce5b08ba10691fe83cdcb (patch) | |
| tree | d0d75c69292e574136d8edad79cec171fd3ccb65 | |
| parent | d720d624062591399bbf53db3b8a2d0bc0de084a (diff) | |
| download | edison-v4.4-26fb7b6973d833c8035ce5b08ba10691fe83cdcb.tar.gz | |
BT: Enable Broadcom Bluetooth LPM for 4.x Kernel
This commit enables the Broadcom Bluetooth functionality
for the BCM43xx chipset by removing the obsolete Merrifield
HSU API calls and replaces with generic API use as we no
longer support the HSU driver.
Change-Id: I12ab16f343aed576edf956c4dbe0f6606765bf22
Signed-off-by: Brian Wood <brian.j.wood@intel.com>
| -rw-r--r-- | arch/x86/configs/i386_iot_edison_defconfig | 4 | ||||
| -rw-r--r-- | drivers/misc/bcm-lpm/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/misc/bcm-lpm/bcm_bt_lpm.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/configs/i386_iot_edison_defconfig b/arch/x86/configs/i386_iot_edison_defconfig index 03c0710345d5..7fc3ad099574 100644 --- a/arch/x86/configs/i386_iot_edison_defconfig +++ b/arch/x86/configs/i386_iot_edison_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 4.4.14 Kernel Configuration +# Linux/i386 4.4.59 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -960,7 +960,6 @@ CONFIG_DNS_RESOLVER=y # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set -# CONFIG_NETLINK_MMAP is not set # CONFIG_NETLINK_DIAG is not set # CONFIG_MPLS is not set # CONFIG_HSR is not set @@ -1210,6 +1209,7 @@ CONFIG_INTEL_PTI_STM=y # CONFIG_CXL_BASE is not set # CONFIG_CXL_KERNEL_API is not set # CONFIG_CXL_EEH is not set +CONFIG_BCM_BT_LPM=y CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff --git a/drivers/misc/bcm-lpm/Kconfig b/drivers/misc/bcm-lpm/Kconfig index cb8443aca6f0..378ee3744c3b 100644 --- a/drivers/misc/bcm-lpm/Kconfig +++ b/drivers/misc/bcm-lpm/Kconfig @@ -1,6 +1,6 @@ config BCM_BT_LPM tristate "Broadcom Bluetooth Low Power Mode" - depends on SERIAL_MFD_HSU + depends on SERIAL_8250 default m help Select this module for Broadcom Bluetooth low power management. diff --git a/drivers/misc/bcm-lpm/bcm_bt_lpm.c b/drivers/misc/bcm-lpm/bcm_bt_lpm.c index 335a9258df57..0c711b54d361 100644 --- a/drivers/misc/bcm-lpm/bcm_bt_lpm.c +++ b/drivers/misc/bcm-lpm/bcm_bt_lpm.c @@ -29,7 +29,6 @@ #include <linux/pm_runtime.h> #include <linux/delay.h> #include <asm/intel-mid.h> -#include <asm/intel_mid_hsu.h> #ifndef CONFIG_ACPI #include <asm/bcm_bt_lpm.h> @@ -320,8 +319,8 @@ static int bcm_bt_lpm_init(struct platform_device *pdev) return ret; } - tty_dev = intel_mid_hsu_set_wake_peer(bt_lpm.port, - bcm_bt_lpm_wake_peer); + tty_dev = &pdev->dev; + if (!tty_dev) { pr_err("Error no tty dev"); gpio_free(bt_lpm.gpio_wake); |