From 19b039aa73508b55a8d6d62c99fb0352af03d769 Mon Sep 17 00:00:00 2001 From: Yuhui Zhao Date: Sun, 17 Jul 2022 16:09:43 +0800 Subject: [PATCH] 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 --- Android.mk | 8 ++++++- asoc/codecs/Kbuild | 4 ++++ asoc/codecs/lpass-cdc/Kbuild | 4 ++++ asoc/codecs/wcd938x/Kbuild | 4 ++++ asoc/codecs/wsa883x/Kbuild | 4 ++++ asoc/codecs/wsa884x/Kbuild | 4 ++++ config/pineappleauto.conf | 36 +++++++++++++++++++++++++++++ config/pineappleautoconf.h | 44 ++++++++++++++++++++++++++++++++++++ dsp/Kbuild | 4 ++++ ipc/Kbuild | 4 ++++ soc/Kbuild | 4 ++++ 11 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 config/pineappleauto.conf create mode 100644 config/pineappleautoconf.h diff --git a/Android.mk b/Android.mk index cefda86446..f1a8131296 100644 --- a/Android.mk +++ b/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)),) diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index 9809b1894b..bea53cce40 100644 --- a/asoc/codecs/Kbuild +++ b/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 diff --git a/asoc/codecs/lpass-cdc/Kbuild b/asoc/codecs/lpass-cdc/Kbuild index 4149b8b777..f1469352ad 100644 --- a/asoc/codecs/lpass-cdc/Kbuild +++ b/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 diff --git a/asoc/codecs/wcd938x/Kbuild b/asoc/codecs/wcd938x/Kbuild index 61364dd769..13cc85af0f 100644 --- a/asoc/codecs/wcd938x/Kbuild +++ b/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 diff --git a/asoc/codecs/wsa883x/Kbuild b/asoc/codecs/wsa883x/Kbuild index 63011f75e5..4b26118133 100644 --- a/asoc/codecs/wsa883x/Kbuild +++ b/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: diff --git a/asoc/codecs/wsa884x/Kbuild b/asoc/codecs/wsa884x/Kbuild index 2c694e728c..b556cd08f0 100644 --- a/asoc/codecs/wsa884x/Kbuild +++ b/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 diff --git a/config/pineappleauto.conf b/config/pineappleauto.conf new file mode 100644 index 0000000000..931ba108ae --- /dev/null +++ b/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 diff --git a/config/pineappleautoconf.h b/config/pineappleautoconf.h new file mode 100644 index 0000000000..54b9ce07a4 --- /dev/null +++ b/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 diff --git a/dsp/Kbuild b/dsp/Kbuild index d5720e796b..2ee41203e6 100644 --- a/dsp/Kbuild +++ b/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 diff --git a/ipc/Kbuild b/ipc/Kbuild index 3d511ba17c..a5c0f76bf7 100644 --- a/ipc/Kbuild +++ b/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 diff --git a/soc/Kbuild b/soc/Kbuild index aaea5b4f32..d76a059d8f 100644 --- a/soc/Kbuild +++ b/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