asoc: Enable compilation of wcd937x on palawan

Enable compilation of wcd937x on palawan.

Change-Id: Ib9521fe83cba88a1ac36972938f2a3921d5efecb
Signed-off-by: Faiz Nabi Kuchay <[email protected]>

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),true)
+ifeq ($(call is-board-platform-in-list,pineapple cliffs),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 holi blair gen4 msmnile), true)
+ifeq ($(call is-board-platform-in-list,taro kalama bengal pineapple cliffs holi blair gen4 msmnile), true)
 
 # This makefile is only for DLKM
 ifneq ($(findstring vendor,$(LOCAL_PATH)),)
@@ -354,6 +354,24 @@ LOCAL_MODULE_DEBUG_ENABLE := true
 LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
 include $(DLKM_DIR)/Build_external_kernelmodule.mk
 
+########################### WCD937x CODEC  ################################
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)
+LOCAL_MODULE              := wcd937x_dlkm.ko
+LOCAL_MODULE_KBUILD_NAME  := asoc/codecs/wcd937x/wcd937x_dlkm.ko
+LOCAL_MODULE_TAGS         := optional
+LOCAL_MODULE_DEBUG_ENABLE := true
+LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+include $(DLKM_DIR)/Build_external_kernelmodule.mk
+###########################################################
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)
+LOCAL_MODULE              := wcd937x_slave_dlkm.ko
+LOCAL_MODULE_KBUILD_NAME  := asoc/codecs/wcd937x/wcd937x_slave_dlkm.ko
+LOCAL_MODULE_TAGS         := optional
+LOCAL_MODULE_DEBUG_ENABLE := true
+LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+include $(DLKM_DIR)/Build_external_kernelmodule.mk
 ########################### WCD938x CODEC  ################################
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES           := $(AUDIO_SRC_FILES)

BUILD.bazel

@@ -51,4 +51,4 @@ load(":build/blair.bzl", "define_blair")
 
 define_kalama()
 define_pineapple()
-define_blair()
+define_blair()

EnableBazel.mk

@@ -1,4 +1,4 @@
-ifeq ($(call is-board-platform-in-list,pineapple),true)
+ifeq ($(call is-board-platform-in-list,pineapple cliffs),true)
 LOCAL_MODULE_DDK_BUILD := true
 
 LOCAL_MODULE_KO_DIRS := dsp/q6_notifier_dlkm.ko
@@ -29,6 +29,8 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_tx_macro_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/lpass-cdc/lpass_cdc_rx_macro_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa884x/wsa884x_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa883x/wsa883x_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_slave_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_slave_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd939x/wcd939x_dlkm.ko
@@ -66,4 +68,4 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_slave_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_slave_dlkm.ko
-endif
+endif

audio_kernel_modules.mk

@@ -42,6 +42,8 @@ AUDIO_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/swr_dmic_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/lpass_cdc_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/wsa884x_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/wsa883x_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/wcd937x_dlkm.ko \
+	$(KERNEL_MODULES_OUT)/wcd937x_slave_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/wcd938x_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/wcd938x_slave_dlkm.ko \
 	$(KERNEL_MODULES_OUT)/wcd939x_dlkm.ko \

audio_modules.bzl

@@ -393,7 +393,7 @@ audio_modules.register(
         "wcd937x-regmap.c",
         "wcd937x-tables.c",
         "wcd937x-mbhc.c",
-    ],
+    ]
 )
 audio_modules.register(
     name = "wcd937x_slave_dlkm",
@@ -436,4 +436,4 @@ audio_modules.register(
     path = ASOC_CODECS_PATH + "/wcd939x",
     config_option = "CONFIG_SND_SOC_WCD939X_SLAVE",
     srcs = ["wcd939x-slave.c"]
-)
+)

build/pineapple.bzl

@@ -36,6 +36,8 @@ def define_pineapple():
             "lpass_cdc_tx_macro_dlkm",
             "wsa883x_dlkm",
             "wsa884x_dlkm",
+            "wcd937x_dlkm",
+            "wcd937x_slave_dlkm",
             "wcd938x_dlkm",
             "wcd938x_slave_dlkm",
             "wcd939x_dlkm",
@@ -55,4 +57,4 @@ def define_pineapple():
             "CONFIG_SND_SOC_WCD_MBHC_ADC",
             "CONFIG_MSM_EXT_DISPLAY",
         ]
-    )
+    )

config/pineappleauto.conf

@@ -26,6 +26,8 @@ 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_WCD937X=m
+export CONFIG_SND_SOC_WCD937X_SLAVE=m
 export CONFIG_SND_SOC_WCD938X=m
 export CONFIG_SND_SOC_WCD938X_SLAVE=m
 export CONFIG_SND_SOC_WCD939X=m

config/pineappleautoconf.h

@@ -1,7 +1,7 @@
 /* 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.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
@@ -33,6 +33,8 @@
 #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_WCD937X 1
+#define CONFIG_SND_SOC_WCD937X_SLAVE 1
 #define CONFIG_SND_SOC_WCD938X 1
 #define CONFIG_SND_SOC_WCD938X_SLAVE 1
 #define CONFIG_SND_SOC_WCD939X 1

module_mgr.bzl

@@ -129,4 +129,4 @@ def define_target_modules(target, variants, registry, modules, config_options =
                                    variant = variant,
                                    registry = registry,
                                    modules = modules,
-                                   config_options = config_options)
+                                   config_options = config_options)