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

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

Merge "ASoC: config: Enable configuration for WCD934x codec"

parents cc3ff178 9851706e

asoc/codecs/wcd934x/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -7,13 +7,17 @@ ifeq ($(call is-board-platform,sdm845),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM845=m

endif



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

AUDIO_SELECT  := CONFIG_SND_SOC_SDM855=m

endif



ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif



AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605 msmnile),true)



LOCAL_PATH := $(call my-dir)

asoc/codecs/wcd934x/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

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

	endif

	ifeq ($(CONFIG_ARCH_SDM855), y)

		include $(AUDIO_ROOT)/config/sdm855auto.conf

		export

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

	endif

endif



# As per target team, build is done as follows:

asoc/codecs/wcd934x/wcd934x-dsp-cntl.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2018, 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
@@ -14,6 +14,7 @@ 
#ifndef __WCD934X_DSP_CNTL_H__

#define __WCD934X_DSP_CNTL_H__



#include <linux/miscdevice.h>

#include <sound/soc.h>

#include <sound/wcd-dsp-mgr.h>

config/sdm855auto.conf

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ CONFIG_SND_SOC_WSA881X=m 
CONFIG_SND_SOC_WCD9360=m

CONFIG_SND_SOC_WCD_DSP_MGR=m

CONFIG_SND_SOC_WCD_SPI=m

CONFIG_SND_SOC_WCD934X=m

CONFIG_SND_SOC_WCD934X_MBHC=m

CONFIG_SND_SOC_WCD934X_DSD=m

CONFIG_SND_SOC_WCD_CPE=m

CONFIG_SOUNDWIRE_WCD_CTRL=m

CONFIG_WCD9XXX_CODEC_CORE=m

config/sdm855autoconf.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#define CONFIG_SND_SOC_WCD9360 1

#define CONFIG_SND_SOC_WCD_DSP_MGR 1

#define CONFIG_SND_SOC_WCD_SPI 1

#define CONFIG_SND_SOC_WCD934X 1

#define CONFIG_SND_SOC_WCD934X_MBHC 1

#define CONFIG_SND_SOC_WCD934X_DSD 1

#define CONFIG_SND_SOC_WCD_CPE 1

#define CONFIG_WCD9XXX_CODEC_CORE 1

#define CONFIG_MSM_CDC_PINCTRL 1