samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "audio-driver: Update build files for sa6155"

Browse Source
This commit is contained in:
qctecmdr
2019-07-29 02:50:05 -07:00
committed by Gerrit - the friendly Code Review server
parent d6329e47b8 f53de7f9fb
commit 237662b0a1
15 changed files with 126 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@@ -22,9 +22,11 @@ include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk
endif
ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers)
include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers)
include $(MY_LOCAL_PATH)/soc/Android.mk
endif
endif
@@ -40,11 +42,13 @@ endif
endif
ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true)
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))
$(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
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd937x/Module.symvers)
include $(MY_LOCAL_PATH)/asoc/codecs/wcd937x/Android.mk
endif
endif
ifeq ($(call is-board-platform-in-list, kona lito bengal),true)
$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)

4
asoc/Android.mk
View File

@@ -14,8 +14,12 @@ endif
ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)
TARGET := talos
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))
AUDIO_SELECT := CONFIG_SND_SOC_SA6155=m
else
AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
endif
endif
ifeq ($(call is-board-platform,$(TRINKET)),true)
TARGET := trinket

21
asoc/Kbuild
View File

@@ -26,9 +26,15 @@ ifeq ($(KERNEL_BUILD), 0)
endif
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
include $(AUDIO_ROOT)/config/sm6150auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
ifdef CONFIG_SND_SOC_SA6155
include $(AUDIO_ROOT)/config/sa6155auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h
else
include $(AUDIO_ROOT)/config/sm6150auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
endif
ifeq ($(CONFIG_ARCH_TRINKET), y)
include $(AUDIO_ROOT)/config/sm6150auto.conf
@@ -96,10 +102,14 @@ endif
# for SM6150 sound card driver
ifdef CONFIG_SND_SOC_SM6150
MACHINE_OBJS += sm6150.o
MACHINE_OBJS += sa6155.o
MACHINE_OBJS += machine_615x_init.o
endif
# For sa6155 sound card driver
ifdef CONFIG_SND_SOC_SA6155
MACHINE_OBJS += sa6155.o
endif
# for qcs405 sound card driver
ifdef CONFIG_SND_SOC_QCS405
MACHINE_OBJS += qcs405.o
@@ -211,6 +221,9 @@ machine_dlkm-y := $(MACHINE_OBJS)
obj-$(CONFIG_SND_SOC_SM6150) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)
obj-$(CONFIG_SND_SOC_SA6155) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)
obj-$(CONFIG_SND_SOC_QCS405) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)

14
asoc/codecs/Android.mk
View File

@@ -12,8 +12,12 @@ endif
endif
ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))
AUDIO_SELECT := CONFIG_SND_SOC_SA6155=m
else
AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
endif
endif
ifeq ($(call is-board-platform,$(TRINKET)),true)
AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
@@ -54,9 +58,9 @@ KBUILD_OPTIONS := AUDIO_ROOT=$(AUDIO_BLD_DIR)
KBUILD_OPTIONS += MODNAME=wcd_core_dlkm
KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
KBUILD_OPTIONS += $(AUDIO_SELECT)
# Target specific build
###########################################################
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd_core.ko
LOCAL_MODULE_KBUILD_NAME := wcd_core_dlkm.ko
@@ -118,8 +122,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
endif
############################################################
endif # target specific build
###########################################################
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_stub.ko
LOCAL_MODULE_KBUILD_NAME := stub_dlkm.ko
@@ -127,7 +131,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
##########################################################
###########################################################
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_hdmi.ko
LOCAL_MODULE_KBUILD_NAME := hdmi_dlkm.ko

12
asoc/codecs/Kbuild
View File

@@ -26,9 +26,15 @@ ifeq ($(KERNEL_BUILD), 0)
endif
endif
ifeq ($(CONFIG_ARCH_SM6150), y)
include $(AUDIO_ROOT)/config/sm6150auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
ifdef CONFIG_SND_SOC_SA6155
include $(AUDIO_ROOT)/config/sa6155auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h
else
include $(AUDIO_ROOT)/config/sm6150auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
endif
ifeq ($(CONFIG_ARCH_TRINKET), y)
include $(AUDIO_ROOT)/config/sm6150auto.conf

2
asoc/machine_615x_init.c
View File

@@ -19,14 +19,12 @@
static int __init audio_machine_615x_init(void)
{
sm6150_init();
sa6155_init();
return 0;
}
static void audio_machine_615x_exit(void)
{
sm6150_exit();
sa6155_exit();
}
module_init(audio_machine_615x_init);

2
asoc/machine_615x_init.h
View File

@@ -15,9 +15,7 @@
#ifndef __MACHINE_615X_INIT_H__
#define __MACHINE_615X_INIT_H__
int sm6150_init(void);
int sa6155_init(void);
void sm6150_exit(void);
void sa6155_exit(void);
#endif

3
asoc/sa6155.c
View File

