audio: Add support for audio on msmsteppe
Update config file and make rules for msmsteppe
compilation.
Change-Id: I374a0725a7dd36edc9e04652fb07dc719310565c
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
diff --git a/Android.mk b/Android.mk
index 55bcbf1..b4278fa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,11 +24,16 @@
include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk
endif
-ifeq ($(call is-board-platform-in-list,sdm670 msmnile $(MSMSTEPPE)),true)
+ifeq ($(call is-board-platform-in-list,sdm670 msmnile),true)
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/aqt1000/Module.symvers)
include $(MY_LOCAL_PATH)/asoc/codecs/aqt1000/Android.mk
endif
+ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE)),true)
+$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)
+include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk
+endif
+
ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers)
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers)
@@ -36,7 +41,7 @@
include $(MY_LOCAL_PATH)/asoc/codecs/msm_sdw/Android.mk
endif
-ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE)),true)
+ifeq ($(call is-board-platform-in-list,msmnile),true)
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd9360/Module.symvers)
include $(MY_LOCAL_PATH)/asoc/codecs/wcd9360/Android.mk
endif
diff --git a/asoc/Kbuild b/asoc/Kbuild
index ccf2406..aa05176 100644
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -35,9 +35,9 @@
INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
+ include $(AUDIO_ROOT)/config/sm6150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf
@@ -104,6 +104,11 @@
MACHINE_OBJS += sm8150.o
endif
+# for SM6150 sound card driver
+ifdef CONFIG_SND_SOC_SM6150
+ MACHINE_OBJS += sm6150.o
+endif
+
# for qcs405 sound card driver
ifdef CONFIG_SND_SOC_QCS405
MACHINE_OBJS += qcs405.o
@@ -200,6 +205,9 @@
obj-$(CONFIG_SND_SOC_SM8150) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)
+obj-$(CONFIG_SND_SOC_SM6150) += machine_dlkm.o
+machine_dlkm-y := $(MACHINE_OBJS)
+
obj-$(CONFIG_SND_SOC_QCS405) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
index f4c9c10..662c62f 100644
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -35,9 +35,9 @@
INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
+ include $(AUDIO_ROOT)/config/sm6150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf
diff --git a/asoc/codecs/aqt1000/Kbuild b/asoc/codecs/aqt1000/Kbuild
index 2b002df..6523ce6 100644
--- a/asoc/codecs/aqt1000/Kbuild
+++ b/asoc/codecs/aqt1000/Kbuild
@@ -28,11 +28,6 @@
export
INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
- ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
- endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf
diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild
index 1287dd7..5566ecb 100644
--- a/asoc/codecs/wcd934x/Kbuild
+++ b/asoc/codecs/wcd934x/Kbuild
@@ -32,9 +32,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
+ include $(AUDIO_ROOT)/config/sm6150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf
diff --git a/asoc/codecs/wcd9360/Android.mk b/asoc/codecs/wcd9360/Android.mk
index b7566a1..bee0364 100644
--- a/asoc/codecs/wcd9360/Android.mk
+++ b/asoc/codecs/wcd9360/Android.mk
@@ -7,13 +7,9 @@
AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
-ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)
-AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
-endif
-
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE)),true)
+ifeq ($(call is-board-platform-in-list,msmnile),true)
LOCAL_PATH := $(call my-dir)
diff --git a/asoc/codecs/wcd9360/Kbuild b/asoc/codecs/wcd9360/Kbuild
index 5b87cde..6bba0c5 100644
--- a/asoc/codecs/wcd9360/Kbuild
+++ b/asoc/codecs/wcd9360/Kbuild
@@ -21,11 +21,6 @@
export
INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
- ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
- endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf
diff --git a/config/sm6150auto.conf b/config/sm6150auto.conf
new file mode 100644
index 0000000..cd06ead
--- /dev/null
+++ b/config/sm6150auto.conf
@@ -0,0 +1,44 @@
+CONFIG_PINCTRL_WCD=m
+CONFIG_PINCTRL_LPI=m
+CONFIG_AUDIO_EXT_CLK=m
+CONFIG_SND_SOC_WCD9XXX_V2=m
+CONFIG_SND_SOC_WCD_MBHC=m
+CONFIG_SND_SOC_WSA881X=m
+CONFIG_SND_SOC_WCD_DSP_MGR=m
+CONFIG_SND_SOC_WCD_SPI=m
+CONFIG_SND_SOC_WCD934X=m
+CONFIG_SND_SOC_WCD934X_MBHC=m
+CONFIG_SND_SOC_WCD934X_DSD=m
+CONFIG_WCD9XXX_CODEC_CORE=m
+CONFIG_MSM_CDC_PINCTRL=m
+CONFIG_MSM_QDSP6V2_CODECS=m
+CONFIG_MSM_ULTRASOUND=m
+CONFIG_MSM_QDSP6_APRV2_RPMSG=m
+CONFIG_MSM_ADSP_LOADER=m
+CONFIG_REGMAP_SWR=m
+CONFIG_MSM_QDSP6_SSR=m
+CONFIG_MSM_QDSP6_PDR=m
+CONFIG_MSM_QDSP6_NOTIFIER=m
+CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m
+CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
+CONFIG_SND_SOC_SM6150=m
+CONFIG_MSM_GLINK_SPI_XPRT=m
+CONFIG_WCD_DSP_GLINK=m
+CONFIG_SOUNDWIRE=m
+CONFIG_SOUNDWIRE_MSTR_CTRL=m
+CONFIG_SND_SOC_QDSP6V2=m
+CONFIG_SND_SOC_WCD_MBHC_ADC=m
+CONFIG_QTI_PP=m
+CONFIG_SND_HWDEP_ROUTING=m
+CONFIG_DTS_EAGLE=m
+CONFIG_DOLBY_DS2=m
+CONFIG_DOLBY_LICENSE=m
+CONFIG_DTS_SRS_TM=m
+CONFIG_SND_SOC_MSM_STUB=m
+CONFIG_MSM_AVTIMER=m
+CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
+CONFIG_SND_SOC_BOLERO=m
+CONFIG_WSA_MACRO=m
+CONFIG_VA_MACRO=m
+CONFIG_RX_MACRO=m
+CONFIG_TX_MACRO=m
diff --git a/config/sm6150autoconf.h b/config/sm6150autoconf.h
new file mode 100644
index 0000000..f64e863
--- /dev/null
+++ b/config/sm6150autoconf.h
@@ -0,0 +1,57 @@
+/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#define CONFIG_PINCTRL_WCD 1
+#define CONFIG_PINCTRL_LPI 1
+#define CONFIG_AUDIO_EXT_CLK 1
+#define CONFIG_SND_SOC_WCD9XXX_V2 1
+#define CONFIG_SND_SOC_WCD_MBHC 1
+#define CONFIG_SND_SOC_WSA881X 1
+#define CONFIG_SND_SOC_WCD_DSP_MGR 1
+#define CONFIG_SND_SOC_WCD_SPI 1
+#define CONFIG_SND_SOC_WCD934X 1
+#define CONFIG_SND_SOC_WCD934X_MBHC 1
+#define CONFIG_SND_SOC_WCD934X_DSD 1
+#define CONFIG_SND_SOC_WCD_CPE 1
+#define CONFIG_WCD9XXX_CODEC_CORE 1
+#define CONFIG_MSM_CDC_PINCTRL 1
+#define CONFIG_MSM_QDSP6V2_CODECS 1
+#define CONFIG_MSM_ULTRASOUND 1
+#define CONFIG_MSM_QDSP6_APRV2_RPMSG 1
+#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
+#define CONFIG_MSM_ADSP_LOADER 1
+#define CONFIG_REGMAP_SWR 1
+#define CONFIG_MSM_QDSP6_SSR 1
+#define CONFIG_MSM_QDSP6_PDR 1
+#define CONFIG_MSM_QDSP6_NOTIFIER 1
+#define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1
+#define CONFIG_SND_SOC_SM6150 1
+#define CONFIG_MSM_GLINK_SPI_XPRT 1
+#define CONFIG_WCD_DSP_GLINK 1
+#define CONFIG_SOUNDWIRE 1
+#define CONFIG_SOUNDWIRE_MSTR_CTRL 1
+#define CONFIG_SND_SOC_WCD_MBHC_ADC 1
+#define CONFIG_SND_SOC_QDSP6V2 1
+#define CONFIG_QTI_PP 1
+#define CONFIG_SND_HWDEP_ROUTING 1
+#define CONFIG_DTS_EAGLE 1
+#define CONFIG_DOLBY_DS2 1
+#define CONFIG_DOLBY_LICENSE 1
+#define CONFIG_DTS_SRS_TM 1
+#define CONFIG_SND_SOC_MSM_STUB 1
+#define CONFIG_MSM_AVTIMER 1
+#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
+#define CONFIG_SND_SOC_BOLERO 1
+#define CONFIG_WSA_MACRO 1
+#define CONFIG_VA_MACRO 1
+#define CONFIG_RX_MACRO 1
+#define CONFIG_TX_MACRO 1
diff --git a/dsp/Kbuild b/dsp/Kbuild
index 271fae4..1cad5ce 100644
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -30,9 +30,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
+ include $(AUDIO_ROOT)/config/sm6150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf
diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild
index a65ec46..7d7268b 100644
--- a/dsp/codecs/Kbuild
+++ b/dsp/codecs/Kbuild
@@ -31,9 +31,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
+ include $(AUDIO_ROOT)/config/sm6150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf
diff --git a/ipc/Kbuild b/ipc/Kbuild
index acb60a9..0c77ed8 100644
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -31,9 +31,9 @@
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
+ include $(AUDIO_ROOT)/config/sm6150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM8150), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf
diff --git a/soc/Android.mk b/soc/Android.mk
index 9ce525e..dc6a5b3 100644
--- a/soc/Android.mk
+++ b/soc/Android.mk
@@ -48,7 +48,7 @@
KBUILD_OPTIONS += $(AUDIO_SELECT)
###########################################################
-ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)
+ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605 $(MSMSTEPPE)),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_pinctrl_lpi.ko
LOCAL_MODULE_KBUILD_NAME := pinctrl_lpi_dlkm.ko
diff --git a/soc/Kbuild b/soc/Kbuild
index acee7f6..54ca077 100644
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -35,9 +35,9 @@
INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
- include $(AUDIO_ROOT)/config/sm8150auto.conf
+ include $(AUDIO_ROOT)/config/sm6150auto.conf
export
- INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
+ INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
include $(AUDIO_ROOT)/config/sm8150auto.conf