Просмотр исходного кода

asoc: add config files to support pineapple target

add pineapple config file to all drivers:
Kbuild, including soc/dsp/ipc

Change-Id: I2357c7c96739bd42cb8764753d2a4fd5dd1c9634
Signed-off-by: Prasad Kumpatla <[email protected]>
Yuhui Zhao 2 лет назад
Родитель
Сommit
19b039aa73

+ 7 - 1
Android.mk

@@ -14,12 +14,18 @@ ifeq ($(call is-board-platform, bengal),true)
 AUDIO_SELECT  := CONFIG_SND_SOC_BENGAL=m
 endif
 
+ifeq ($(call is-board-platform, pineapple),true)
+AUDIO_SELECT  := CONFIG_SND_SOC_PINEAPPLE=m
+endif
+
 ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
 include $(call all-subdir-makefiles)
 endif
 
 # Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,taro kalama bengal), true)
+ifeq ($(call is-board-platform-in-list,taro kalama bengal pineapple), true)
+
+LOCAL_PATH := $(call my-dir)
 
 # This makefile is only for DLKM
 ifneq ($(findstring vendor,$(LOCAL_PATH)),)

+ 4 - 0
asoc/codecs/Kbuild

@@ -65,6 +65,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/kalamaauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/kalamaautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+		include $(AUDIO_ROOT)/config/pineappleauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/pineappleautoconf.h
+	endif
 	ifeq ($(CONFIG_ARCH_LITO), y)
 		include $(AUDIO_ROOT)/config/litoauto.conf
 		export

+ 4 - 0
asoc/codecs/lpass-cdc/Kbuild

@@ -38,6 +38,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/kalamaauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/kalamaautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+		include $(AUDIO_ROOT)/config/pineappleauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/pineappleautoconf.h
+	endif
 	ifeq ($(CONFIG_ARCH_LITO), y)
 		include $(AUDIO_ROOT)/config/litoauto.conf
 		export

+ 4 - 0
asoc/codecs/wcd938x/Kbuild

@@ -31,6 +31,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/kalamaauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/kalamaautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+		include $(AUDIO_ROOT)/config/pineappleauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/pineappleautoconf.h
+	endif
 
 endif
 

+ 4 - 0
asoc/codecs/wsa883x/Kbuild

@@ -30,6 +30,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/litoauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+		include $(AUDIO_ROOT)/config/pineappleauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/pineappleautoconf.h
+	endif
 endif
 
 # As per target team, build is done as follows:

+ 4 - 0
asoc/codecs/wsa884x/Kbuild

@@ -26,6 +26,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/kalamaauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/kalamaautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+		include $(AUDIO_ROOT)/config/pineappleauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/pineappleautoconf.h
+	endif
 	ifeq ($(CONFIG_ARCH_LITO), y)
 		include $(AUDIO_ROOT)/config/litoauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/litoautoconf.h

+ 36 - 0
config/pineappleauto.conf

@@ -0,0 +1,36 @@
+export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
+export CONFIG_SND_SOC_PINEAPPLE=m
+export CONFIG_SND_EVENT=m
+export CONFIG_AUDIO_PKT_ION=m
+export CONFIG_MSM_QDSP6_NOTIFIER=m
+export CONFIG_MSM_QDSP6_SSR=m
+export CONFIG_MSM_ADSP_LOADER=m
+export CONFIG_SPF_CORE=m
+export CONFIG_MSM_QDSP6_GPR_RPMSG=m
+export CONFIG_MSM_QDSP6_PDR=m
+export CONFIG_AUDIO_PRM=m
+export CONFIG_AUDIO_PKT=m
+export CONFIG_DIGITAL_CDC_RSC_MGR=m
+export CONFIG_PINCTRL_LPI=m
+export CONFIG_SOUNDWIRE=m
+export CONFIG_SOUNDWIRE_MSTR_CTRL=m
+export CONFIG_WCD9XXX_CODEC_CORE_V2=m
+export CONFIG_MSM_CDC_PINCTRL=m
+export CONFIG_SND_SOC_WSA884X=m
+export CONFIG_SND_SOC_WSA883X=m
+export CONFIG_SND_SOC_LPASS_CDC=m
+export CONFIG_SND_SOC_WCD_IRQ=m
+export CONFIG_LPASS_CDC_WSA2_MACRO=m
+export CONFIG_LPASS_CDC_WSA_MACRO=m
+export CONFIG_LPASS_CDC_VA_MACRO=m
+export CONFIG_LPASS_CDC_TX_MACRO=m
+export CONFIG_LPASS_CDC_RX_MACRO=m
+export CONFIG_SND_SOC_WCD9XXX_V2=m
+export CONFIG_SND_SOC_WCD938X=m
+export CONFIG_SND_SOC_WCD938X_SLAVE=m
+export CONFIG_SND_SOC_WCD_MBHC=m
+export CONFIG_SND_SOC_WCD_MBHC_ADC=m
+export CONFIG_SND_SWR_HAPTICS=m
+export CONFIG_SND_SOC_MSM_STUB=m
+export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
+export CONFIG_SND_SOC_SWR_DMIC=m

