Merge AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.040
This updates our sources to CodeLinaro release
AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.040 (LW.UM.2.1.r1-04000-SW5100.0),
which corresponds to ChipCode LW 2.0 r00078.3a.
Bug: 280095980
Change-Id: Ie17ab96b194c07702cd149561c1bec2e9121b03d
Signed-off-by: Daniel Price <danielprice@google.com>
diff --git a/Android.mk b/Android.mk
index dc0f2a7..ca88c12 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,6 +6,10 @@
ifeq ($(call is-board-platform-in-list,taro kalama monaco), true)
BT_SELECT := CONFIG_MSM_BT_POWER=m
+
+ifeq ($(TARGET_USE_WEAR_QC_BT_STACK),true)
+BT_SELECT += CONFIG_QC_SS_STACK=m
+endif
#ifdef CONFIG_SLIMBUS
BT_SELECT += CONFIG_BTFM_SLIM=m
#endif
diff --git a/Kbuild b/Kbuild
index 5e11372..fed363e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1,5 +1,8 @@
ifeq ($(CONFIG_MSM_BT_POWER),m)
KBUILD_CPPFLAGS += -DCONFIG_MSM_BT_POWER
+ifeq ($(CONFIG_QC_SS_STACK),m)
+KBUILD_CPPFLAGS += -DBT_SS_ENABLED
+endif
endif
ifeq ($(CONFIG_BTFM_SLIM),m)
diff --git a/pwr/btpower.c b/pwr/btpower.c
index 8ee92ad..d02e451 100644
--- a/pwr/btpower.c
+++ b/pwr/btpower.c
@@ -36,6 +36,10 @@
#define BTPOWER_MBOX_MSG_MAX_LEN 64
#define BTPOWER_MBOX_TIMEOUT_MS 1000
#define XO_CLK_RETRY_COUNT_MAX 5
+
+#ifdef BT_SS_ENABLED
+#define QCA_SLATE_SOC_ID_0200 0x40190200
+#endif
/**
* enum btpower_vreg_param: Voltage regulator TCS param
* @BTPOWER_VREG_VOLTAGE: Provides voltage level to be configured in TCS
@@ -1137,8 +1141,13 @@
int btpower_get_chipset_version(void)
{
+#ifndef BT_SS_ENABLED
pr_debug("%s\n", __func__);
return soc_id;
+#else
+ pr_debug("%s: returning slate SOCID: %x\n", __func__, QCA_SLATE_SOC_ID_0200);
+ return QCA_SLATE_SOC_ID_0200;
+#endif
}
EXPORT_SYMBOL(btpower_get_chipset_version);
