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

Commit d93e6dde authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio-kernel: update chipset name"

parents 1b710779 60c105d5

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf 
export

endif

ifeq ($(CONFIG_ARCH_SM8150), y)

include $(srctree)/techpack/audio/config/sdm855auto.conf

include $(srctree)/techpack/audio/config/sm8150auto.conf

export

endif

ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

include $(srctree)/techpack/audio/config/sdm855auto.conf

include $(srctree)/techpack/audio/config/sm8150auto.conf

export

endif
@@ -44,11 +44,11 @@ LINUXINCLUDE += \ 
endif

ifeq ($(CONFIG_ARCH_SM8150), y)

LINUXINCLUDE    += \

                -include $(srctree)/techpack/audio/config/sdm855autoconf.h

                -include $(srctree)/techpack/audio/config/sm8150autoconf.h

endif

ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

LINUXINCLUDE    += \

                -include $(srctree)/techpack/audio/config/sdm855autoconf.h

                -include $(srctree)/techpack/audio/config/sm8150autoconf.h

endif



obj-y += asoc/

asoc/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ endif 


ifeq ($(call is-board-platform,msmnile),true)

TARGET := msmnile

AUDIO_SELECT  := CONFIG_SND_SOC_SDM855=m

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m

endif



AUDIO_CHIPSET := audio

asoc/Kbuild

+8 −8
Original line number Diff line number Diff line
@@ -31,14 +31,14 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SM8150), y)

		include $(AUDIO_ROOT)/config/sdm855auto.conf

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export

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

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

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sdm855auto.conf

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export

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

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

	endif

endif
@@ -90,9 +90,9 @@ ifdef CONFIG_SND_SOC_MACHINE_SDM845 
	MACHINE_OBJS += sdm845.o

endif



# for SDM855 sound card driver

ifdef CONFIG_SND_SOC_SDM855

	MACHINE_OBJS += sdm855.o

# for SM8150 sound card driver

ifdef CONFIG_SND_SOC_SM8150

	MACHINE_OBJS += sm8150.o

endif



ifdef CONFIG_SND_SOC_CPE
@@ -183,7 +183,7 @@ platform_dlkm-y := $(PLATFORM_OBJS) 
obj-$(CONFIG_SND_SOC_MACHINE_SDM845) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_SDM855) += machine_dlkm.o

obj-$(CONFIG_SND_SOC_SM8150) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_EXT_CODEC) += machine_dlkm.o

asoc/codecs/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m 
endif



ifeq ($(call is-board-platform,msmnile),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SDM855=m

AUDIO_SELECT  := CONFIG_SND_SOC_SM8150=m

endif



AUDIO_CHIPSET := audio

asoc/codecs/Kbuild

+4 −4
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SM8150), y)

		include $(AUDIO_ROOT)/config/sdm855auto.conf

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export

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

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

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sdm855auto.conf

		include $(AUDIO_ROOT)/config/sm8150auto.conf

		export

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

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

	endif

endif