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/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