From cc0a22d9d161a1f0395b86d15c733588af4dd3f2 Mon Sep 17 00:00:00 2001 From: Sudheer Papothi Date: Fri, 2 Mar 2018 06:29:57 +0530 Subject: [PATCH 1/2] ASoC: wcd934x: Add support for WCD934x on msmnile target Add support for WCD934x codec on msmnile target for audio playback and capture usecases. Change-Id: Ia91fd532fcb3a127941f8dc7ba42aecea17a5ec2 Signed-off-by: Sudheer Papothi --- asoc/codecs/wcd934x/Android.mk | 6 +++++- asoc/codecs/wcd934x/Kbuild | 5 +++++ asoc/codecs/wcd934x/wcd934x-dsp-cntl.h | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/asoc/codecs/wcd934x/Android.mk b/asoc/codecs/wcd934x/Android.mk index 0fe519ffded7..200f6c36a6ab 100644 --- a/asoc/codecs/wcd934x/Android.mk +++ b/asoc/codecs/wcd934x/Android.mk @@ -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) diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild index 7ea91ce677e1..60b24853e37f 100644 --- a/asoc/codecs/wcd934x/Kbuild +++ b/asoc/codecs/wcd934x/Kbuild @@ -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: diff --git a/asoc/codecs/wcd934x/wcd934x-dsp-cntl.h b/asoc/codecs/wcd934x/wcd934x-dsp-cntl.h index 2f71d0e18edb..0127a0df2dba 100644 --- a/asoc/codecs/wcd934x/wcd934x-dsp-cntl.h +++ b/asoc/codecs/wcd934x/wcd934x-dsp-cntl.h @@ -1,5 +1,5 @@ /* - * 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 #include #include From 9851706e7956428d2dc76a93aa7f3bb7ed936e1b Mon Sep 17 00:00:00 2001 From: Sudheer Papothi Date: Fri, 2 Mar 2018 06:32:16 +0530 Subject: [PATCH 2/2] ASoC: config: Enable configuration for WCD934x codec Enable configuration for WCD934x codec for msmnile target. Change-Id: I88bdc85b8f654c5658b84a4732b0a67ca1fcad1b Signed-off-by: Sudheer Papothi --- config/sdm855auto.conf | 3 +++ config/sdm855autoconf.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config/sdm855auto.conf b/config/sdm855auto.conf index 2ebdce0379a4..fe02f7212854 100644 --- a/config/sdm855auto.conf +++ b/config/sdm855auto.conf @@ -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 diff --git a/config/sdm855autoconf.h b/config/sdm855autoconf.h index 651b04a49a04..94a6dc557756 100644 --- a/config/sdm855autoconf.h +++ b/config/sdm855autoconf.h @@ -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