ASoC: Add support for audio drivers compilation on kernel-4.14

Add support for audio drivers compilation on kernel-4.14.

Change-Id: Id7689cef4ae7cdb6711fed386d2a6b0d427b3fc3
Signed-off-by: Sudheer Papothi <[email protected]>

Makefile

@@ -51,7 +51,7 @@ LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/sm8150autoconf.h
 endif
 
-obj-y += asoc/
+obj-y += soc/
 obj-y += dsp/
 obj-y += ipc/
-obj-y += soc/
+obj-y += asoc/

asoc/Kbuild

@@ -6,11 +6,10 @@ else
 	KERNEL_BUILD := 0
 endif
 
-
 ifeq ($(KERNEL_BUILD), 1)
 	# These are configurable via Kconfig for kernel-based builds
 	# Need to explicitly configure for Android-based builds
-	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9
+	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14
 	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
 endif
 

asoc/codecs/Kbuild

@@ -9,7 +9,7 @@ endif
 ifeq ($(KERNEL_BUILD), 1)
 	# These are configurable via Kconfig for kernel-based builds
 	# Need to explicitly configure for Android-based builds
-	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9
+	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14
 	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
 endif
 

dsp/Kbuild

@@ -9,7 +9,7 @@ endif
 ifeq ($(KERNEL_BUILD), 1)
 	# These are configurable via Kconfig for kernel-based builds
 	# Need to explicitly configure for Android-based builds
-	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9
+	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14
 	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
 endif
 
@@ -111,14 +111,14 @@ ifdef CONFIG_MSM_ADSP_LOADER
 ADSP_LOADER_OBJS += adsp-loader.o
 endif
 
-ifdef CONFIG_MSM_QDSP6_NOTIFIER
-QDSP6_NOTIFIER_OBJS += audio_notifier.o audio_ssr.o
-endif
-
 ifdef CONFIG_MSM_QDSP6_PDR
 QDSP6_PDR_OBJS += audio_pdr.o
 endif
 
+ifdef CONFIG_MSM_QDSP6_NOTIFIER
+QDSP6_NOTIFIER_OBJS += audio_notifier.o audio_ssr.o
+endif
+
 ifdef CONFIG_MSM_ULTRASOUND
 USF_OBJS += usf.o usfcdev.o q6usm.o
 endif
@@ -184,11 +184,11 @@ usf_dlkm-y := $(USF_OBJS)
 obj-$(CONFIG_MSM_ADSP_LOADER) += adsp_loader_dlkm.o
 adsp_loader_dlkm-y := $(ADSP_LOADER_OBJS)
 
-obj-$(CONFIG_MSM_QDSP6_NOTIFIER) += q6_notifier_dlkm.o
-q6_notifier_dlkm-y := $(QDSP6_NOTIFIER_OBJS)
-
 obj-$(CONFIG_MSM_QDSP6_PDR) += q6_pdr_dlkm.o
 q6_pdr_dlkm-y := $(QDSP6_PDR_OBJS)
 
+obj-$(CONFIG_MSM_QDSP6_NOTIFIER) += q6_notifier_dlkm.o
+q6_notifier_dlkm-y := $(QDSP6_NOTIFIER_OBJS)
+
 # inject some build related information
 DEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"

dsp/codecs/Kbuild

@@ -9,7 +9,7 @@ endif
 ifeq ($(KERNEL_BUILD), 1)
 	# These are configurable via Kconfig for kernel-based builds
 	# Need to explicitly configure for Android-based builds
-	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9
+	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14
 	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
 endif
 

ipc/Kbuild

@@ -6,32 +6,9 @@ else
 	KERNEL_BUILD := 0
 endif
 
-TARGET_KERNEL_VERSION := 4.9
-
 # These are configurable via Kconfig for kernel-based builds
 # Need to explicitly configure for Android-based builds
-ifeq ($(CONFIG_ARCH_SDM845), y)
-	TARGET_KERNEL_VERSION := 4.9
-endif
-ifeq ($(CONFIG_ARCH_SDM670), y)
-	TARGET_KERNEL_VERSION := 4.9
-endif
-ifeq ($(CONFIG_ARCH_SM8150), y)
-	TARGET_KERNEL_VERSION := 4.14
-endif
-ifeq ($(CONFIG_ARCH_SM6150), y)
-        TARGET_KERNEL_VERSION := 4.14
-endif
-
-ifeq ($(CONFIG_ARCH_QCS405), y)
-        TARGET_KERNEL_VERSION := 4.14
-endif
-
-ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-	TARGET_KERNEL_VERSION := 4.14
-endif
-
-KDIR := $(TOP)/kernel/msm-$(TARGET_KERNEL_VERSION)
+KDIR := $(TOP)/kernel/msm-4.14
 
 ifeq ($(KERNEL_BUILD), 1)
 	AUDIO_ROOT := $(KDIR)/techpack/audio

soc/Kbuild

@@ -9,7 +9,7 @@ endif
 ifeq ($(KERNEL_BUILD), 1)
 	# These are configurable via Kconfig for kernel-based builds
 	# Need to explicitly configure for Android-based builds
-	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9
+	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14
 	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
 endif