August 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v5 0/8] Enable HDA Codec support on Intel Platforms
by Pierre-Louis Bossart 01 Aug '18

01 Aug '18

Many Intel platforms (SKL, KBL) etc. in the market supports enhanced audio capabilities which also includes DSP processing. The default HDaudio legacy driver does not allow for the use of the DSP, this patch set makes it possible while reusing existing code for HDAudio codecs and without significant changes to the legacy driver. This v5 is based on Takashi's topic/drm_audio_component merged on top on Marks' for-next branch - the merge is not included here. Tests were run successfully on multiple platforms (Dell XPS13, KBL NUC, APL NUC and LeafHill reference board). Both the HDaudio and HDMI outputs were tested. Credits: all the initial code was written by Rakesh Ughreja, the rebase to broonie/for-next, cleanups and additional tests were done by Pierre Bossart. TODO in future update: fix the HDMI jack detection which only works after the mixer values are set, which isn't practical for headless devices always connected (this is a problem in the hdac_hdmi codec that was present before this series was submitted) Changes v5 (comments from Vinod) - fix SPDIF style across patches - patch 1: update commit message to remove reference to "fix" - patch 3: remove platform name assignment and Xmas tree style - patch 7: simplify error handling, add missing _put() on errors, remove tests on ops, add switch statement, fix alignment - patch 8: fix indentation issues, use bool instead of tristate Changes v4: - rebase/update on Takashi's topic/drm_audio_component branch - changes in the HDaudio detection to avoid adding a fake ACPI ID - new Kconfigs to control HDaudio detection Changes v3: - port to component model - additional tests on ApolloLake and KabyLake NUC devices - cleanups (alignment, typos, etc) Changes v2: - Resolved review comments and rebased to latest kernel. - added module load support for codec drivers. Pierre-Louis Bossart (2): ASoC: Intel: common: add table for HDA-based platforms ASoC: Intel: Skylake: add option to control HDAudio + DSP usage Rakesh Ughreja (6): ASoC: Intel: Skylake: extend widget handling ASoC: Intel: Boards: Machine driver for SKL+ w/ HDAudio codecs ASoC: Intel: Skylake: use HDAudio if ACPI enumeration fails ASoC: Intel: Skylake: add HDA BE DAIs ASoC: Intel: Skylake: use hda_bus instead of hdac_bus ASoC: hdac_hda: add asoc extension for legacy HDA codec drivers include/sound/soc-acpi-intel-match.h | 6 + sound/pci/hda/hda_bind.c | 12 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdac_hda.c | 487 ++++++++++++++++++++++ sound/soc/codecs/hdac_hda.h | 24 ++ sound/soc/intel/Kconfig | 19 + sound/soc/intel/boards/Kconfig | 9 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_hda_dsp_common.c | 130 ++++++ sound/soc/intel/boards/skl_hda_dsp_common.h | 37 ++ sound/soc/intel/boards/skl_hda_dsp_generic.c | 176 ++++++++ sound/soc/intel/common/Makefile | 3 +- sound/soc/intel/common/soc-acpi-intel-hda-match.c | 40 ++ sound/soc/intel/skylake/skl-pcm.c | 70 +++- sound/soc/intel/skylake/skl-topology.c | 3 + sound/soc/intel/skylake/skl.c | 100 ++++- sound/soc/intel/skylake/skl.h | 12 +- 18 files changed, 1111 insertions(+), 26 deletions(-) create mode 100644 sound/soc/codecs/hdac_hda.c create mode 100644 sound/soc/codecs/hdac_hda.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.c create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_generic.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-hda-match.c -- 2.14.1

3 14

[alsa-devel] Applied "ASoC: wcd9335: Fix build due to CLASS-H Controller support" to the asoc tree
by Mark Brown 01 Aug '18

01 Aug '18

