Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46de70fe authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: add gvm config file for auto sa8295 platform"

parents 31f4eab8 5922d64b

Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/wcd937x/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295))

KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y

obj-m := ipc/

obj-m += dsp/
@@ -49,6 +49,9 @@ endif 
ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm))

KBUILD_OPTIONS += CONFIG_SND_SOC_GVM=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm8295))

KBUILD_OPTIONS += CONFIG_SND_SOC_GVM_SA8295=m

endif

endif



all:

asoc/Kbuild

+13 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

	ifdef CONFIG_SND_SOC_GVM_SA8295

		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sa8295gvmautoconf.h

	endif

else

	ifeq ($(KERNEL_BUILD), 0)

		ifeq ($(CONFIG_ARCH_SM8150), y)
@@ -177,6 +182,11 @@ ifdef CONFIG_SND_SOC_SA8155 
	MACHINE_OBJS += sa8155.o

endif



# for sa8295 sound card driver

ifdef CONFIG_SND_SOC_SA8295

	MACHINE_OBJS += sa8295.o

endif



ifdef CONFIG_SND_SOC_CPE

	CPE_LSM_OBJS += msm-cpe-lsm.o

endif
@@ -296,6 +306,9 @@ machine_dlkm-y := $(MACHINE_OBJS) 
obj-$(CONFIG_SND_SOC_SA8155) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_SA8295) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_CPE) += cpe_lsm_dlkm.o

cpe_lsm_dlkm-y := $(CPE_LSM_OBJS)

asoc/codecs/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

	ifdef CONFIG_SND_SOC_GVM_SA8295

		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/sa8295gvmautoconf.h

	endif

else

	ifeq ($(KERNEL_BUILD), 0)

		ifeq ($(CONFIG_ARCH_SM8150), y)

config/sa8295gvmauto.conf

0 → 100644
+16 −0
Original line number Diff line number Diff line 
export CONFIG_MSM_QDSP6_APRV2_VM=m

export CONFIG_MSM_QDSP6_SSR=m

export CONFIG_MSM_ADSP_LOADER=m

export CONFIG_MSM_QDSP6_NOTIFIER=m

export CONFIG_SND_SOC_MSM_QDSP6V2_VM=m

export CONFIG_SND_SOC_QDSP6V2=m

export CONFIG_QTI_PP=m

export CONFIG_SND_HWDEP_ROUTING=m

export CONFIG_DTS_EAGLE=m

export CONFIG_DOLBY_DS2=m

export CONFIG_DOLBY_LICENSE=m

export CONFIG_SND_SOC_MSM_STUB=m

export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m

export CONFIG_MSM_QDSP6V2_CODECS=m

export CONFIG_SND_EVENT=m

export CONFIG_SND_SOC_SA8295=m

config/sa8295gvmautoconf.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2021, 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_VM 1

#define CONFIG_MSM_ADSP_LOADER 1

#define CONFIG_MSM_QDSP6_SSR 1

#define CONFIG_MSM_QDSP6_NOTIFIER 1

#define CONFIG_SND_SOC_MSM_QDSP6V2_VM 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_SND_SOC_MSM_STUB 1

#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1

#define CONFIG_MSM_QDSP6V2_CODECS 1

#define CONFIG_SND_EVENT 1

#define CONFIG_SND_SOC_SA8295 1