@@ -7156,6 +7156,9 @@ void sa6155_exit(void)
audio_notifier_deregister("sa6155");
}
module_init(sa6155_init);
module_exit(sa6155_exit);
MODULE_DESCRIPTION("ALSA SoC msm");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:" DRV_NAME);

16
config/sa6155auto.conf Normal file
View File

@@ -0,0 +1,16 @@
CONFIG_MSM_QDSP6_APRV2_RPMSG=m
CONFIG_MSM_QDSP6_SSR=m
CONFIG_MSM_ADSP_LOADER=m
CONFIG_MSM_QDSP6_NOTIFIER=m
CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
CONFIG_QTI_PP=m
CONFIG_SND_HWDEP_ROUTING=m
CONFIG_DTS_EAGLE=m
CONFIG_DOLBY_DS2=m
CONFIG_DOLBY_LICENSE=m
CONFIG_SND_SOC_MSM_STUB=m
CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
CONFIG_MSM_QDSP6V2_CODECS=m
CONFIG_SND_SOC_QDSP6V2=m
CONFIG_SND_SOC_SA6155=m
CONFIG_SOUNDWIRE_MSTR_CTRL=m

28
config/sa6155autoconf.h Normal file
View File

@@ -0,0 +1,28 @@
/* Copyright (c) 2018-2019, 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_MSM_QDSP6_APRV2_RPMSG 1
#define CONFIG_MSM_QDSP6_SSR 1
#define CONFIG_MSM_ADSP_LOADER 1
#define CONFIG_MSM_QDSP6_NOTIFIER 1
#define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 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_SND_SOC_MSM_STUB 1
#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
#define CONFIG_MSM_QDSP6V2_CODECS 1
#define CONFIG_SND_SOC_QDSP6V2 1
#define CONFIG_SND_SOC_SA6155 1
#define CONFIG_SOUNDWIRE_MSTR_CTRL 1

17
dsp/Android.mk
View File

@@ -11,9 +11,13 @@ AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
endif
ifeq ($(call is-board-platform,$(MSMSTEPPE) $(TRINKET)),true)
ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true)
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))
AUDIO_SELECT := CONFIG_SND_SOC_SA6155=m
else
AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
endif
endif
ifeq ($(call is-board-platform, kona),true)
AUDIO_SELECT := CONFIG_SND_SOC_KONA=m
@@ -75,8 +79,9 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
############################################################
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))
###########################################################
# target specific build
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_usf.ko
LOCAL_MODULE_KBUILD_NAME := usf_dlkm.ko
@@ -84,7 +89,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
##########################################################
###########################################################
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_q6_pdr.ko
LOCAL_MODULE_KBUILD_NAME := q6_pdr_dlkm.ko
@@ -92,9 +97,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
endif
###########################################################
###########################################################
endif # target specific build
endif # DLKM check
endif # supported target check

12
dsp/Kbuild
View File

@@ -15,9 +15,15 @@ endif
ifeq ($(KERNEL_BUILD), 0)
ifeq ($(CONFIG_ARCH_SM6150), y)
include $(AUDIO_ROOT)/config/sm6150auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
ifdef CONFIG_SND_SOC_SA6155
include $(AUDIO_ROOT)/config/sa6155auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h
else
include $(AUDIO_ROOT)/config/sm6150auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
endif
ifeq ($(CONFIG_ARCH_TRINKET), y)
include $(AUDIO_ROOT)/config/sm6150auto.conf

8
ipc/Android.mk
View File

@@ -11,9 +11,13 @@ AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
endif
ifeq ($(call is-board-platform,$(MSMSTEPPE) $(TRINKET)),true)
ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true)
ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))
AUDIO_SELECT := CONFIG_SND_SOC_SA6155=m
else
AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
endif
endif
ifeq ($(call is-board-platform,kona),true)
AUDIO_SELECT := CONFIG_SND_SOC_KONA=m
@@ -61,7 +65,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/AndroidKernelModule.mk
###########################################################
ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))
ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_wglink.ko
LOCAL_MODULE_KBUILD_NAME := wglink_dlkm.ko

12
ipc/Kbuild
View File

@@ -16,9 +16,15 @@ endif
ifeq ($(KERNEL_BUILD), 0)
ifeq ($(CONFIG_ARCH_SM6150), y)
include $(AUDIO_ROOT)/config/sm6150auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
ifdef CONFIG_SND_SOC_SA6155
include $(AUDIO_ROOT)/config/sa6155auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h
else
include $(AUDIO_ROOT)/config/sm6150auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h
endif
endif
ifeq ($(CONFIG_ARCH_TRINKET), y)
include $(AUDIO_ROOT)/config/sm6150auto.conf

2
soc/Android.mk
View File

@@ -7,7 +7,7 @@ ifeq ($(call is-board-platform,msmnile),true)
AUDIO_SELECT := CONFIG_SND_SOC_SM8150=m
endif
ifeq ($(call is-board-platform,$(MSMSTEPPE) $(TRINKET)),true)
ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true)
AUDIO_SELECT := CONFIG_SND_SOC_SM6150=m
endif