Merge 58cd56ebf36de10014d4b91ad37c0c9150449307 on remote branch

Change-Id: I0970dc0aea0f267f5f2e37e6c3f547d5a8495b47

Android.mk

@@ -18,7 +18,7 @@ ifeq ($(call is-board-platform-in-list,holi blair),true)
 AUDIO_SELECT  := CONFIG_SND_SOC_HOLI=m
 endif
 
-ifeq ($(call is-board-platform-in-list,pineapple cliffs pitti),true)
+ifeq ($(call is-board-platform-in-list,pineapple cliffs pitti volcano),true)
 AUDIO_SELECT  := CONFIG_SND_SOC_PINEAPPLE=m
 endif
 
@@ -28,7 +28,7 @@ LOCAL_PATH := vendor/qcom/opensource/audio-kernel
 endif
 
 # Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,taro kalama bengal pineapple cliffs pitti holi blair gen4 msmnile niobe), true)
+ifeq ($(call is-board-platform-in-list,taro kalama bengal pineapple cliffs pitti holi blair gen4 msmnile niobe volcano), true)
 
 # This makefile is only for DLKM
 ifneq ($(findstring vendor,$(LOCAL_PATH)),)

EnableBazel.mk

@@ -1,4 +1,4 @@
-ifeq ($(call is-board-platform-in-list,pineapple cliffs),true)
+ifeq ($(call is-board-platform-in-list,pineapple cliffs volcano),true)
 LOCAL_MODULE_DDK_BUILD := true
 
 LOCAL_MODULE_KO_DIRS := dsp/q6_notifier_dlkm.ko

dsp/spf-core.c

@@ -31,7 +31,7 @@
 #define APM_CMD_RSP_GET_SPF_STATE 0x02001007
 #define APM_MODULE_INSTANCE_ID   0x00000001
 #define GPR_SVC_ADSP_CORE 0x3
-#define ADD_CHILD_DEVICES_APM_TIMEOUT_MS 5000
+#define ADD_CHILD_DEVICES_APM_TIMEOUT_MS 10000
 
 struct spf_core {
 	struct gpr_device *adev;