The patch ASoC: wcd9335: Fix build due to CLASS-H Controller support has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From b0a39d356ae1478a5876bb02ba08af155a3a5554 Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Wed, 1 Aug 2018 14:18:50 +0100 Subject: [PATCH] ASoC: wcd9335: Fix build due to CLASS-H Controller support This reverts commit c8cb5f775c8dac (ASoC: vert "ASoC: wcd9335: add CLASS-H Controller support) due to missing dependencies. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/Makefile | 2 +- sound/soc/codecs/wcd-clsh.c | 605 ------------------------------------ sound/soc/codecs/wcd-clsh.h | 49 --- sound/soc/codecs/wcd9335.c | 10 - 4 files changed, 1 insertion(+), 665 deletions(-) delete mode 100644 sound/soc/codecs/wcd-clsh.c delete mode 100644 sound/soc/codecs/wcd-clsh.h diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index e3a3d4694e15..01410b63daac 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -192,7 +192,7 @@ snd-soc-twl4030-objs := twl4030.o snd-soc-twl6040-objs := twl6040.o snd-soc-uda134x-objs := uda134x.o snd-soc-uda1380-objs := uda1380.o -snd-soc-wcd9335-objs := wcd-clsh.o wcd9335.o +snd-soc-wcd9335-objs := wcd9335.o snd-soc-wl1273-objs := wl1273.o snd-soc-wm-adsp-objs := wm_adsp.o snd-soc-wm0010-objs := wm0010.o diff --git a/sound/soc/codecs/wcd-clsh.c b/sound/soc/codecs/wcd-clsh.c deleted file mode 100644 index 2393456cbd97..000000000000 --- a/sound/soc/codecs/wcd-clsh.c +++ /dev/null @@ -1,605 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. -// Copyright (c) 2017-2018, Linaro Limited - -#include <linux/slab.h> -#include <sound/soc.h> -#include <linux/kernel.h> -#include <linux/delay.h> -#include <linux/mfd/wcd9335/wcd9335.h> -#include <linux/mfd/wcd9335/registers.h> -#include "wcd-clsh.h" - -struct wcd_clsh_ctrl { - int state; - int mode; - int flyback_users; - int buck_users; - int clsh_users; - int codec_version; - struct snd_soc_component *comp; -}; - -/* Class-H registers for codecs from and above WCD9335 */ -#define WCD9XXX_A_CDC_RX0_RX_PATH_CFG0 WCD9335_REG(0xB, 0x42) -#define WCD9XXX_A_CDC_RX_PATH_CLSH_EN_MASK BIT(6) -#define WCD9XXX_A_CDC_RX_PATH_CLSH_ENABLE BIT(6) -#define WCD9XXX_A_CDC_RX_PATH_CLSH_DISABLE 0 -#define WCD9XXX_A_CDC_RX1_RX_PATH_CFG0 WCD9335_REG(0xB, 0x56) -#define WCD9XXX_A_CDC_RX2_RX_PATH_CFG0 WCD9335_REG(0xB, 0x6A) -#define WCD9XXX_A_CDC_CLSH_K1_MSB WCD9335_REG(0xC, 0x08) -#define WCD9XXX_A_CDC_CLSH_K1_MSB_COEF_MASK GENMASK(3, 0) -#define WCD9XXX_A_CDC_CLSH_K1_LSB WCD9335_REG(0xC, 0x09) -#define WCD9XXX_A_CDC_CLSH_K1_LSB_COEF_MASK GENMASK(7, 0) -#define WCD9XXX_A_ANA_RX_SUPPLIES WCD9335_REG(0x6, 0x08) -#define WCD9XXX_A_ANA_RX_REGULATOR_MODE_MASK BIT(1) -#define WCD9XXX_A_ANA_RX_REGULATOR_MODE_CLS_H 0 -#define WCD9XXX_A_ANA_RX_REGULATOR_MODE_CLS_AB BIT(1) -#define WCD9XXX_A_ANA_RX_VNEG_PWR_LVL_MASK BIT(2) -#define WCD9XXX_A_ANA_RX_VNEG_PWR_LVL_UHQA BIT(2) -#define WCD9XXX_A_ANA_RX_VNEG_PWR_LVL_DEFAULT 0 -#define WCD9XXX_A_ANA_RX_VPOS_PWR_LVL_MASK BIT(3) -#define WCD9XXX_A_ANA_RX_VPOS_PWR_LVL_UHQA BIT(3) -#define WCD9XXX_A_ANA_RX_VPOS_PWR_LVL_DEFAULT 0 -#define WCD9XXX_A_ANA_RX_VNEG_EN_MASK BIT(6) -#define WCD9XXX_A_ANA_RX_VNEG_EN_SHIFT 6 -#define WCD9XXX_A_ANA_RX_VNEG_ENABLE BIT(6) -#define WCD9XXX_A_ANA_RX_VNEG_DISABLE 0 -#define WCD9XXX_A_ANA_RX_VPOS_EN_MASK BIT(7) -#define WCD9XXX_A_ANA_RX_VPOS_EN_SHIFT 7 -#define WCD9XXX_A_ANA_RX_VPOS_ENABLE BIT(7) -#define WCD9XXX_A_ANA_RX_VPOS_DISABLE 0 -#define WCD9XXX_A_ANA_HPH WCD9335_REG(0x6, 0x09) -#define WCD9XXX_A_ANA_HPH_PWR_LEVEL_MASK GENMASK(3, 2) -#define WCD9XXX_A_ANA_HPH_PWR_LEVEL_UHQA 0x08 -#define WCD9XXX_A_ANA_HPH_PWR_LEVEL_LP 0x04 -#define WCD9XXX_A_ANA_HPH_PWR_LEVEL_NORMAL 0x0 -#define WCD9XXX_A_CDC_CLSH_CRC WCD9335_REG(0xC, 0x01) -#define WCD9XXX_A_CDC_CLSH_CRC_CLK_EN_MASK BIT(0) -#define WCD9XXX_A_CDC_CLSH_CRC_CLK_ENABLE BIT(0) -#define WCD9XXX_A_CDC_CLSH_CRC_CLK_DISABLE 0 -#define WCD9XXX_FLYBACK_EN WCD9335_REG(0x6, 0xA4) -#define WCD9XXX_FLYBACK_EN_DELAY_SEL_MASK GENMASK(6, 5) -#define WCD9XXX_FLYBACK_EN_DELAY_26P25_US 0x40 -#define WCD9XXX_FLYBACK_EN_RESET_BY_EXT_MASK BIT(4) -#define WCD9XXX_FLYBACK_EN_PWDN_WITHOUT_DELAY BIT(4) -#define WCD9XXX_FLYBACK_EN_PWDN_WITH_DELAY 0 -#define WCD9XXX_RX_BIAS_FLYB_BUFF WCD9335_REG(0x6, 0xC7) -#define WCD9XXX_RX_BIAS_FLYB_VNEG_5_UA_MASK GENMASK(7, 4) -#define WCD9XXX_RX_BIAS_FLYB_VPOS_5_UA_MASK GENMASK(0, 3) -#define WCD9XXX_HPH_L_EN WCD9335_REG(0x6, 0xD3) -#define WCD9XXX_HPH_CONST_SEL_L_MASK GENMASK(7, 3) -#define WCD9XXX_HPH_CONST_SEL_BYPASS 0 -#define WCD9XXX_HPH_CONST_SEL_LP_PATH 0x40 -#define WCD9XXX_HPH_CONST_SEL_HQ_PATH 0x80 -#define WCD9XXX_HPH_R_EN WCD9335_REG(0x6, 0xD6) -#define WCD9XXX_HPH_REFBUFF_UHQA_CTL WCD9335_REG(0x6, 0xDD) -#define WCD9XXX_HPH_REFBUFF_UHQA_GAIN_MASK GENMASK(2, 0) -#define WCD9XXX_CLASSH_CTRL_VCL_2 WCD9335_REG(0x6, 0x9B) -#define WCD9XXX_CLASSH_CTRL_VCL_2_VREF_FILT_1_MASK GENMASK(5, 4) -#define WCD9XXX_CLASSH_CTRL_VCL_VREF_FILT_R_50KOHM 0x20 -#define WCD9XXX_CLASSH_CTRL_VCL_VREF_FILT_R_0KOHM 0x0 -#define WCD9XXX_CDC_RX1_RX_PATH_CTL WCD9335_REG(0xB, 0x55) -#define WCD9XXX_CDC_RX2_RX_PATH_CTL WCD9335_REG(0xB, 0x69) -#define WCD9XXX_CDC_CLK_RST_CTRL_MCLK_CONTROL WCD9335_REG(0xD, 0x41) -#define WCD9XXX_CDC_CLK_RST_CTRL_MCLK_EN_MASK BIT(0) -#define WCD9XXX_CDC_CLK_RST_CTRL_MCLK_11P3_EN_MASK BIT(1) -#define WCD9XXX_CLASSH_CTRL_CCL_1 WCD9335_REG(0x6, 0x9C) -#define WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_MASK GENMASK(7, 4) -#define WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_50MA 0x50 -#define WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_30MA 0x30 - -#define CLSH_REQ_ENABLE true -#define CLSH_REQ_DISABLE false -#define WCD_USLEEP_RANGE 50 - -enum { - DAC_GAIN_0DB = 0, - DAC_GAIN_0P2DB, - DAC_GAIN_0P4DB, - DAC_GAIN_0P6DB, - DAC_GAIN_0P8DB, - DAC_GAIN_M0P2DB, - DAC_GAIN_M0P4DB, - DAC_GAIN_M0P6DB, -}; - -static inline void wcd_enable_clsh_block(struct wcd_clsh_ctrl *ctrl, - bool enable) -{ - struct snd_soc_component *comp = ctrl->comp; - - if ((enable && ++ctrl->clsh_users == 1) || - (!enable && --ctrl->clsh_users == 0)) - snd_soc_component_update_bits(comp, WCD9XXX_A_CDC_CLSH_CRC, - WCD9XXX_A_CDC_CLSH_CRC_CLK_EN_MASK, - enable); - if (ctrl->clsh_users < 0) - ctrl->clsh_users = 0; -} - -static inline bool wcd_clsh_enable_status(struct snd_soc_component *comp) -{ - return snd_soc_component_read32(comp, WCD9XXX_A_CDC_CLSH_CRC) & - WCD9XXX_A_CDC_CLSH_CRC_CLK_EN_MASK; -} - -static inline void wcd_clsh_set_buck_mode(struct snd_soc_component *comp, - int mode) -{ - /* set to HIFI */ - if (mode == CLS_H_HIFI) - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_RX_SUPPLIES, - WCD9XXX_A_ANA_RX_VPOS_PWR_LVL_MASK, - WCD9XXX_A_ANA_RX_VPOS_PWR_LVL_UHQA); - else - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_RX_SUPPLIES, - WCD9XXX_A_ANA_RX_VPOS_PWR_LVL_MASK, - WCD9XXX_A_ANA_RX_VPOS_PWR_LVL_DEFAULT); -} - -static inline void wcd_clsh_set_flyback_mode(struct snd_soc_component *comp, - int mode) -{ - /* set to HIFI */ - if (mode == CLS_H_HIFI) - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_RX_SUPPLIES, - WCD9XXX_A_ANA_RX_VNEG_PWR_LVL_MASK, - WCD9XXX_A_ANA_RX_VNEG_PWR_LVL_UHQA); - else - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_RX_SUPPLIES, - WCD9XXX_A_ANA_RX_VNEG_PWR_LVL_MASK, - WCD9XXX_A_ANA_RX_VNEG_PWR_LVL_DEFAULT); -} - -static void wcd_clsh_buck_ctrl(struct wcd_clsh_ctrl *ctrl, - int mode, - bool enable) -{ - struct snd_soc_component *comp = ctrl->comp; - - /* enable/disable buck */ - if ((enable && (++ctrl->buck_users == 1)) || - (!enable && (--ctrl->buck_users == 0))) - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_RX_SUPPLIES, - WCD9XXX_A_ANA_RX_VPOS_EN_MASK, - enable << WCD9XXX_A_ANA_RX_VPOS_EN_SHIFT); - /* - * 500us sleep is required after buck enable/disable - * as per HW requirement - */ - usleep_range(500, 500 + WCD_USLEEP_RANGE); -} - -static void wcd_clsh_flyback_ctrl(struct wcd_clsh_ctrl *ctrl, - int mode, - bool enable) -{ - struct snd_soc_component *comp = ctrl->comp; - - int vneg[] = {0x00, 0x40}; - - /* enable/disable flyback */ - if ((enable && (++ctrl->flyback_users == 1)) || - (!enable && (--ctrl->flyback_users == 0))) { - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_RX_SUPPLIES, - WCD9XXX_A_ANA_RX_VNEG_EN_MASK, - enable << WCD9XXX_A_ANA_RX_VNEG_EN_SHIFT); - /* 100usec delay is needed as per HW requirement */ - usleep_range(100, 110); - - if (enable && (WCD9335_IS_1_1(ctrl->codec_version))) { - wcd_clsh_set_flyback_mode(comp, CLS_H_HIFI); - snd_soc_component_update_bits(comp, WCD9XXX_FLYBACK_EN, - WCD9XXX_FLYBACK_EN_DELAY_SEL_MASK, - WCD9XXX_FLYBACK_EN_DELAY_26P25_US); - snd_soc_component_update_bits(comp, WCD9XXX_FLYBACK_EN, - WCD9XXX_FLYBACK_EN_RESET_BY_EXT_MASK, - WCD9XXX_FLYBACK_EN_PWDN_WITHOUT_DELAY); - vneg[0] = snd_soc_component_read32(comp, - WCD9XXX_A_ANA_RX_SUPPLIES); - vneg[0] &= ~(0x40); - vneg[1] = vneg[0] | 0x40; - - snd_soc_component_write(comp, - WCD9XXX_A_ANA_RX_SUPPLIES, vneg[0]); - snd_soc_component_write(comp, - WCD9XXX_A_ANA_RX_SUPPLIES, vneg[1]); - /* 500usec delay is needed as per HW requirement */ - usleep_range(500, 510); - snd_soc_component_update_bits(comp, WCD9XXX_FLYBACK_EN, - WCD9XXX_FLYBACK_EN_RESET_BY_EXT_MASK, - WCD9XXX_FLYBACK_EN_PWDN_WITH_DELAY); - wcd_clsh_set_flyback_mode(comp, mode); - } - - } - /* - * 500us sleep is required after flyback enable/disable - * as per HW requirement - */ - usleep_range(500, 500 + WCD_USLEEP_RANGE); -} - -static void wcd_clsh_set_gain_path(struct wcd_clsh_ctrl *ctrl, int mode) -{ - struct snd_soc_component *comp = ctrl->comp; - int val = 0; - - switch (mode) { - case CLS_H_NORMAL: - case CLS_AB: - val = WCD9XXX_HPH_CONST_SEL_BYPASS; - break; - case CLS_H_HIFI: - val = WCD9XXX_HPH_CONST_SEL_HQ_PATH; - break; - case CLS_H_LP: - val = WCD9XXX_HPH_CONST_SEL_LP_PATH; - break; - }; - - snd_soc_component_update_bits(comp, WCD9XXX_HPH_L_EN, - WCD9XXX_HPH_CONST_SEL_L_MASK, - val); - - snd_soc_component_update_bits(comp, WCD9XXX_HPH_R_EN, - WCD9XXX_HPH_CONST_SEL_L_MASK, - val); -} - -static void wcd_clsh_set_hph_mode(struct snd_soc_component *comp, - int mode) -{ - int val = 0, gain = 0, res_val; - int ipeak = WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_50MA; - - res_val = WCD9XXX_CLASSH_CTRL_VCL_VREF_FILT_R_0KOHM; - switch (mode) { - case CLS_H_NORMAL: - res_val = WCD9XXX_CLASSH_CTRL_VCL_VREF_FILT_R_50KOHM; - val = WCD9XXX_A_ANA_HPH_PWR_LEVEL_NORMAL; - gain = DAC_GAIN_0DB; - ipeak = WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_50MA; - break; - case CLS_AB: - val = WCD9XXX_A_ANA_HPH_PWR_LEVEL_NORMAL; - gain = DAC_GAIN_0DB; - ipeak = WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_50MA; - break; - case CLS_H_HIFI: - val = WCD9XXX_A_ANA_HPH_PWR_LEVEL_UHQA; - gain = DAC_GAIN_M0P2DB; - ipeak = WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_50MA; - break; - case CLS_H_LP: - val = WCD9XXX_A_ANA_HPH_PWR_LEVEL_LP; - ipeak = WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_30MA; - break; - }; - - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_HPH, - WCD9XXX_A_ANA_HPH_PWR_LEVEL_MASK, val); - snd_soc_component_update_bits(comp, WCD9XXX_CLASSH_CTRL_VCL_2, - WCD9XXX_CLASSH_CTRL_VCL_2_VREF_FILT_1_MASK, - res_val); - if (mode != CLS_H_LP) - snd_soc_component_update_bits(comp, - WCD9XXX_HPH_REFBUFF_UHQA_CTL, - WCD9XXX_HPH_REFBUFF_UHQA_GAIN_MASK, - gain); - snd_soc_component_update_bits(comp, WCD9XXX_CLASSH_CTRL_CCL_1, - WCD9XXX_CLASSH_CTRL_CCL_1_DELTA_IPEAK_MASK, - ipeak); -} - -static void wcd_clsh_set_flyback_current(struct snd_soc_component *comp, - int mode) -{ - - snd_soc_component_update_bits(comp, WCD9XXX_RX_BIAS_FLYB_BUFF, - WCD9XXX_RX_BIAS_FLYB_VPOS_5_UA_MASK, 0x0A); - snd_soc_component_update_bits(comp, WCD9XXX_RX_BIAS_FLYB_BUFF, - WCD9XXX_RX_BIAS_FLYB_VNEG_5_UA_MASK, 0x0A); - /* Sleep needed to avoid click and pop as per HW requirement */ - usleep_range(100, 110); -} - -static void wcd_clsh_set_buck_regulator_mode(struct snd_soc_component *comp, - int mode) -{ - if (mode == CLS_AB) - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_RX_SUPPLIES, - WCD9XXX_A_ANA_RX_REGULATOR_MODE_MASK, - WCD9XXX_A_ANA_RX_REGULATOR_MODE_CLS_AB); - else - snd_soc_component_update_bits(comp, WCD9XXX_A_ANA_RX_SUPPLIES, - WCD9XXX_A_ANA_RX_REGULATOR_MODE_MASK, - WCD9XXX_A_ANA_RX_REGULATOR_MODE_CLS_H); -} - -static void wcd_clsh_state_lo(struct wcd_clsh_ctrl *ctrl, int req_state, - bool is_enable, int mode) -{ - struct snd_soc_component *comp = ctrl->comp; - - if (mode != CLS_AB) { - dev_err(comp->dev, "%s: LO cannot be in this mode: %d\n", - __func__, mode); - return; - } - - if (is_enable) { - wcd_clsh_set_buck_regulator_mode(comp, mode); - wcd_clsh_set_buck_mode(comp, mode); - wcd_clsh_set_flyback_mode(comp, mode); - wcd_clsh_flyback_ctrl(ctrl, mode, true); - wcd_clsh_set_flyback_current(comp, mode); - wcd_clsh_buck_ctrl(ctrl, mode, true); - } else { - wcd_clsh_buck_ctrl(ctrl, mode, false); - wcd_clsh_flyback_ctrl(ctrl, mode, false); - wcd_clsh_set_flyback_mode(comp, CLS_H_NORMAL); - wcd_clsh_set_buck_mode(comp, CLS_H_NORMAL); - wcd_clsh_set_buck_regulator_mode(comp, CLS_H_NORMAL); - } -} - -static void wcd_clsh_state_hph_r(struct wcd_clsh_ctrl *ctrl, int req_state, - bool is_enable, int mode) -{ - struct snd_soc_component *comp = ctrl->comp; - - if (mode == CLS_H_NORMAL) { - dev_err(comp->dev, "%s: Normal mode not applicable for hph_r\n", - __func__); - return; - } - - if (is_enable) { - if (mode != CLS_AB) { - wcd_enable_clsh_block(ctrl, true); - /* - * These K1 values depend on the Headphone Impedance - * For now it is assumed to be 16 ohm - */ - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_CLSH_K1_MSB, - WCD9XXX_A_CDC_CLSH_K1_MSB_COEF_MASK, - 0x00); - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_CLSH_K1_LSB, - WCD9XXX_A_CDC_CLSH_K1_LSB_COEF_MASK, - 0xC0); - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_RX2_RX_PATH_CFG0, - WCD9XXX_A_CDC_RX_PATH_CLSH_EN_MASK, - WCD9XXX_A_CDC_RX_PATH_CLSH_ENABLE); - } - wcd_clsh_set_buck_regulator_mode(comp, mode); - wcd_clsh_set_flyback_mode(comp, mode); - wcd_clsh_flyback_ctrl(ctrl, mode, true); - wcd_clsh_set_flyback_current(comp, mode); - wcd_clsh_set_buck_mode(comp, mode); - wcd_clsh_buck_ctrl(ctrl, mode, true); - wcd_clsh_set_hph_mode(comp, mode); - wcd_clsh_set_gain_path(ctrl, mode); - } else { - wcd_clsh_set_hph_mode(comp, CLS_H_NORMAL); - - if (mode != CLS_AB) { - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_RX2_RX_PATH_CFG0, - WCD9XXX_A_CDC_RX_PATH_CLSH_EN_MASK, - WCD9XXX_A_CDC_RX_PATH_CLSH_DISABLE); - wcd_enable_clsh_block(ctrl, false); - } - /* buck and flyback set to default mode and disable */ - wcd_clsh_buck_ctrl(ctrl, CLS_H_NORMAL, false); - wcd_clsh_flyback_ctrl(ctrl, CLS_H_NORMAL, false); - wcd_clsh_set_flyback_mode(comp, CLS_H_NORMAL); - wcd_clsh_set_buck_mode(comp, CLS_H_NORMAL); - wcd_clsh_set_buck_regulator_mode(comp, CLS_H_NORMAL); - } -} - -static void wcd_clsh_state_hph_l(struct wcd_clsh_ctrl *ctrl, int req_state, - bool is_enable, int mode) -{ - struct snd_soc_component *comp = ctrl->comp; - - if (mode == CLS_H_NORMAL) { - dev_err(comp->dev, "%s: Normal mode not applicable for hph_l\n", - __func__); - return; - } - - if (is_enable) { - if (mode != CLS_AB) { - wcd_enable_clsh_block(ctrl, true); - /* - * These K1 values depend on the Headphone Impedance - * For now it is assumed to be 16 ohm - */ - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_CLSH_K1_MSB, - WCD9XXX_A_CDC_CLSH_K1_MSB_COEF_MASK, - 0x00); - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_CLSH_K1_LSB, - WCD9XXX_A_CDC_CLSH_K1_LSB_COEF_MASK, - 0xC0); - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_RX1_RX_PATH_CFG0, - WCD9XXX_A_CDC_RX_PATH_CLSH_EN_MASK, - WCD9XXX_A_CDC_RX_PATH_CLSH_ENABLE); - } - wcd_clsh_set_buck_regulator_mode(comp, mode); - wcd_clsh_set_flyback_mode(comp, mode); - wcd_clsh_flyback_ctrl(ctrl, mode, true); - wcd_clsh_set_flyback_current(comp, mode); - wcd_clsh_set_buck_mode(comp, mode); - wcd_clsh_buck_ctrl(ctrl, mode, true); - wcd_clsh_set_hph_mode(comp, mode); - wcd_clsh_set_gain_path(ctrl, mode); - } else { - wcd_clsh_set_hph_mode(comp, CLS_H_NORMAL); - - if (mode != CLS_AB) { - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_RX1_RX_PATH_CFG0, - WCD9XXX_A_CDC_RX_PATH_CLSH_EN_MASK, - WCD9XXX_A_CDC_RX_PATH_CLSH_DISABLE); - wcd_enable_clsh_block(ctrl, false); - } - /* set buck and flyback to Default Mode */ - wcd_clsh_buck_ctrl(ctrl, CLS_H_NORMAL, false); - wcd_clsh_flyback_ctrl(ctrl, CLS_H_NORMAL, false); - wcd_clsh_set_flyback_mode(comp, CLS_H_NORMAL); - wcd_clsh_set_buck_mode(comp, CLS_H_NORMAL); - wcd_clsh_set_buck_regulator_mode(comp, CLS_H_NORMAL); - } -} - -static void wcd_clsh_state_ear(struct wcd_clsh_ctrl *ctrl, int req_state, - bool is_enable, int mode) -{ - struct snd_soc_component *comp = ctrl->comp; - - if (mode != CLS_H_NORMAL) { - dev_err(comp->dev, "%s: mode: %d cannot be used for EAR\n", - __func__, mode); - return; - } - - if (is_enable) { - wcd_enable_clsh_block(ctrl, true); - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_RX0_RX_PATH_CFG0, - WCD9XXX_A_CDC_RX_PATH_CLSH_EN_MASK, - WCD9XXX_A_CDC_RX_PATH_CLSH_ENABLE); - wcd_clsh_set_buck_mode(comp, mode); - wcd_clsh_set_flyback_mode(comp, mode); - wcd_clsh_flyback_ctrl(ctrl, mode, true); - wcd_clsh_set_flyback_current(comp, mode); - wcd_clsh_buck_ctrl(ctrl, mode, true); - } else { - snd_soc_component_update_bits(comp, - WCD9XXX_A_CDC_RX0_RX_PATH_CFG0, - WCD9XXX_A_CDC_RX_PATH_CLSH_EN_MASK, - WCD9XXX_A_CDC_RX_PATH_CLSH_DISABLE); - wcd_enable_clsh_block(ctrl, false); - wcd_clsh_buck_ctrl(ctrl, mode, false); - wcd_clsh_flyback_ctrl(ctrl, mode, false); - wcd_clsh_set_flyback_mode(comp, CLS_H_NORMAL); - wcd_clsh_set_buck_mode(comp, CLS_H_NORMAL); - } -} - -static int _wcd_clsh_ctrl_set_state(struct wcd_clsh_ctrl *ctrl, int req_state, - bool is_enable, int mode) -{ - switch (req_state) { - case WCD_CLSH_STATE_EAR: - wcd_clsh_state_ear(ctrl, req_state, is_enable, mode); - break; - case WCD_CLSH_STATE_HPHL: - wcd_clsh_state_hph_l(ctrl, req_state, is_enable, mode); - break; - case WCD_CLSH_STATE_HPHR: - wcd_clsh_state_hph_r(ctrl, req_state, is_enable, mode); - break; - break; - case WCD_CLSH_STATE_LO: - wcd_clsh_state_lo(ctrl, req_state, is_enable, mode); - break; - default: - break; - } - - return 0; -} - -/* - * Function: wcd_clsh_is_state_valid - * Params: state - * Description: - * Provides information on valid states of Class H configuration - */ -static bool wcd_clsh_is_state_valid(int state) -{ - switch (state) { - case WCD_CLSH_STATE_IDLE: - case WCD_CLSH_STATE_EAR: - case WCD_CLSH_STATE_HPHL: - case WCD_CLSH_STATE_HPHR: - case WCD_CLSH_STATE_LO: - return true; - default: - return false; - }; -} - -/* - * Function: wcd_clsh_fsm - * Params: ctrl, req_state, req_type, clsh_event - * Description: - * This function handles PRE DAC and POST DAC conditions of different devices - * and updates class H configuration of different combination of devices - * based on validity of their states. ctrl will contain current - * class h state information - */ -int wcd_clsh_ctrl_set_state(struct wcd_clsh_ctrl *ctrl, - enum wcd_clsh_event clsh_event, - int nstate, - enum wcd_clsh_mode mode) -{ - struct snd_soc_component *comp = ctrl->comp; - - if (nstate == ctrl->state) - return 0; - - if (!wcd_clsh_is_state_valid(nstate)) { - dev_err(comp->dev, "Class-H not a valid new state:\n"); - return -EINVAL; - } - - switch (clsh_event) { - case WCD_CLSH_EVENT_PRE_DAC: - _wcd_clsh_ctrl_set_state(ctrl, nstate, CLSH_REQ_ENABLE, mode); - break; - case WCD_CLSH_EVENT_POST_PA: - _wcd_clsh_ctrl_set_state(ctrl, nstate, CLSH_REQ_DISABLE, mode); - break; - }; - - ctrl->state = nstate; - ctrl->mode = mode; - - return 0; -} - -int wcd_clsh_ctrl_get_state(struct wcd_clsh_ctrl *ctrl) -{ - return ctrl->state; -} - -struct wcd_clsh_ctrl *wcd_clsh_ctrl_alloc(struct snd_soc_component *comp, - int version) -{ - struct wcd_clsh_ctrl *ctrl; - - ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL); - if (!ctrl) - return ERR_PTR(-ENOMEM); - - ctrl->state = WCD_CLSH_STATE_IDLE; - ctrl->comp = comp; - - return ctrl; -} - -void wcd_clsh_ctrl_free(struct wcd_clsh_ctrl *ctrl) -{ - kfree(ctrl); -} diff --git a/sound/soc/codecs/wcd-clsh.h b/sound/soc/codecs/wcd-clsh.h deleted file mode 100644 index a902f9893467..000000000000 --- a/sound/soc/codecs/wcd-clsh.h +++ /dev/null @@ -1,49 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef _WCD_CLSH_V2_H_ -#define _WCD_CLSH_V2_H_ -#include <sound/soc.h> - -enum wcd_clsh_event { - WCD_CLSH_EVENT_PRE_DAC = 1, - WCD_CLSH_EVENT_POST_PA, -}; - -/* - * Basic states for Class H state machine. - * represented as a bit mask within a u8 data type - * bit 0: EAR mode - * bit 1: HPH Left mode - * bit 2: HPH Right mode - * bit 3: Lineout mode - */ -#define WCD_CLSH_STATE_IDLE 0 -#define WCD_CLSH_STATE_EAR BIT(0) -#define WCD_CLSH_STATE_HPHL BIT(1) -#define WCD_CLSH_STATE_HPHR BIT(2) -#define WCD_CLSH_STATE_LO BIT(3) -#define WCD_CLSH_STATE_MAX 4 -#define NUM_CLSH_STATES_V2 BIT(WCD_CLSH_STATE_MAX) - -enum wcd_clsh_mode { - CLS_H_NORMAL = 0, /* Class-H Default */ - CLS_H_HIFI, /* Class-H HiFi */ - CLS_H_LP, /* Class-H Low Power */ - CLS_AB, /* Class-AB */ - CLS_H_LOHIFI, /* LoHIFI */ - CLS_NONE, /* None of the above modes */ -}; - -struct wcd_clsh_ctrl; - -extern struct wcd_clsh_ctrl *wcd_clsh_ctrl_alloc( - struct snd_soc_component *component, - int version); -extern void wcd_clsh_ctrl_free(struct wcd_clsh_ctrl *ctrl); -extern int wcd_clsh_ctrl_get_state(struct wcd_clsh_ctrl *ctrl); -extern int wcd_clsh_ctrl_set_state(struct wcd_clsh_ctrl *ctrl, - enum wcd_clsh_event event, - int state, - enum wcd_clsh_mode mode); - -#endif /* _WCD_CLSH_V2_H_ */ diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index 06c73699f16f..bd9de5d45fa9 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c @@ -21,7 +21,6 @@ #include <dt-bindings/mfd/wcd9335.h> #include <linux/mfd/wcd9335/wcd9335.h> #include <linux/mfd/wcd9335/registers.h> -#include "wcd-clsh.h" #define WCD9335_RATES_MASK (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\ @@ -182,7 +181,6 @@ struct wcd9335_codec { int sido_ccl_cnt; enum wcd_clock_type clk_type; - struct wcd_clsh_ctrl *clsh_ctrl; u32 hph_mode; }; @@ -1068,13 +1066,6 @@ static int wcd9335_codec_probe(struct snd_soc_component *component) int i; snd_soc_component_init_regmap(component, wcd->regmap); - /* Class-H Init*/ - wcd->clsh_ctrl = wcd_clsh_ctrl_alloc(component, wcd->version); - if (IS_ERR(wcd->clsh_ctrl)) - return PTR_ERR(wcd->clsh_ctrl); - - /* Default HPH Mode to Class-H HiFi */ - wcd->hph_mode = CLS_H_HIFI; wcd->component = component; wcd9335_codec_init(component); @@ -1089,7 +1080,6 @@ static void wcd9335_codec_remove(struct snd_soc_component *comp) { struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); - wcd_clsh_ctrl_free(wcd->clsh_ctrl); free_irq(regmap_irq_get_virq(wcd->irq_data, WCD9335_IRQ_SLIMBUS), wcd); } -- 2.18.0

1 0

[alsa-devel] Applied "ASoC: wcd9335: Fix build" to the asoc tree
by Mark Brown 01 Aug '18

01 Aug '18

The patch ASoC: wcd9335: Fix build has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From b74fd69043262003c5b7ce545e59f5a7234ab290 Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Wed, 1 Aug 2018 14:22:56 +0100 Subject: [PATCH] ASoC: wcd9335: Fix build This reverts commit e57d4ca882e28 (ASoC: wcd9335: add support to wcd9335 codec) due to build failures caused by missing dependencies. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/Kconfig | 5 - sound/soc/codecs/Makefile | 2 - sound/soc/codecs/wcd9335.c | 1154 ------------------------------------ 3 files changed, 1161 deletions(-) delete mode 100644 sound/soc/codecs/wcd9335.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index cb09abf18dde..efb095dbcd71 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1066,11 +1066,6 @@ config SND_SOC_UDA1380 tristate depends on I2C -config SND_SOC_WCD9335 - tristate "WCD9335 Codec" - depends on MFD_WCD9335 - tristate - config SND_SOC_WL1273 tristate diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 01410b63daac..7ae7c85e8219 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -192,7 +192,6 @@ snd-soc-twl4030-objs := twl4030.o snd-soc-twl6040-objs := twl6040.o snd-soc-uda134x-objs := uda134x.o snd-soc-uda1380-objs := uda1380.o -snd-soc-wcd9335-objs := wcd9335.o snd-soc-wl1273-objs := wl1273.o snd-soc-wm-adsp-objs := wm_adsp.o snd-soc-wm0010-objs := wm0010.o @@ -452,7 +451,6 @@ obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o obj-$(CONFIG_SND_SOC_TWL6040) += snd-soc-twl6040.o obj-$(CONFIG_SND_SOC_UDA134X) += snd-soc-uda134x.o obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o -obj-$(CONFIG_SND_SOC_WCD9335) += snd-soc-wcd9335.o obj-$(CONFIG_SND_SOC_WL1273) += snd-soc-wl1273.o obj-$(CONFIG_SND_SOC_WM0010) += snd-soc-wm0010.o obj-$(CONFIG_SND_SOC_WM1250_EV1) += snd-soc-wm1250-ev1.o diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c deleted file mode 100644 index bd9de5d45fa9..000000000000 --- a/sound/soc/codecs/wcd9335.c +++ /dev/null @@ -1,1154 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. -// Copyright (c) 2017-2018, Linaro Limited - -#include <linux/module.h> -#include <linux/init.h> -#include <linux/platform_device.h> -#include <linux/device.h> -#include <linux/wait.h> -#include <linux/bitops.h> -#include <linux/regulator/consumer.h> -#include <linux/clk.h> -#include <linux/delay.h> -#include <linux/kernel.h> -#include <linux/slimbus.h> -#include <sound/soc.h> -#include <sound/pcm_params.h> -#include <sound/soc-dapm.h> -#include <sound/tlv.h> -#include <sound/info.h> -#include <dt-bindings/mfd/wcd9335.h> -#include <linux/mfd/wcd9335/wcd9335.h> -#include <linux/mfd/wcd9335/registers.h> - -#define WCD9335_RATES_MASK (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\ - SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\ - SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000) -/* Fractional Rates */ -#define WCD9335_FRAC_RATES_MASK (SNDRV_PCM_RATE_44100) -#define WCD9335_FORMATS_S16_S24_LE (SNDRV_PCM_FMTBIT_S16_LE | \ - SNDRV_PCM_FMTBIT_S24_LE) - -/* slave port water mark level - * (0: 6bytes, 1: 9bytes, 2: 12 bytes, 3: 15 bytes) - */ -#define SLAVE_PORT_WATER_MARK_6BYTES 0 -#define SLAVE_PORT_WATER_MARK_9BYTES 1 -#define SLAVE_PORT_WATER_MARK_12BYTES 2 -#define SLAVE_PORT_WATER_MARK_15BYTES 3 -#define SLAVE_PORT_WATER_MARK_SHIFT 1 -#define SLAVE_PORT_ENABLE 1 -#define SLAVE_PORT_DISABLE 0 -#define WCD9335_SLIM_WATER_MARK_VAL \ - ((SLAVE_PORT_WATER_MARK_12BYTES << SLAVE_PORT_WATER_MARK_SHIFT) | \ - (SLAVE_PORT_ENABLE)) - -#define WCD9335_SLIM_NUM_PORT_REG 3 -#define WCD9335_SLIM_PGD_PORT_INT_TX_EN0 (WCD9335_SLIM_PGD_PORT_INT_EN0 + 2) - -#define WCD9335_MCLK_CLK_12P288MHZ 12288000 -#define WCD9335_MCLK_CLK_9P6MHZ 9600000 - -#define WCD9335_SLIM_CLOSE_TIMEOUT 1000 -#define WCD9335_SLIM_IRQ_OVERFLOW (1 << 0) -#define WCD9335_SLIM_IRQ_UNDERFLOW (1 << 1) -#define WCD9335_SLIM_IRQ_PORT_CLOSED (1 << 2) - -#define WCD9335_NUM_INTERPOLATORS 9 -#define WCD9335_RX_START 16 -#define WCD9335_SLIM_CH_START 128 - -#define WCD9335_SLIM_RX_CH(p) \ - {.port = p + WCD9335_RX_START, .shift = p,} - -/* vout step value */ -#define WCD9335_CALCULATE_VOUT_D(req_mv) (((req_mv - 650) * 10) / 25) - -enum { - WCD9335_RX0 = 0, - WCD9335_RX1, - WCD9335_RX2, - WCD9335_RX3, - WCD9335_RX4, - WCD9335_RX5, - WCD9335_RX6, - WCD9335_RX7, - WCD9335_RX8, - WCD9335_RX9, - WCD9335_RX10, - WCD9335_RX11, - WCD9335_RX12, - WCD9335_RX_MAX, -}; - -enum { - SIDO_SOURCE_INTERNAL = 0, - SIDO_SOURCE_RCO_BG, -}; - -enum wcd9335_sido_voltage { - SIDO_VOLTAGE_SVS_MV = 950, - SIDO_VOLTAGE_NOMINAL_MV = 1100, -}; - -enum { - AIF1_PB = 0, - AIF1_CAP, - AIF2_PB, - AIF2_CAP, - AIF3_PB, - AIF3_CAP, - AIF4_PB, - NUM_CODEC_DAIS, -}; - -enum { - INTn_2_INP_SEL_ZERO = 0, - INTn_2_INP_SEL_RX0, - INTn_2_INP_SEL_RX1, - INTn_2_INP_SEL_RX2, - INTn_2_INP_SEL_RX3, - INTn_2_INP_SEL_RX4, - INTn_2_INP_SEL_RX5, - INTn_2_INP_SEL_RX6, - INTn_2_INP_SEL_RX7, - INTn_2_INP_SEL_PROXIMITY, -}; - -enum { - INTn_1_MIX_INP_SEL_ZERO = 0, - INTn_1_MIX_INP_SEL_DEC0, - INTn_1_MIX_INP_SEL_DEC1, - INTn_1_MIX_INP_SEL_IIR0, - INTn_1_MIX_INP_SEL_IIR1, - INTn_1_MIX_INP_SEL_RX0, - INTn_1_MIX_INP_SEL_RX1, - INTn_1_MIX_INP_SEL_RX2, - INTn_1_MIX_INP_SEL_RX3, - INTn_1_MIX_INP_SEL_RX4, - INTn_1_MIX_INP_SEL_RX5, - INTn_1_MIX_INP_SEL_RX6, - INTn_1_MIX_INP_SEL_RX7, - -}; - -enum wcd_clock_type { - WCD_CLK_OFF, - WCD_CLK_RCO, - WCD_CLK_MCLK, -}; - -struct wcd9335_slim_ch { - u32 ch_num; - u16 port; - u16 shift; - struct list_head list; -}; - -struct wcd_slim_codec_dai_data { - struct list_head slim_ch_list; - struct slim_stream_config sconfig; - struct slim_stream_runtime *sruntime; -}; - -struct wcd9335_codec { - struct device *dev; - struct clk *mclk; - struct clk *native_clk; - u32 mclk_rate; - u8 intf_type; - u8 version; - - struct slim_device *slim; - struct slim_device *slim_ifd; - struct regmap *regmap; - struct regmap *if_regmap; - struct regmap_irq_chip_data *irq_data; - - struct wcd9335_slim_ch rx_chs[WCD9335_RX_MAX]; - u32 num_rx_port; - - int sido_input_src; - enum wcd9335_sido_voltage sido_voltage; - - struct wcd_slim_codec_dai_data dai[NUM_CODEC_DAIS]; - struct snd_soc_component *component; - - int master_bias_users; - int clk_mclk_users; - int clk_rco_users; - int sido_ccl_cnt; - enum wcd_clock_type clk_type; - - u32 hph_mode; -}; - -static const struct wcd9335_slim_ch wcd9335_rx_chs[WCD9335_RX_MAX] = { - WCD9335_SLIM_RX_CH(0), /* 16 */ - WCD9335_SLIM_RX_CH(1), /* 17 */ - WCD9335_SLIM_RX_CH(2), - WCD9335_SLIM_RX_CH(3), - WCD9335_SLIM_RX_CH(4), - WCD9335_SLIM_RX_CH(5), - WCD9335_SLIM_RX_CH(6), - WCD9335_SLIM_RX_CH(7), - WCD9335_SLIM_RX_CH(8), - WCD9335_SLIM_RX_CH(9), - WCD9335_SLIM_RX_CH(10), - WCD9335_SLIM_RX_CH(11), - WCD9335_SLIM_RX_CH(12), -}; - -struct interp_sample_rate { - int rate; - int rate_val; -}; - -static struct interp_sample_rate int_mix_rate_val[] = { - {48000, 0x4}, /* 48K */ - {96000, 0x5}, /* 96K */ - {192000, 0x6}, /* 192K */ -}; - -static struct interp_sample_rate int_prim_rate_val[] = { - {8000, 0x0}, /* 8K */ - {16000, 0x1}, /* 16K */ - {24000, -EINVAL},/* 24K */ - {32000, 0x3}, /* 32K */ - {48000, 0x4}, /* 48K */ - {96000, 0x5}, /* 96K */ - {192000, 0x6}, /* 192K */ - {384000, 0x7}, /* 384K */ - {44100, 0x8}, /* 44.1K */ -}; - -struct wcd9335_reg_mask_val { - u16 reg; - u8 mask; - u8 val; -}; - -static const struct wcd9335_reg_mask_val wcd9335_codec_reg_init_val_2_0[] = { - {WCD9335_RCO_CTRL_2, 0x0F, 0x08}, - {WCD9335_RX_BIAS_FLYB_MID_RST, 0xF0, 0x10}, - {WCD9335_FLYBACK_CTRL_1, 0x20, 0x20}, - {WCD9335_HPH_OCP_CTL, 0xFF, 0x5A}, - {WCD9335_HPH_L_TEST, 0x01, 0x01}, - {WCD9335_HPH_R_TEST, 0x01, 0x01}, - {WCD9335_CDC_BOOST0_BOOST_CFG1, 0x3F, 0x12}, - {WCD9335_CDC_BOOST0_BOOST_CFG2, 0x1C, 0x08}, - {WCD9335_CDC_COMPANDER7_CTL7, 0x1E, 0x18}, - {WCD9335_CDC_BOOST1_BOOST_CFG1, 0x3F, 0x12}, - {WCD9335_CDC_BOOST1_BOOST_CFG2, 0x1C, 0x08}, - {WCD9335_CDC_COMPANDER8_CTL7, 0x1E, 0x18}, - {WCD9335_CDC_TX0_TX_PATH_SEC7, 0xFF, 0x45}, - {WCD9335_CDC_RX0_RX_PATH_SEC0, 0xFC, 0xF4}, - {WCD9335_HPH_REFBUFF_LP_CTL, 0x08, 0x08}, - {WCD9335_HPH_REFBUFF_LP_CTL, 0x06, 0x02}, -}; - -static const struct wcd9335_reg_mask_val wcd9335_codec_reg_init_common_val[] = { - /* Rbuckfly/R_EAR(32) */ - {WCD9335_CDC_CLSH_K2_MSB, 0x0F, 0x00}, - {WCD9335_CDC_CLSH_K2_LSB, 0xFF, 0x60}, - {WCD9335_CPE_SS_DMIC_CFG, 0x80, 0x00}, - {WCD9335_CDC_BOOST0_BOOST_CTL, 0x70, 0x50}, - {WCD9335_CDC_BOOST1_BOOST_CTL, 0x70, 0x50}, - {WCD9335_CDC_RX7_RX_PATH_CFG1, 0x08, 0x08}, - {WCD9335_CDC_RX8_RX_PATH_CFG1, 0x08, 0x08}, - {WCD9335_ANA_LO_1_2, 0x3C, 0X3C}, - {WCD9335_DIFF_LO_COM_SWCAP_REFBUF_FREQ, 0x70, 0x00}, - {WCD9335_DIFF_LO_COM_PA_FREQ, 0x70, 0x40}, - {WCD9335_SOC_MAD_AUDIO_CTL_2, 0x03, 0x03}, - {WCD9335_CDC_TOP_TOP_CFG1, 0x02, 0x02}, - {WCD9335_CDC_TOP_TOP_CFG1, 0x01, 0x01}, - {WCD9335_EAR_CMBUFF, 0x08, 0x00}, - {WCD9335_CDC_TX9_SPKR_PROT_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_TX10_SPKR_PROT_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_TX11_SPKR_PROT_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_TX12_SPKR_PROT_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_COMPANDER7_CTL3, 0x80, 0x80}, - {WCD9335_CDC_COMPANDER8_CTL3, 0x80, 0x80}, - {WCD9335_CDC_COMPANDER7_CTL7, 0x01, 0x01}, - {WCD9335_CDC_COMPANDER8_CTL7, 0x01, 0x01}, - {WCD9335_CDC_RX0_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX1_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX2_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX3_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX4_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX5_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX6_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX7_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX8_RX_PATH_CFG0, 0x01, 0x01}, - {WCD9335_CDC_RX0_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_CDC_RX1_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_CDC_RX2_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_CDC_RX3_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_CDC_RX4_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_CDC_RX5_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_CDC_RX6_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_CDC_RX7_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_CDC_RX8_RX_PATH_MIX_CFG, 0x01, 0x01}, - {WCD9335_VBADC_IBIAS_FE, 0x0C, 0x08}, -}; - -static int wcd9335_set_mix_interpolator_rate(struct snd_soc_dai *dai, - int rate_val, - u32 rate) -{ - struct snd_soc_component *component = dai->component; - struct wcd9335_codec *wcd = dev_get_drvdata(component->dev); - struct wcd9335_slim_ch *ch; - int val, j; - - list_for_each_entry(ch, &wcd->dai[dai->id].slim_ch_list, list) { - for (j = 0; j < WCD9335_NUM_INTERPOLATORS; j++) { - val = snd_soc_component_read32(component, - WCD9335_CDC_RX_INP_MUX_RX_INT_CFG1(j)) & - WCD9335_CDC_RX_INP_MUX_RX_INT_SEL_MASK; - - if (val == (ch->shift + INTn_2_INP_SEL_RX0)) - snd_soc_component_update_bits(component, - WCD9335_CDC_RX_PATH_MIX_CTL(j), - WCD9335_CDC_MIX_PCM_RATE_MASK, - rate_val); - } - } - - return 0; -} - -static int wcd9335_set_prim_interpolator_rate(struct snd_soc_dai *dai, - u8 rate_val, - u32 rate) -{ - struct snd_soc_component *comp = dai->component; - struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); - struct wcd9335_slim_ch *ch; - u8 cfg0, cfg1, inp0_sel, inp1_sel, inp2_sel; - int inp, j; - - list_for_each_entry(ch, &wcd->dai[dai->id].slim_ch_list, list) { - inp = ch->shift + INTn_1_MIX_INP_SEL_RX0; - /* - * Loop through all interpolator MUX inputs and find out - * to which interpolator input, the slim rx port - * is connected - */ - for (j = 0; j < WCD9335_NUM_INTERPOLATORS; j++) { - cfg0 = snd_soc_component_read32(comp, - WCD9335_CDC_RX_INP_MUX_RX_INT_CFG0(j)); - cfg1 = snd_soc_component_read32(comp, - WCD9335_CDC_RX_INP_MUX_RX_INT_CFG1(j)); - - inp0_sel = cfg0 & WCD9335_CDC_RX_INP_MUX_RX_INT_SEL_MASK; - inp1_sel = (cfg0 >> 4) & WCD9335_CDC_RX_INP_MUX_RX_INT_SEL_MASK; - inp2_sel = (cfg1 >> 4) & WCD9335_CDC_RX_INP_MUX_RX_INT_SEL_MASK; - - if ((inp0_sel == inp) || (inp1_sel == inp) || - (inp2_sel == inp)) { - /* rate is in Hz */ - if ((j == 0) && (rate == 44100)) - dev_info(wcd->dev, - "Cannot set 44.1KHz on INT0\n"); - else - snd_soc_component_update_bits(comp, - WCD9335_CDC_RX_PATH_CTL(j), - WCD9335_CDC_MIX_PCM_RATE_MASK, - rate_val); - } - } - } - - return 0; -} - -static int wcd9335_set_interpolator_rate(struct snd_soc_dai *dai, u32 rate) -{ - int i; - - /* set mixing path rate */ - for (i = 0; i < ARRAY_SIZE(int_mix_rate_val); i++) { - if (rate == int_mix_rate_val[i].rate) { - wcd9335_set_mix_interpolator_rate(dai, - int_mix_rate_val[i].rate_val, rate); - break; - } - } - - /* set primary path sample rate */ - for (i = 0; i < ARRAY_SIZE(int_prim_rate_val); i++) { - if (rate == int_prim_rate_val[i].rate) { - wcd9335_set_prim_interpolator_rate(dai, - int_prim_rate_val[i].rate_val, rate); - break; - } - } - - return 0; -} - -static int wcd9335_slim_set_hw_params(struct wcd9335_codec *wcd, - struct wcd_slim_codec_dai_data *dai_data, - int direction) -{ - struct list_head *slim_ch_list = &dai_data->slim_ch_list; - struct slim_stream_config *cfg = &dai_data->sconfig; - struct wcd9335_slim_ch *ch; - u16 payload = 0; - int ret, i; - - cfg->ch_count = 0; - cfg->direction = direction; - cfg->port_mask = 0; - - /* Configure slave interface device */ - list_for_each_entry(ch, slim_ch_list, list) { - cfg->ch_count++; - payload |= 1 << ch->shift; - cfg->port_mask |= BIT(ch->port); - } - - cfg->chs = kcalloc(cfg->ch_count, sizeof(unsigned int), GFP_KERNEL); - if (!cfg->chs) - return -ENOMEM; - - i = 0; - list_for_each_entry(ch, slim_ch_list, list) { - cfg->chs[i++] = ch->ch_num; - if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - /* write to interface device */ - ret = regmap_write(wcd->if_regmap, - WCD9335_SLIM_PGD_RX_PORT_MULTI_CHNL_0(ch->port), - payload); - - if (ret < 0) - goto err; - - /* configure the slave port for water mark and enable*/ - ret = regmap_write(wcd->if_regmap, - WCD9335_SLIM_PGD_RX_PORT_CFG(ch->port), - WCD9335_SLIM_WATER_MARK_VAL); - if (ret < 0) - goto err; - } - } - - dai_data->sruntime = slim_stream_allocate(wcd->slim, "WCD9335-SLIM"); - slim_stream_prepare(dai_data->sruntime, cfg); - - return 0; - -err: - dev_err(wcd->dev, "Error Setting slim hw params\n"); - kfree(cfg->chs); - cfg->chs = NULL; - - return ret; -} - -static int wcd9335_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) -{ - struct wcd9335_codec *wcd; - int ret; - - wcd = snd_soc_component_get_drvdata(dai->component); - - switch (substream->stream) { - case SNDRV_PCM_STREAM_PLAYBACK: - ret = wcd9335_set_interpolator_rate(dai, params_rate(params)); - if (ret) { - dev_err(wcd->dev, "cannot set sample rate: %u\n", - params_rate(params)); - return ret; - } - switch (params_width(params)) { - case 16 ... 24: - wcd->dai[dai->id].sconfig.bps = params_width(params); - break; - default: - dev_err(wcd->dev, "%s: Invalid format 0x%x\n", - __func__, params_width(params)); - return -EINVAL; - } - break; - default: - dev_err(wcd->dev, "Invalid stream type %d\n", - substream->stream); - return -EINVAL; - }; - - wcd->dai[dai->id].sconfig.rate = params_rate(params); - wcd9335_slim_set_hw_params(wcd, &wcd->dai[dai->id], substream->stream); - - return 0; -} - -static int wcd9335_prepare(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct wcd_slim_codec_dai_data *dai_data; - struct wcd9335_codec *wcd; - - wcd = snd_soc_component_get_drvdata(dai->component); - dai_data = &wcd->dai[dai->id]; - slim_stream_enable(dai_data->sruntime); - - return 0; -} - -static int wcd9335_set_channel_map(struct snd_soc_dai *dai, - unsigned int tx_num, unsigned int *tx_slot, - unsigned int rx_num, unsigned int *rx_slot) -{ - struct wcd9335_codec *wcd; - int i; - - wcd = snd_soc_component_get_drvdata(dai->component); - - if (!tx_slot || !rx_slot) { - dev_err(wcd->dev, "Invalid tx_slot=%p, rx_slot=%p\n", - tx_slot, rx_slot); - return -EINVAL; - } - - if (wcd->rx_chs) { - wcd->num_rx_port = rx_num; - for (i = 0; i < rx_num; i++) { - wcd->rx_chs[i].ch_num = rx_slot[i]; - INIT_LIST_HEAD(&wcd->rx_chs[i].list); - } - } - - return 0; -} - -static int wcd9335_get_channel_map(struct snd_soc_dai *dai, - unsigned int *tx_num, unsigned int *tx_slot, - unsigned int *rx_num, unsigned int *rx_slot) -{ - struct wcd9335_slim_ch *ch; - struct wcd9335_codec *wcd; - int i = 0; - - wcd = snd_soc_component_get_drvdata(dai->component); - - switch (dai->id) { - case AIF1_PB: - case AIF2_PB: - case AIF3_PB: - case AIF4_PB: - if (!rx_slot || !rx_num) { - dev_err(wcd->dev, "Invalid rx_slot %p or rx_num %p\n", - rx_slot, rx_num); - return -EINVAL; - } - - list_for_each_entry(ch, &wcd->dai[dai->id].slim_ch_list, list) - rx_slot[i++] = ch->ch_num; - - *rx_num = i; - break; - default: - dev_err(wcd->dev, "Invalid DAI ID %x\n", dai->id); - break; - } - - return 0; -} - -static struct snd_soc_dai_ops wcd9335_dai_ops = { - .hw_params = wcd9335_hw_params, - .prepare = wcd9335_prepare, - .set_channel_map = wcd9335_set_channel_map, - .get_channel_map = wcd9335_get_channel_map, -}; - -static struct snd_soc_dai_driver wcd9335_slim_dais[] = { - [0] = { - .name = "wcd9335_rx1", - .id = AIF1_PB, - .playback = { - .stream_name = "AIF1 Playback", - .rates = WCD9335_RATES_MASK | WCD9335_FRAC_RATES_MASK, - .formats = WCD9335_FORMATS_S16_S24_LE, - .rate_max = 192000, - .rate_min = 8000, - .channels_min = 1, - .channels_max = 2, - }, - .ops = &wcd9335_dai_ops, - }, - [1] = { - .name = "wcd9335_tx1", - .id = AIF1_CAP, - .capture = { - .stream_name = "AIF1 Capture", - .rates = WCD9335_RATES_MASK, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .rate_min = 8000, - .rate_max = 192000, - .channels_min = 1, - .channels_max = 4, - }, - .ops = &wcd9335_dai_ops, - }, - [2] = { - .name = "wcd9335_rx2", - .id = AIF2_PB, - .playback = { - .stream_name = "AIF2 Playback", - .rates = WCD9335_RATES_MASK | WCD9335_FRAC_RATES_MASK, - .formats = WCD9335_FORMATS_S16_S24_LE, - .rate_min = 8000, - .rate_max = 192000, - .channels_min = 1, - .channels_max = 2, - }, - .ops = &wcd9335_dai_ops, - }, - [3] = { - .name = "wcd9335_tx2", - .id = AIF2_CAP, - .capture = { - .stream_name = "AIF2 Capture", - .rates = WCD9335_RATES_MASK, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .rate_min = 8000, - .rate_max = 192000, - .channels_min = 1, - .channels_max = 4, - }, - .ops = &wcd9335_dai_ops, - }, - [4] = { - .name = "wcd9335_rx3", - .id = AIF3_PB, - .playback = { - .stream_name = "AIF3 Playback", - .rates = WCD9335_RATES_MASK | WCD9335_FRAC_RATES_MASK, - .formats = WCD9335_FORMATS_S16_S24_LE, - .rate_min = 8000, - .rate_max = 192000, - .channels_min = 1, - .channels_max = 2, - }, - .ops = &wcd9335_dai_ops, - }, - [5] = { - .name = "wcd9335_tx3", - .id = AIF3_CAP, - .capture = { - .stream_name = "AIF3 Capture", - .rates = WCD9335_RATES_MASK, - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .rate_min = 8000, - .rate_max = 192000, - .channels_min = 1, - .channels_max = 4, - }, - .ops = &wcd9335_dai_ops, - }, - [6] = { - .name = "wcd9335_rx4", - .id = AIF4_PB, - .playback = { - .stream_name = "AIF4 Playback", - .rates = WCD9335_RATES_MASK | WCD9335_FRAC_RATES_MASK, - .formats = WCD9335_FORMATS_S16_S24_LE, - .rate_min = 8000, - .rate_max = 192000, - .channels_min = 1, - .channels_max = 2, - }, - .ops = &wcd9335_dai_ops, - }, -}; - -static irqreturn_t wcd9335_slimbus_irq(int irq, void *data) -{ - struct wcd9335_codec *wcd = data; - unsigned long status = 0; - int i, j, port_id; - unsigned int val, int_val = 0; - bool tx; - unsigned short reg = 0; - - for (i = WCD9335_SLIM_PGD_PORT_INT_STATUS_RX_0, j = 0; - i <= WCD9335_SLIM_PGD_PORT_INT_STATUS_TX_1; i++, j++) { - regmap_read(wcd->if_regmap, i, &val); - status |= ((u32)val << (8 * j)); - } - - for_each_set_bit(j, &status, 32) { - tx = (j >= 16 ? true : false); - port_id = (tx ? j - 16 : j); - regmap_read(wcd->if_regmap, - WCD9335_SLIM_PGD_PORT_INT_RX_SOURCE0 + j, &val); - if (val) { - if (!tx) - reg = WCD9335_SLIM_PGD_PORT_INT_EN0 + - (port_id / 8); - else - reg = WCD9335_SLIM_PGD_PORT_INT_TX_EN0 + - (port_id / 8); - regmap_read( - wcd->if_regmap, reg, &int_val); - /* - * Ignore interrupts for ports for which the - * interrupts are not specifically enabled. - */ - if (!(int_val & (1 << (port_id % 8)))) - continue; - } - if (val & WCD9335_SLIM_IRQ_OVERFLOW) - dev_err_ratelimited(wcd->dev, - "%s: overflow error on %s port %d, value %x\n", - __func__, (tx ? "TX" : "RX"), port_id, val); - if (val & WCD9335_SLIM_IRQ_UNDERFLOW) - dev_err_ratelimited(wcd->dev, - "%s: underflow error on %s port %d, value %x\n", - __func__, (tx ? "TX" : "RX"), port_id, val); - if ((val & WCD9335_SLIM_IRQ_OVERFLOW) || - (val & WCD9335_SLIM_IRQ_UNDERFLOW)) { - if (!tx) - reg = WCD9335_SLIM_PGD_PORT_INT_EN0 + - (port_id / 8); - else - reg = WCD9335_SLIM_PGD_PORT_INT_TX_EN0 + - (port_id / 8); - regmap_read( - wcd->if_regmap, reg, &int_val); - if (int_val & (1 << (port_id % 8))) { - int_val = int_val ^ (1 << (port_id % 8)); - regmap_write(wcd->if_regmap, - reg, int_val); - } - } - - regmap_write(wcd->if_regmap, - WCD9335_SLIM_PGD_PORT_INT_CLR_RX_0 + (j / 8), - BIT(j % 8)); - } - - return IRQ_HANDLED; -} - -static int wcd9335_setup_irqs(struct wcd9335_codec *wcd) -{ - int slim_irq = regmap_irq_get_virq(wcd->irq_data, WCD9335_IRQ_SLIMBUS); - int i, ret = 0; - - ret = request_threaded_irq(slim_irq, NULL, wcd9335_slimbus_irq, - IRQF_TRIGGER_RISING, "SLIMBus Slave", wcd); - if (ret) { - dev_err(wcd->dev, "Failed to request SLIMBUS irq\n"); - return ret; - } - - /* enable interrupts on all slave ports */ - for (i = 0; i < WCD9335_SLIM_NUM_PORT_REG; i++) - regmap_write(wcd->if_regmap, WCD9335_SLIM_PGD_PORT_INT_EN0 + i, - 0xFF); - - return ret; -} - -static void wcd9335_cdc_sido_ccl_enable(struct wcd9335_codec *wcd, - bool ccl_flag) -{ - struct snd_soc_component *comp = wcd->component; - - if (ccl_flag) { - if (++wcd->sido_ccl_cnt == 1) - snd_soc_component_write(comp, WCD9335_SIDO_SIDO_CCL_10, - WCD9335_SIDO_SIDO_CCL_DEF_VALUE); - } else { - if (wcd->sido_ccl_cnt == 0) { - dev_err(wcd->dev, "sido_ccl already disabled\n"); - return; - } - if (--wcd->sido_ccl_cnt == 0) - snd_soc_component_write(comp, WCD9335_SIDO_SIDO_CCL_10, - WCD9335_SIDO_SIDO_CCL_10_ICHARG_PWR_SEL_C320FF); - } -} - -static int wcd9335_enable_master_bias(struct wcd9335_codec *wcd) -{ - wcd->master_bias_users++; - if (wcd->master_bias_users == 1) { - regmap_update_bits(wcd->regmap, WCD9335_ANA_BIAS, - WCD9335_ANA_BIAS_EN_MASK, - WCD9335_ANA_BIAS_ENABLE); - regmap_update_bits(wcd->regmap, WCD9335_ANA_BIAS, - WCD9335_ANA_BIAS_PRECHRG_EN_MASK, - WCD9335_ANA_BIAS_PRECHRG_ENABLE); - /* - * 1ms delay is required after pre-charge is enabled - * as per HW requirement - */ - usleep_range(1000, 1100); - regmap_update_bits(wcd->regmap, WCD9335_ANA_BIAS, - WCD9335_ANA_BIAS_PRECHRG_EN_MASK, - WCD9335_ANA_BIAS_PRECHRG_DISABLE); - regmap_update_bits(wcd->regmap, WCD9335_ANA_BIAS, - WCD9335_ANA_BIAS_PRECHRG_CTL_MODE, - WCD9335_ANA_BIAS_PRECHRG_CTL_MODE_MANUAL); - } - - return 0; -} - -static int wcd9335_enable_mclk(struct wcd9335_codec *wcd) -{ - /* Enable mclk requires master bias to be enabled first */ - if (wcd->master_bias_users <= 0) - return -EINVAL; - - if (((wcd->clk_mclk_users == 0) && (wcd->clk_type == WCD_CLK_MCLK)) || - ((wcd->clk_mclk_users > 0) && (wcd->clk_type != WCD_CLK_MCLK))) { - dev_err(wcd->dev, "Error enabling MCLK, clk_type: %d\n", - wcd->clk_type); - return -EINVAL; - } - - if (++wcd->clk_mclk_users == 1) { - regmap_update_bits(wcd->regmap, WCD9335_ANA_CLK_TOP, - WCD9335_ANA_CLK_EXT_CLKBUF_EN_MASK, - WCD9335_ANA_CLK_EXT_CLKBUF_ENABLE); - regmap_update_bits(wcd->regmap, WCD9335_ANA_CLK_TOP, - WCD9335_ANA_CLK_MCLK_SRC_MASK, - WCD9335_ANA_CLK_MCLK_SRC_EXTERNAL); - regmap_update_bits(wcd->regmap, WCD9335_ANA_CLK_TOP, - WCD9335_ANA_CLK_MCLK_EN_MASK, - WCD9335_ANA_CLK_MCLK_ENABLE); - regmap_update_bits(wcd->regmap, - WCD9335_CDC_CLK_RST_CTRL_FS_CNT_CONTROL, - WCD9335_CDC_CLK_RST_CTRL_FS_CNT_EN_MASK, - WCD9335_CDC_CLK_RST_CTRL_FS_CNT_ENABLE); - regmap_update_bits(wcd->regmap, - WCD9335_CDC_CLK_RST_CTRL_MCLK_CONTROL, - WCD9335_CDC_CLK_RST_CTRL_MCLK_EN_MASK, - WCD9335_CDC_CLK_RST_CTRL_MCLK_ENABLE); - /* - * 10us sleep is required after clock is enabled - * as per HW requirement - */ - usleep_range(10, 15); - } - - wcd->clk_type = WCD_CLK_MCLK; - - return 0; -} - -static int wcd9335_disable_mclk(struct wcd9335_codec *wcd) -{ - if (wcd->clk_mclk_users <= 0) - return -EINVAL; - - if (--wcd->clk_mclk_users == 0) { - if (wcd->clk_rco_users > 0) { - /* MCLK to RCO switch */ - regmap_update_bits(wcd->regmap, WCD9335_ANA_CLK_TOP, - WCD9335_ANA_CLK_MCLK_SRC_MASK, - WCD9335_ANA_CLK_MCLK_SRC_RCO); - wcd->clk_type = WCD_CLK_RCO; - } else { - regmap_update_bits(wcd->regmap, WCD9335_ANA_CLK_TOP, - WCD9335_ANA_CLK_MCLK_EN_MASK, - WCD9335_ANA_CLK_MCLK_DISABLE); - wcd->clk_type = WCD_CLK_OFF; - } - - regmap_update_bits(wcd->regmap, WCD9335_ANA_CLK_TOP, - WCD9335_ANA_CLK_EXT_CLKBUF_EN_MASK, - WCD9335_ANA_CLK_EXT_CLKBUF_DISABLE); - } - - return 0; -} - -static int wcd9335_disable_master_bias(struct wcd9335_codec *wcd) -{ - if (wcd->master_bias_users <= 0) - return -EINVAL; - - wcd->master_bias_users--; - if (wcd->master_bias_users == 0) { - regmap_update_bits(wcd->regmap, WCD9335_ANA_BIAS, - WCD9335_ANA_BIAS_EN_MASK, - WCD9335_ANA_BIAS_DISABLE); - regmap_update_bits(wcd->regmap, WCD9335_ANA_BIAS, - WCD9335_ANA_BIAS_PRECHRG_CTL_MODE, - WCD9335_ANA_BIAS_PRECHRG_CTL_MODE_MANUAL); - } - return 0; -} - -static int wcd9335_cdc_req_mclk_enable(struct wcd9335_codec *wcd, - bool enable) -{ - int ret = 0; - - if (enable) { - wcd9335_cdc_sido_ccl_enable(wcd, true); - ret = clk_prepare_enable(wcd->mclk); - if (ret) { - dev_err(wcd->dev, "%s: ext clk enable failed\n", - __func__); - goto err; - } - /* get BG */ - wcd9335_enable_master_bias(wcd); - /* get MCLK */ - wcd9335_enable_mclk(wcd); - - } else { - /* put MCLK */ - wcd9335_disable_mclk(wcd); - /* put BG */ - wcd9335_disable_master_bias(wcd); - clk_disable_unprepare(wcd->mclk); - wcd9335_cdc_sido_ccl_enable(wcd, false); - } -err: - return ret; -} - -static void wcd9335_codec_apply_sido_voltage(struct wcd9335_codec *wcd, - enum wcd9335_sido_voltage req_mv) -{ - struct snd_soc_component *comp = wcd->component; - int vout_d_val; - - if (req_mv == wcd->sido_voltage) - return; - - /* compute the vout_d step value */ - vout_d_val = WCD9335_CALCULATE_VOUT_D(req_mv) & - WCD9335_ANA_BUCK_VOUT_MASK; - snd_soc_component_write(comp, WCD9335_ANA_BUCK_VOUT_D, vout_d_val); - snd_soc_component_update_bits(comp, WCD9335_ANA_BUCK_CTL, - WCD9335_ANA_BUCK_CTL_RAMP_START_MASK, - WCD9335_ANA_BUCK_CTL_RAMP_START_ENABLE); - - /* 1 msec sleep required after SIDO Vout_D voltage change */ - usleep_range(1000, 1100); - wcd->sido_voltage = req_mv; - snd_soc_component_update_bits(comp, WCD9335_ANA_BUCK_CTL, - WCD9335_ANA_BUCK_CTL_RAMP_START_MASK, - WCD9335_ANA_BUCK_CTL_RAMP_START_DISABLE); -} - -static int wcd9335_codec_update_sido_voltage(struct wcd9335_codec *wcd, - enum wcd9335_sido_voltage req_mv) -{ - int ret = 0; - - /* enable mclk before setting SIDO voltage */ - ret = wcd9335_cdc_req_mclk_enable(wcd, true); - if (ret) { - dev_err(wcd->dev, "Ext clk enable failed\n"); - goto err; - } - - wcd9335_codec_apply_sido_voltage(wcd, req_mv); - wcd9335_cdc_req_mclk_enable(wcd, false); - -err: - return ret; -} - -static int _wcd9335_codec_enable_mclk(struct snd_soc_component *component, - int enable) -{ - struct wcd9335_codec *wcd = dev_get_drvdata(component->dev); - int ret; - - if (enable) { - ret = wcd9335_cdc_req_mclk_enable(wcd, true); - if (ret) - return ret; - - wcd9335_codec_apply_sido_voltage(wcd, - SIDO_VOLTAGE_NOMINAL_MV); - } else { - wcd9335_codec_update_sido_voltage(wcd, - wcd->sido_voltage); - wcd9335_cdc_req_mclk_enable(wcd, false); - } - - return 0; -} - -static void wcd9335_enable_sido_buck(struct snd_soc_component *component) -{ - struct wcd9335_codec *wcd = dev_get_drvdata(component->dev); - - snd_soc_component_update_bits(component, WCD9335_ANA_RCO, - WCD9335_ANA_RCO_BG_EN_MASK, - WCD9335_ANA_RCO_BG_ENABLE); - snd_soc_component_update_bits(component, WCD9335_ANA_BUCK_CTL, - WCD9335_ANA_BUCK_CTL_VOUT_D_IREF_MASK, - WCD9335_ANA_BUCK_CTL_VOUT_D_IREF_EXT); - /* 100us sleep needed after IREF settings */ - usleep_range(100, 110); - snd_soc_component_update_bits(component, WCD9335_ANA_BUCK_CTL, - WCD9335_ANA_BUCK_CTL_VOUT_D_VREF_MASK, - WCD9335_ANA_BUCK_CTL_VOUT_D_VREF_EXT); - /* 100us sleep needed after VREF settings */ - usleep_range(100, 110); - wcd->sido_input_src = SIDO_SOURCE_RCO_BG; -} - -static int wcd9335_enable_efuse_sensing(struct snd_soc_component *comp) -{ - _wcd9335_codec_enable_mclk(comp, true); - snd_soc_component_update_bits(comp, - WCD9335_CHIP_TIER_CTRL_EFUSE_CTL, - WCD9335_CHIP_TIER_CTRL_EFUSE_EN_MASK, - WCD9335_CHIP_TIER_CTRL_EFUSE_ENABLE); - /* - * 5ms sleep required after enabling efuse control - * before checking the status. - */ - usleep_range(5000, 5500); - - if (!(snd_soc_component_read32(comp, - WCD9335_CHIP_TIER_CTRL_EFUSE_STATUS) & - WCD9335_CHIP_TIER_CTRL_EFUSE_EN_MASK)) - WARN(1, "%s: Efuse sense is not complete\n", __func__); - - wcd9335_enable_sido_buck(comp); - _wcd9335_codec_enable_mclk(comp, false); - - return 0; -} - -static void wcd9335_codec_init(struct snd_soc_component *component) -{ - struct wcd9335_codec *wcd = dev_get_drvdata(component->dev); - int i; - - /* ungate MCLK and set clk rate */ - regmap_update_bits(wcd->regmap, WCD9335_CODEC_RPM_CLK_GATE, - WCD9335_CODEC_RPM_CLK_GATE_MCLK_GATE_MASK, 0); - - regmap_update_bits(wcd->regmap, WCD9335_CODEC_RPM_CLK_MCLK_CFG, - WCD9335_CODEC_RPM_CLK_MCLK_CFG_MCLK_MASK, - WCD9335_CODEC_RPM_CLK_MCLK_CFG_9P6MHZ); - - for (i = 0; i < ARRAY_SIZE(wcd9335_codec_reg_init_common_val); i++) - snd_soc_component_update_bits(component, - wcd9335_codec_reg_init_common_val[i].reg, - wcd9335_codec_reg_init_common_val[i].mask, - wcd9335_codec_reg_init_common_val[i].val); - - if (WCD9335_IS_2_0(wcd->version)) { - for (i = 0; i < ARRAY_SIZE(wcd9335_codec_reg_init_val_2_0); i++) - snd_soc_component_update_bits(component, - wcd9335_codec_reg_init_val_2_0[i].reg, - wcd9335_codec_reg_init_val_2_0[i].mask, - wcd9335_codec_reg_init_val_2_0[i].val); - } - - wcd9335_enable_efuse_sensing(component); -} - -static int wcd9335_codec_probe(struct snd_soc_component *component) -{ - struct wcd9335_codec *wcd = dev_get_drvdata(component->dev); - int i; - - snd_soc_component_init_regmap(component, wcd->regmap); - wcd->component = component; - - wcd9335_codec_init(component); - - for (i = 0; i < NUM_CODEC_DAIS; i++) - INIT_LIST_HEAD(&wcd->dai[i].slim_ch_list); - - return wcd9335_setup_irqs(wcd); -} - -static void wcd9335_codec_remove(struct snd_soc_component *comp) -{ - struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); - - free_irq(regmap_irq_get_virq(wcd->irq_data, WCD9335_IRQ_SLIMBUS), wcd); -} - -static int wcd9335_codec_set_sysclk(struct snd_soc_component *comp, - int clk_id, int source, - unsigned int freq, int dir) -{ - struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev); - - wcd->mclk_rate = freq; - - if (wcd->mclk_rate == WCD9335_MCLK_CLK_12P288MHZ) - snd_soc_component_update_bits(comp, - WCD9335_CODEC_RPM_CLK_MCLK_CFG, - WCD9335_CODEC_RPM_CLK_MCLK_CFG_MCLK_MASK, - WCD9335_CODEC_RPM_CLK_MCLK_CFG_12P288MHZ); - else if (wcd->mclk_rate == WCD9335_MCLK_CLK_9P6MHZ) - snd_soc_component_update_bits(comp, - WCD9335_CODEC_RPM_CLK_MCLK_CFG, - WCD9335_CODEC_RPM_CLK_MCLK_CFG_MCLK_MASK, - WCD9335_CODEC_RPM_CLK_MCLK_CFG_9P6MHZ); - - return clk_set_rate(wcd->mclk, freq); -} - -static const struct snd_soc_component_driver wcd9335_component_drv = { - .probe = wcd9335_codec_probe, - .remove = wcd9335_codec_remove, - .set_sysclk = wcd9335_codec_set_sysclk, -}; - -static int wcd9335_probe(struct platform_device *pdev) -{ - struct wcd9335 *pdata = dev_get_drvdata(pdev->dev.parent); - struct device *dev = &pdev->dev; - struct wcd9335_codec *wcd; - - wcd = devm_kzalloc(dev, sizeof(*wcd), GFP_KERNEL); - if (!wcd) - return -ENOMEM; - - dev_set_drvdata(dev, wcd); - - memcpy(wcd->rx_chs, wcd9335_rx_chs, sizeof(wcd9335_rx_chs)); - - wcd->regmap = pdata->regmap; - wcd->if_regmap = pdata->ifd_regmap; - wcd->slim = pdata->slim; - wcd->slim_ifd = pdata->slim_ifd; - wcd->irq_data = pdata->irq_data; - wcd->version = pdata->version; - wcd->intf_type = pdata->intf_type; - wcd->dev = dev; - wcd->mclk = pdata->mclk; - wcd->native_clk = pdata->native_clk; - wcd->sido_input_src = SIDO_SOURCE_INTERNAL; - wcd->sido_voltage = SIDO_VOLTAGE_NOMINAL_MV; - - return devm_snd_soc_register_component(dev, &wcd9335_component_drv, - wcd9335_slim_dais, - ARRAY_SIZE(wcd9335_slim_dais)); -} - -static struct platform_driver wcd9335_codec_driver = { - .probe = wcd9335_probe, - .driver = { - .name = "wcd9335-codec", - }, -}; -module_platform_driver(wcd9335_codec_driver); -MODULE_DESCRIPTION("WCD9335 Codec driver"); -MODULE_LICENSE("GPL v2"); -- 2.18.0

1 0

[alsa-devel] [PATCH v2] ASoC: soc-pcm: Use delay set in component pointer function
by Akshu Agrawal 01 Aug '18

01 Aug '18

Take into account the base delay set in pointer callback. There are cases where a pointer function populates runtime->delay, such as: ./sound/pci/hda/hda_controller.c ./sound/soc/intel/atom/sst-mfld-platform-pcm.c This delay was getting lost and was overwritten by delays from codec or cpu dai delay function if exposed. Now, Total delay = base delay + cpu_dai delay + codec_dai delay Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- sound/soc/soc-pcm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 98be04b..e8b98bfd 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1179,6 +1179,9 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) snd_pcm_sframes_t codec_delay = 0; int i; + /* clearing the previous total delay */ + runtime->delay = 0; + for_each_rtdcom(rtd, rtdcom) { component = rtdcom->component; @@ -1190,6 +1193,8 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream) offset = component->driver->ops->pointer(substream); break; } + /* base delay if assigned in pointer callback */ + delay = runtime->delay; if (cpu_dai->driver->ops->delay) delay += cpu_dai->driver->ops->delay(substream, cpu_dai); -- 1.9.1