+ 44 - 0
config/pineappleautoconf.h

@@ -0,0 +1,44 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
+#define CONFIG_SND_SOC_PINEAPPLE 1
+#define CONFIG_SND_EVENT 1
+#define CONFIG_AUDIO_PKT_ION 1
+#define CONFIG_MSM_QDSP6_NOTIFIER 1
+#define CONFIG_MSM_QDSP6_SSR 1
+#define CONFIG_MSM_QDSP6_PDR 1
+#define CONFIG_MSM_ADSP_LOADER 1
+#define CONFIG_SPF_CORE 1
+#define CONFIG_MSM_QDSP6_GPR_RPMSG 1
+#define CONFIG_AUDIO_PRM 1
+#define CONFIG_AUDIO_PKT 1
+#define CONFIG_DIGITAL_CDC_RSC_MGR 1
+#define CONFIG_PINCTRL_LPI 1
+#define CONFIG_SOUNDWIRE 1
+#define CONFIG_SOUNDWIRE_MSTR_CTRL 1
+#define CONFIG_SWRM_VER_2P0 1
+#define CONFIG_WCD9XXX_CODEC_CORE_V2 1
+#define CONFIG_MSM_CDC_PINCTRL 1
+#define CONFIG_SND_SOC_WSA884X 1
+#define CONFIG_SND_SOC_WSA883X 1
+#define CONFIG_SND_SOC_LPASS_CDC 1
+#define CONFIG_SND_SOC_WCD_IRQ 1
+#define CONFIG_LPASS_CDC_WSA2_MACRO 1
+#define CONFIG_LPASS_CDC_WSA_MACRO 1
+#define CONFIG_LPASS_CDC_VA_MACRO 1
+#define CONFIG_LPASS_CDC_TX_MACRO 1
+#define CONFIG_LPASS_CDC_RX_MACRO 1
+#define CONFIG_SND_SOC_WCD9XXX_V2 1
+#define CONFIG_SND_SOC_WCD938X 1
+#define CONFIG_SND_SOC_WCD938X_SLAVE 1
+#define CONFIG_SND_SOC_WCD_MBHC 1
+#define CONFIG_SND_SOC_WCD_MBHC_ADC 1
+#define CONFIG_SND_SWR_HAPTICS 1
+#define CONFIG_SND_SOC_MSM_STUB 1
+#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
+#define CONFIG_MSM_EXT_DISPLAY 1
+#define CONFIG_SND_SOC_SWR_DMIC 1

+ 4 - 0
dsp/Kbuild

@@ -54,6 +54,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/kalamaauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/kalamaautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+		include $(AUDIO_ROOT)/config/pineappleauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/pineappleautoconf.h
+	endif
 	ifeq ($(CONFIG_ARCH_LITO), y)
 		include $(AUDIO_ROOT)/config/litoauto.conf
 		export

+ 4 - 0
ipc/Kbuild

@@ -55,6 +55,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/kalamaauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/kalamaautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+		include $(AUDIO_ROOT)/config/pineappleauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/pineappleautoconf.h
+	endif
 	ifeq ($(CONFIG_ARCH_LITO), y)
 		include $(AUDIO_ROOT)/config/litoauto.conf
 		export

+ 4 - 0
soc/Kbuild

@@ -49,6 +49,10 @@ ifeq ($(KERNEL_BUILD), 0)
 		include $(AUDIO_ROOT)/config/kalamaauto.conf
 		INCS    +=  -include $(AUDIO_ROOT)/config/kalamaautoconf.h
 	endif
+	ifeq ($(CONFIG_ARCH_PINEAPPLE), y)
+		include $(AUDIO_ROOT)/config/pineappleauto.conf
+		INCS    +=  -include $(AUDIO_ROOT)/config/pineappleautoconf.h
+	endif
 	ifeq ($(CONFIG_ARCH_LITO), y)
 		include $(AUDIO_ROOT)/config/litoauto.conf
 		export