release-request-ef036d9e-2bb5-4d4b-9fb6-6ab205857977-for-git_nyc-iot-release-3976227 snap-temp-L78400000060867698
Change-Id: I2977c5514fc965a77b99e86bc29c8e2f037ba032
diff --git a/arch/x86/configs/i386_iot_edison_defconfig b/arch/x86/configs/i386_iot_edison_defconfig
index 03c0710..7fc3ad0 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_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_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 cb8443a..378ee37 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 335a925..0c711b5 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 @@
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);