3 2

Re: [alsa-devel] [PATCH 3/9] ALSA: emu10k1: remove redundant variable attn
by Walter Harms 01 Aug '18

01 Aug '18

From: Colin Ian King <colin.king(a)canonical.com> Variable attn is being assigned but is never used hence it is redundant and can be removed. Cleans up clang warning: warning: variable 'attn' set but not used [-Wunused-but-set-variable] Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/pci/emu10k1/emupcm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 69f9b100bd24..26f6eda3e766 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -290,7 +290,7 @@ static void snd_emu10k1_pcm_init_voice(struct snd_emu10k1 *emu, struct snd_pcm_runtime *runtime = substream->runtime; unsigned int silent_page, tmp; int voice, stereo, w_16; - unsigned char attn, send_amount[8]; + unsigned char send_amount[8]; unsigned char send_routing[8]; unsigned long flags; unsigned int pitch_target; @@ -313,7 +313,6 @@ static void snd_emu10k1_pcm_init_voice(struct snd_emu10k1 *emu, /* volume parameters */ if (extra) { - attn = 0; memset(send_routing, 0, sizeof(send_routing)); send_routing[0] = 0; send_routing[1] = 1; IMHO, this code is a bit fishy. The memset() sould go in the init section and in the else branch tmp is set, maybe its an idea to set it here also (for symmetry) just my 2 cents, re, wh -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

2 1

[alsa-devel] Applied "ASoC: qcom: dt-bindings: Add sdm845 machine bindings" to the asoc tree
by Mark Brown 01 Aug '18

01 Aug '18

The patch ASoC: qcom: dt-bindings: Add sdm845 machine bindings has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 00bc22e3eea0346b594442331df53d0d1e7104dd Mon Sep 17 00:00:00 2001 From: Rohit kumar <rohitkr(a)codeaurora.org> Date: Wed, 1 Aug 2018 14:31:06 +0530 Subject: [PATCH] ASoC: qcom: dt-bindings: Add sdm845 machine bindings Add devicetree bindings documentation file for SDM845 sound card. Reviewed-by: Rob Herring <robh(a)kernel.org> Signed-off-by: Rohit kumar <rohitkr(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- .../devicetree/bindings/sound/qcom,sdm845.txt | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,sdm845.txt diff --git a/Documentation/devicetree/bindings/sound/qcom,sdm845.txt b/Documentation/devicetree/bindings/sound/qcom,sdm845.txt new file mode 100644 index 000000000000..408c4837e6d5 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,sdm845.txt @@ -0,0 +1,80 @@ +* Qualcomm Technologies Inc. SDM845 ASoC sound card driver + +This binding describes the SDM845 sound card, which uses qdsp for audio. + +- compatible: + Usage: required + Value type: <stringlist> + Definition: must be "qcom,sdm845-sndcard" + +- audio-routing: + Usage: Optional + Value type: <stringlist> + Definition: A list of the connections between audio components. + Each entry is a pair of strings, the first being the + connection's sink, the second being the connection's + source. Valid names could be power supplies, MicBias + of codec and the jacks on the board. + +- model: + Usage: required + Value type: <stringlist> + Definition: The user-visible name of this sound card. + += dailinks +Each subnode of sndcard represents either a dailink, and subnodes of each +dailinks would be cpu/codec/platform dais. + +- link-name: + Usage: required + Value type: <string> + Definition: User friendly name for dai link + += CPU, PLATFORM, CODEC dais subnodes +- cpu: + Usage: required + Value type: <subnode> + Definition: cpu dai sub-node + +- codec: + Usage: required + Value type: <subnode> + Definition: codec dai sub-node + +- platform: + Usage: Optional + Value type: <subnode> + Definition: platform dai sub-node + +- sound-dai: + Usage: required + Value type: <phandle> + Definition: dai phandle/s and port of CPU/CODEC/PLATFORM node. + +Example: + +audio { + compatible = "qcom,sdm845-sndcard"; + model = "sdm845-snd-card"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pri_mi2s_active &pri_mi2s_ws_active>; + pinctrl-1 = <&pri_mi2s_sleep &pri_mi2s_ws_sleep>; + + mm1-dai-link { + link-name = "MultiMedia1"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + pri-mi2s-dai-link { + link-name = "PRI MI2S Playback"; + cpu { + sound-dai = <&q6afedai PRIMARY_MI2S_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + }; +}; -- 2.18.0

1 0

[alsa-devel] Applied "ASoC: dt-bindings: Update dt binding name for apq8096" to the asoc tree
by Mark Brown 01 Aug '18

01 Aug '18

The patch ASoC: dt-bindings: Update dt binding name for apq8096 has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 0c901e8cea15ba1e318d8f4342f7dc27a80b5978 Mon Sep 17 00:00:00 2001 From: Rohit kumar <rohitkr(a)codeaurora.org> Date: Wed, 1 Aug 2018 14:31:07 +0530 Subject: [PATCH] ASoC: dt-bindings: Update dt binding name for apq8096 Remove qcom prefix from machine driver dt bindings of apq8096 SoC. Acked-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Reviewed-by: Rob Herring <robh(a)kernel.org> Signed-off-by: Rohit kumar <rohitkr(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- .../devicetree/bindings/sound/qcom,apq8096.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8096.txt b/Documentation/devicetree/bindings/sound/qcom,apq8096.txt index aa54e49fc8a2..20bc034f6c01 100644 --- a/Documentation/devicetree/bindings/sound/qcom,apq8096.txt +++ b/Documentation/devicetree/bindings/sound/qcom,apq8096.txt @@ -7,7 +7,7 @@ This binding describes the APQ8096 sound card, which uses qdsp for audio. Value type: <stringlist> Definition: must be "qcom,apq8096-sndcard" -- qcom,audio-routing: +- audio-routing: Usage: Optional Value type: <stringlist> Definition: A list of the connections between audio components. @@ -49,6 +49,12 @@ This binding describes the APQ8096 sound card, which uses qdsp for audio. "DMIC1" "DMIC2" "DMIC3" + +- model: + Usage: required + Value type: <stringlist> + Definition: The user-visible name of this sound card. + = dailinks Each subnode of sndcard represents either a dailink, and subnodes of each dailinks would be cpu/codec/platform dais. @@ -79,11 +85,16 @@ dailinks would be cpu/codec/platform dais. Value type: <phandle with arguments> Definition: dai phandle/s and port of CPU/CODEC/PLATFORM node. +Obsolete: + qcom,model: String for soundcard name (Use model instead) + qcom,audio-routing: A list of the connections between audio components. + (Use audio-routing instead) + Example: audio { compatible = "qcom,apq8096-sndcard"; - qcom,model = "DB820c"; + model = "DB820c"; mm1-dai-link { link-name = "MultiMedia1"; -- 2.18.0

1 0

[alsa-devel] Applied "ASoC: qcom: Add support to parse common audio device nodes" to the asoc tree
by Mark Brown 01 Aug '18

01 Aug '18

The patch ASoC: qcom: Add support to parse common audio device nodes has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c25e295cd77b37903ddc9ee27384e17aad08f27c Mon Sep 17 00:00:00 2001 From: Rohit kumar <rohitkr(a)codeaurora.org> Date: Wed, 1 Aug 2018 14:31:08 +0530 Subject: [PATCH] ASoC: qcom: Add support to parse common audio device nodes This adds support to parse cpu, platform and codec device nodes and add them in dai-links. Also, update apq8096 machine driver to use the common API. Acked-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Rohit kumar <rohitkr(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/qcom/Makefile | 2 +- sound/soc/qcom/apq8096.c | 111 ++++---------------------------------- sound/soc/qcom/common.c | 112 +++++++++++++++++++++++++++++++++++++++ sound/soc/qcom/common.h | 12 +++++ 4 files changed, 136 insertions(+), 101 deletions(-) create mode 100644 sound/soc/qcom/common.c create mode 100644 sound/soc/qcom/common.h diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile index 206945bb9ba1..fefecc072265 100644 --- a/sound/soc/qcom/Makefile +++ b/sound/soc/qcom/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_SND_SOC_LPASS_APQ8016) += snd-soc-lpass-apq8016.o # Machine snd-soc-storm-objs := storm.o snd-soc-apq8016-sbc-objs := apq8016_sbc.o -snd-soc-apq8096-objs := apq8096.o +snd-soc-apq8096-objs := apq8096.o common.o obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c index a56156281c8d..1e4a90d59228 100644 --- a/sound/soc/qcom/apq8096.c +++ b/sound/soc/qcom/apq8096.c @@ -9,6 +9,7 @@ #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/pcm.h> +#include "common.h" static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) @@ -24,109 +25,16 @@ static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } -static int apq8096_sbc_parse_of(struct snd_soc_card *card) +static void apq8096_add_be_ops(struct snd_soc_card *card) { - struct device_node *np; - struct device_node *codec = NULL; - struct device_node *platform = NULL; - struct device_node *cpu = NULL; - struct device *dev = card->dev; - struct snd_soc_dai_link *link; - int ret, num_links; - - ret = snd_soc_of_parse_card_name(card, "qcom,model"); - if (ret) { - dev_err(dev, "Error parsing card name: %d\n", ret); - return ret; - } - - /* DAPM routes */ - if (of_property_read_bool(dev->of_node, "qcom,audio-routing")) { - ret = snd_soc_of_parse_audio_routing(card, - "qcom,audio-routing"); - if (ret) - return ret; - } - - /* Populate links */ - num_links = of_get_child_count(dev->of_node); - - /* Allocate the DAI link array */ - card->dai_link = kcalloc(num_links, sizeof(*link), GFP_KERNEL); - if (!card->dai_link) - return -ENOMEM; + struct snd_soc_dai_link *link = card->dai_link; + int i, num_links = card->num_links; - card->num_links = num_links; - link = card->dai_link; - - for_each_child_of_node(dev->of_node, np) { - cpu = of_get_child_by_name(np, "cpu"); - if (!cpu) { - dev_err(dev, "Can't find cpu DT node\n"); - ret = -EINVAL; - goto err; - } - - link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0); - if (!link->cpu_of_node) { - dev_err(card->dev, "error getting cpu phandle\n"); - ret = -EINVAL; - goto err; - } - - ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name); - if (ret) { - dev_err(card->dev, "error getting cpu dai name\n"); - goto err; - } - - platform = of_get_child_by_name(np, "platform"); - codec = of_get_child_by_name(np, "codec"); - if (codec && platform) { - link->platform_of_node = of_parse_phandle(platform, - "sound-dai", - 0); - if (!link->platform_of_node) { - dev_err(card->dev, "platform dai not found\n"); - ret = -EINVAL; - goto err; - } - - ret = snd_soc_of_get_dai_link_codecs(dev, codec, link); - if (ret < 0) { - dev_err(card->dev, "codec dai not found\n"); - goto err; - } - link->no_pcm = 1; - link->ignore_pmdown_time = 1; + for (i = 0; i < num_links; i++) { + if (link->no_pcm == 1) link->be_hw_params_fixup = apq8096_be_hw_params_fixup; - } else { - link->platform_of_node = link->cpu_of_node; - link->codec_dai_name = "snd-soc-dummy-dai"; - link->codec_name = "snd-soc-dummy"; - link->dynamic = 1; - } - - link->ignore_suspend = 1; - ret = of_property_read_string(np, "link-name", &link->name); - if (ret) { - dev_err(card->dev, "error getting codec dai_link name\n"); - goto err; - } - - link->dpcm_playback = 1; - link->dpcm_capture = 1; - link->stream_name = link->name; link++; } - - return 0; -err: - of_node_put(cpu); - of_node_put(codec); - of_node_put(platform); - kfree(card->dai_link); - return ret; } static int apq8096_platform_probe(struct platform_device *pdev) @@ -142,18 +50,21 @@ static int apq8096_platform_probe(struct platform_device *pdev) card->dev = dev; card->auto_bind = true; dev_set_drvdata(dev, card); - ret = apq8096_sbc_parse_of(card); + ret = qcom_snd_parse_of(card); if (ret) { dev_err(dev, "Error parsing OF data\n"); goto err; } + apq8096_add_be_ops(card); ret = snd_soc_register_card(card); if (ret) - goto err; + goto err_card_register; return 0; +err_card_register: + kfree(card->dai_link); err: kfree(card); return ret; diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c new file mode 100644 index 000000000000..eb1b9da05dd4 --- /dev/null +++ b/sound/soc/qcom/common.c @@ -0,0 +1,112 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2018, Linaro Limited. +// Copyright (c) 2018, The Linux Foundation. All rights reserved. + +#include <linux/module.h> +#include "common.h" + +int qcom_snd_parse_of(struct snd_soc_card *card) +{ + struct device_node *np; + struct device_node *codec = NULL; + struct device_node *platform = NULL; + struct device_node *cpu = NULL; + struct device *dev = card->dev; + struct snd_soc_dai_link *link; + int ret, num_links; + + ret = snd_soc_of_parse_card_name(card, "model"); + if (ret) { + dev_err(dev, "Error parsing card name: %d\n", ret); + return ret; + } + + /* DAPM routes */ + if (of_property_read_bool(dev->of_node, "audio-routing")) { + ret = snd_soc_of_parse_audio_routing(card, + "audio-routing"); + if (ret) + return ret; + } + + /* Populate links */ + num_links = of_get_child_count(dev->of_node); + + /* Allocate the DAI link array */ + card->dai_link = kcalloc(num_links, sizeof(*link), GFP_KERNEL); + if (!card->dai_link) + return -ENOMEM; + + card->num_links = num_links; + link = card->dai_link; + for_each_child_of_node(dev->of_node, np) { + cpu = of_get_child_by_name(np, "cpu"); + if (!cpu) { + dev_err(dev, "Can't find cpu DT node\n"); + ret = -EINVAL; + goto err; + } + + link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0); + if (!link->cpu_of_node) { + dev_err(card->dev, "error getting cpu phandle\n"); + ret = -EINVAL; + goto err; + } + + ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name); + if (ret) { + dev_err(card->dev, "error getting cpu dai name\n"); + goto err; + } + + platform = of_get_child_by_name(np, "platform"); + codec = of_get_child_by_name(np, "codec"); + if (codec && platform) { + link->platform_of_node = of_parse_phandle(platform, + "sound-dai", + 0); + if (!link->platform_of_node) { + dev_err(card->dev, "platform dai not found\n"); + ret = -EINVAL; + goto err; + } + + ret = snd_soc_of_get_dai_link_codecs(dev, codec, link); + if (ret < 0) { + dev_err(card->dev, "codec dai not found\n"); + goto err; + } + link->no_pcm = 1; + link->ignore_pmdown_time = 1; + } else { + link->platform_of_node = link->cpu_of_node; + link->codec_dai_name = "snd-soc-dummy-dai"; + link->codec_name = "snd-soc-dummy"; + link->dynamic = 1; + } + + link->ignore_suspend = 1; + ret = of_property_read_string(np, "link-name", &link->name); + if (ret) { + dev_err(card->dev, "error getting codec dai_link name\n"); + goto err; + } + + link->dpcm_playback = 1; + link->dpcm_capture = 1; + link->stream_name = link->name; + link++; + } + + return 0; +err: + of_node_put(cpu); + of_node_put(codec); + of_node_put(platform); + kfree(card->dai_link); + return ret; +} +EXPORT_SYMBOL(qcom_snd_parse_of); + +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/qcom/common.h b/sound/soc/qcom/common.h new file mode 100644 index 000000000000..ad5d2cf27459 --- /dev/null +++ b/sound/soc/qcom/common.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +// Copyright (c) 2018, The Linux Foundation. All rights reserved. + +#ifndef __QCOM_SND_COMMON_H__ +#define __QCOM_SND_COMMON_H__ + +#include <linux/component.h> +#include <sound/soc.h> + +int qcom_snd_parse_of(struct snd_soc_card *card); + +#endif -- 2.18.0

1 0

[alsa-devel] [PATCH v5 0/4] Add support for audio on SDM845 SoC
by Rohit kumar 01 Aug '18

01 Aug '18

This provides initial patchset to support audio on Qualcomm Techonologies Inc. SDM845 SoC. Currently, it supports audio playback/capture over Primary MI2S and Quaternary TDM ports. Changes since v4: - Used snd_mask_set_format() instead of snd_mask_set() to avoid sparse warning. Rohit kumar (4): ASoC: qcom: dt-bindings: Add sdm845 machine bindings ASoC: dt-bindings: Update dt binding name for apq8096 ASoC: qcom: Add support to parse common audio device nodes ASoC: qcom: add sdm845 sound card support .../devicetree/bindings/sound/qcom,apq8096.txt | 15 +- .../devicetree/bindings/sound/qcom,sdm845.txt | 80 ++++++ sound/soc/qcom/Kconfig | 8 + sound/soc/qcom/Makefile | 4 +- sound/soc/qcom/apq8096.c | 111 +------- sound/soc/qcom/common.c | 112 ++++++++ sound/soc/qcom/common.h | 12 + sound/soc/qcom/sdm845.c | 286 +++++++++++++++++++++ 8 files changed, 525 insertions(+), 103 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,sdm845.txt create mode 100644 sound/soc/qcom/common.c create mode 100644 sound/soc/qcom/common.h create mode 100644 sound/soc/qcom/sdm845.c -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

2 6

[alsa-devel] [PATCH v4 0/4] Add support for audio on SDM845 SoC
by Rohit kumar 01 Aug '18

01 Aug '18

This provides initial patchset to support audio on Qualcomm Techonologies Inc. SDM845 SoC. Currently, it supports audio playback/capture over Primary MI2S and Quaternary TDM ports. Changes since v3: - Added Module_license in common.c - Merged apq8096.c machine driver change with common api patch - Addressed comments by Srinivas, Mark and Vinod. Rohit kumar (4): ASoC: qcom: dt-bindings: Add sdm845 machine bindings ASoC: dt-bindings: Update dt binding name for apq8096 ASoC: qcom: Add support to parse common audio device nodes ASoC: qcom: add sdm845 sound card support .../devicetree/bindings/sound/qcom,apq8096.txt | 15 +- .../devicetree/bindings/sound/qcom,sdm845.txt | 80 ++++++ sound/soc/qcom/Kconfig | 8 + sound/soc/qcom/Makefile | 4 +- sound/soc/qcom/apq8096.c | 111 +------- sound/soc/qcom/common.c | 112 ++++++++ sound/soc/qcom/common.h | 12 + sound/soc/qcom/sdm845.c | 286 +++++++++++++++++++++ 8 files changed, 525 insertions(+), 103 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/qcom,sdm845.txt create mode 100644 sound/soc/qcom/common.c create mode 100644 sound/soc/qcom/common.h create mode 100644 sound/soc/qcom/sdm845.c -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

4 9