* [PATCH 1/9] ASoC: max98927: Added TDM support
@ 2017-08-26 0:41 Ryan Lee
2017-08-26 0:41 ` [PATCH 2/9] ASoC: max98927: Added controls for Envelope tracking Ryan Lee
` (8 more replies)
0 siblings, 9 replies; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : Added code to support TDM mode
sound/soc/codecs/max98927.c | 141 ++++++++++++++++++++++++++++++++++++--------
sound/soc/codecs/max98927.h | 6 +-
2 files changed, 120 insertions(+), 27 deletions(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index b0380b5..951cc05 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -1,7 +1,7 @@
/*
* max98927.c -- MAX98927 ALSA Soc Audio driver
*
- * Copyright (C) 2016 Maxim Integrated Products
+ * Copyright (C) 2016-2017 Maxim Integrated Products
* Author: Ryan Lee <ryans.lee@maximintegrated.com>
*
* This program is free software; you can redistribute it and/or modify it
@@ -146,6 +146,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
struct max98927_priv *max98927 = snd_soc_codec_get_drvdata(codec);
unsigned int mode = 0;
unsigned int format = 0;
+ bool use_pdm = false;
unsigned int invert = 0;
dev_dbg(codec->dev, "%s: fmt 0x%08X\n", __func__, fmt);
@@ -187,22 +188,27 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
/* interface format */
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
- max98927->iface |= SND_SOC_DAIFMT_I2S;
format = MAX98927_PCM_FORMAT_I2S;
break;
case SND_SOC_DAIFMT_LEFT_J:
- max98927->iface |= SND_SOC_DAIFMT_LEFT_J;
format = MAX98927_PCM_FORMAT_LJ;
break;
+ case SND_SOC_DAIFMT_DSP_A:
+ format = MAX98927_PCM_FORMAT_TDM_MODE1;
+ break;
+ case SND_SOC_DAIFMT_DSP_B:
+ format = MAX98927_PCM_FORMAT_TDM_MODE0;
+ break;
case SND_SOC_DAIFMT_PDM:
- max98927->iface |= SND_SOC_DAIFMT_PDM;
+ use_pdm = true;
break;
default:
return -EINVAL;
}
+ max98927->iface = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
- /* pcm channel configuration */
- if (max98927->iface & (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_LEFT_J)) {
+ if (!use_pdm) {
+ /* pcm channel configuration */
regmap_update_bits(max98927->regmap,
MAX98927_R0018_PCM_RX_EN_A,
MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN,
@@ -217,13 +223,12 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
MAX98927_R003B_SPK_SRC_SEL,
MAX98927_SPK_SRC_MASK, 0);
- } else
regmap_update_bits(max98927->regmap,
- MAX98927_R0018_PCM_RX_EN_A,
- MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN, 0);
+ MAX98927_R0035_PDM_RX_CTRL,
+ MAX98927_PDM_RX_EN_MASK, 0);
- /* pdm channel configuration */
- if (max98927->iface & SND_SOC_DAIFMT_PDM) {
+ } else {
+ /* pdm channel configuration */
regmap_update_bits(max98927->regmap,
MAX98927_R0035_PDM_RX_CTRL,
MAX98927_PDM_RX_EN_MASK, 1);
@@ -231,10 +236,12 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
regmap_update_bits(max98927->regmap,
MAX98927_R003B_SPK_SRC_SEL,
MAX98927_SPK_SRC_MASK, 3);
- } else
+
regmap_update_bits(max98927->regmap,
- MAX98927_R0035_PDM_RX_CTRL,
- MAX98927_PDM_RX_EN_MASK, 0);
+ MAX98927_R0018_PCM_RX_EN_A,
+ MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN, 0);
+
+ }
return 0;
}
@@ -245,6 +252,21 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
13000000, 19200000,
};
+/* BCLKs per LRCLK */
+static const int bclk_sel_table[] = {
+ 32, 48, 64, 96, 128, 192, 256, 384, 512,
+};
+
+static int max98927_get_bclk_sel(int bclk)
+{
+ int i;
+ /* match BCLKs per LRCLK */
+ for (i = 0; i < ARRAY_SIZE(bclk_sel_table); i++) {
+ if (bclk_sel_table[i] == bclk)
+ return i + 2;
+ }
+ return 0;
+}
static int max98927_set_clock(struct max98927_priv *max98927,
struct snd_pcm_hw_params *params)
{
@@ -270,19 +292,17 @@ static int max98927_set_clock(struct max98927_priv *max98927,
i << MAX98927_PCM_MASTER_MODE_MCLK_RATE_SHIFT);
}
- switch (blr_clk_ratio) {
- case 32:
- value = 2;
- break;
- case 48:
- value = 3;
- break;
- case 64:
- value = 4;
- break;
- default:
+ if ((max98927->iface == SND_SOC_DAIFMT_DSP_A) ||
+ (max98927->iface == SND_SOC_DAIFMT_DSP_B))
+ return 0;
+
+ /* BCLK configuration */
+ value = max98927_get_bclk_sel(blr_clk_ratio);
+ if (!value) {
+ dev_err(codec->dev, "BCLK %d not supported\n", blr_clk_ratio);
return -EINVAL;
}
+
regmap_update_bits(max98927->regmap,
MAX98927_R0022_PCM_CLK_SETUP,
MAX98927_PCM_CLK_SETUP_BSEL_MASK,
@@ -386,6 +406,76 @@ static int max98927_dai_hw_params(struct snd_pcm_substream *substream,
return -EINVAL;
}
+static int max98927_dai_tdm_slot(struct snd_soc_dai *dai,
+ unsigned int tx_mask, unsigned int rx_mask,
+ int slots, int slot_width)
+{
+ struct snd_soc_codec *codec = dai->codec;
+ struct max98927_priv *max98927 = snd_soc_codec_get_drvdata(codec);
+ int bsel = 0;
+ unsigned int chan_sz = 0;
+
+ /* BCLK configuration */
+ bsel = max98927_get_bclk_sel(slots * slot_width);
+ if (bsel == 0) {
+ dev_err(codec->dev, "BCLK %d not supported\n",
+ slots * slot_width);
+ return -EINVAL;
+ }
+
+ regmap_update_bits(max98927->regmap,
+ MAX98927_R0022_PCM_CLK_SETUP,
+ MAX98927_PCM_CLK_SETUP_BSEL_MASK,
+ bsel);
+
+ /* Channel size configuration */
+ switch (slot_width) {
+ case 16:
+ chan_sz = MAX98927_PCM_MODE_CFG_CHANSZ_16;
+ break;
+ case 24:
+ chan_sz = MAX98927_PCM_MODE_CFG_CHANSZ_24;
+ break;
+ case 32:
+ chan_sz = MAX98927_PCM_MODE_CFG_CHANSZ_32;
+ break;
+ default:
+ dev_err(codec->dev, "format unsupported %d\n",
+ slot_width);
+ return -EINVAL;
+ }
+
+ regmap_update_bits(max98927->regmap,
+ MAX98927_R0020_PCM_MODE_CFG,
+ MAX98927_PCM_MODE_CFG_CHANSZ_MASK, chan_sz);
+
+ /* Rx slot configuration */
+ regmap_write(max98927->regmap,
+ MAX98927_R0018_PCM_RX_EN_A,
+ rx_mask & 0xFF);
+ regmap_write(max98927->regmap,
+ MAX98927_R0019_PCM_RX_EN_B,
+ (rx_mask & 0xFF00) >> 8);
+
+ /* Tx slot configuration */
+ regmap_write(max98927->regmap,
+ MAX98927_R001A_PCM_TX_EN_A,
+ tx_mask & 0xFF);
+ regmap_write(max98927->regmap,
+ MAX98927_R001B_PCM_TX_EN_B,
+ (tx_mask & 0xFF00) >> 8);
+
+ /* Tx slot Hi-Z configuration */
+ regmap_write(max98927->regmap,
+ MAX98927_R001C_PCM_TX_HIZ_CTRL_A,
+ ~tx_mask & 0xFF);
+ regmap_write(max98927->regmap,
+ MAX98927_R001D_PCM_TX_HIZ_CTRL_B,
+ (~tx_mask & 0xFF00) >> 8);
+
+ return 0;
+}
+
#define MAX98927_RATES SNDRV_PCM_RATE_8000_48000
#define MAX98927_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
@@ -405,6 +495,7 @@ static int max98927_dai_set_sysclk(struct snd_soc_dai *dai,
.set_sysclk = max98927_dai_set_sysclk,
.set_fmt = max98927_dai_set_fmt,
.hw_params = max98927_dai_hw_params,
+ .set_tdm_slot = max98927_dai_tdm_slot,
};
static int max98927_dac_event(struct snd_soc_dapm_widget *w,
diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h
index ece6a60..bf7a6f92 100644
--- a/sound/soc/codecs/max98927.h
+++ b/sound/soc/codecs/max98927.h
@@ -1,7 +1,7 @@
/*
* max98927.h -- MAX98927 ALSA Soc Audio driver
*
- * Copyright 2013-15 Maxim Integrated Products
+ * Copyright (C) 2016-2017 Maxim Integrated Products
* Author: Ryan Lee <ryans.lee@maximintegrated.com>
*
* This program is free software; you can redistribute it and/or modify it
@@ -161,7 +161,9 @@
#define MAX98927_PCM_MODE_CFG_FORMAT_SHIFT (3)
#define MAX98927_PCM_FORMAT_I2S (0x0 << 0)
#define MAX98927_PCM_FORMAT_LJ (0x1 << 0)
-
+#define MAX98927_PCM_FORMAT_TDM_MODE0 (0x3 << 0)
+#define MAX98927_PCM_FORMAT_TDM_MODE1 (0x4 << 0)
+#define MAX98927_PCM_FORMAT_TDM_MODE2 (0x5 << 0)
#define MAX98927_PCM_MODE_CFG_CHANSZ_MASK (0x3 << 6)
#define MAX98927_PCM_MODE_CFG_CHANSZ_16 (0x1 << 6)
#define MAX98927_PCM_MODE_CFG_CHANSZ_24 (0x2 << 6)
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/9] ASoC: max98927: Added controls for Envelope tracking
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
@ 2017-08-26 0:41 ` Ryan Lee
2017-08-26 0:41 ` [PATCH 3/9] ASoC: max98927: Updated volatile register list Ryan Lee
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : Added controls to support envelope tracking function
sound/soc/codecs/max98927.c | 20 ++++++++++++++++----
sound/soc/codecs/max98927.h | 4 ++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index 951cc05..1dfcb7b 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -614,6 +614,18 @@ static SOC_ENUM_SINGLE_DECL(max98927_current_limit,
MAX98927_R0042_BOOST_CTRL1, 1,
max98927_current_limit_text);
+static const char * const max98927_env_track_headroom_text[] = {
+ "0.000V", "0.125V", "0.250V", "0.375V", "0.500V", "0.625V",
+ "0.750V", "0.875V", "1.000V", "1.125V", "1.250V", "1.375V",
+ "1.500V", "1.625V", "1.750V", "1.875V", "2.000V", "2.125V",
+ "2.250V", "2.375V", "2.500V", "2.625V", "2.750V", "2.875V",
+ "3.000V", "3.125V", "3.250V", "3.375V", "3.500V"
+};
+
+static SOC_ENUM_SINGLE_DECL(max98927_env_track_headroom,
+ MAX98927_R0082_ENV_TRACK_VOUT_HEADROOM, 0,
+ max98927_env_track_headroom_text);
+
static const struct snd_kcontrol_new max98927_snd_controls[] = {
SOC_SINGLE_TLV("Speaker Volume", MAX98927_R003C_SPK_GAIN,
0, 6, 0,
@@ -631,6 +643,9 @@ static SOC_ENUM_SINGLE_DECL(max98927_current_limit,
MAX98927_AMP_VOL_SEL_SHIFT, 1, 0),
SOC_ENUM("Boost Output Voltage", max98927_boost_voltage),
SOC_ENUM("Current Limit", max98927_current_limit),
+ SOC_SINGLE("EnvTrack Switch", MAX98927_R0086_ENV_TRACK_CTRL,
+ MAX98927_ENV_TRACKER_EN_SHIFT, 1, 0),
+ SOC_ENUM("EnvTrack Headroom", max98927_env_track_headroom),
};
static const struct snd_soc_dapm_route max98927_audio_map[] = {
@@ -725,13 +740,10 @@ static int max98927_probe(struct snd_soc_codec *codec)
/* Envelope Tracking configuration */
regmap_write(max98927->regmap,
MAX98927_R0082_ENV_TRACK_VOUT_HEADROOM,
- 0x08);
+ 0x0A);
regmap_write(max98927->regmap,
MAX98927_R0086_ENV_TRACK_CTRL,
0x01);
- regmap_write(max98927->regmap,
- MAX98927_R0087_ENV_TRACK_BOOST_VOUT_READ,
- 0x10);
/* voltage, current slot configuration */
regmap_write(max98927->regmap,
diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h
index bf7a6f92..3069a09 100644
--- a/sound/soc/codecs/max98927.h
+++ b/sound/soc/codecs/max98927.h
@@ -250,6 +250,10 @@
#define MAX98927_BROWNOUT_DSP_EN (0x1 << 2)
#define MAX98927_BROWNOUT_DSP_SHIFT (2)
+/* MAX98927_R0086_ENV_TRACK_CTRL */
+#define MAX98927_ENV_TRACKER_EN (0x1 << 0)
+#define MAX98927_ENV_TRACKER_EN_SHIFT (0)
+
/* MAX98927_R0100_SOFT_RESET */
#define MAX98927_SOFT_RESET (0x1 << 0)
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/9] ASoC: max98927: Updated volatile register list
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
2017-08-26 0:41 ` [PATCH 2/9] ASoC: max98927: Added controls for Envelope tracking Ryan Lee
@ 2017-08-26 0:41 ` Ryan Lee
2017-08-26 0:41 ` [PATCH 4/9] ASoC: max98927: Added missing \n to end of dev_err messages Ryan Lee
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : Added more reigsters into volatile register list
sound/soc/codecs/max98927.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index 1dfcb7b..c72a244 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -586,6 +586,13 @@ static bool max98927_volatile_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
case MAX98927_R0001_INT_RAW1 ... MAX98927_R0009_INT_FLAG3:
+ case MAX98927_R004C_MEAS_ADC_CH0_READ:
+ case MAX98927_R004D_MEAS_ADC_CH1_READ:
+ case MAX98927_R004E_MEAS_ADC_CH2_READ:
+ case MAX98927_R0051_BROWNOUT_STATUS:
+ case MAX98927_R0087_ENV_TRACK_BOOST_VOUT_READ:
+ case MAX98927_R01FF_REV_ID:
+ case MAX98927_R0100_SOFT_RESET:
return true;
default:
return false;
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/9] ASoC: max98927: Added missing \n to end of dev_err messages
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
2017-08-26 0:41 ` [PATCH 2/9] ASoC: max98927: Added controls for Envelope tracking Ryan Lee
2017-08-26 0:41 ` [PATCH 3/9] ASoC: max98927: Updated volatile register list Ryan Lee
@ 2017-08-26 0:41 ` Ryan Lee
2017-08-26 0:41 ` [PATCH 5/9] ASoC: max98927: Removed obsolete variables Ryan Lee
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : added missing \n to end of dev_err
sound/soc/codecs/max98927.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index c72a244..208d5ba 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -160,7 +160,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
mode = MAX98927_PCM_MASTER_MODE_MASTER;
break;
default:
- dev_err(codec->dev, "DAI clock mode unsupported");
+ dev_err(codec->dev, "DAI clock mode unsupported\n");
return -EINVAL;
}
@@ -176,7 +176,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
invert = MAX98927_PCM_MODE_CFG_PCM_BCLKEDGE;
break;
default:
- dev_err(codec->dev, "DAI invert mode unsupported");
+ dev_err(codec->dev, "DAI invert mode unsupported\n");
return -EINVAL;
}
@@ -331,7 +331,7 @@ static int max98927_dai_hw_params(struct snd_pcm_substream *substream,
chan_sz = MAX98927_PCM_MODE_CFG_CHANSZ_32;
break;
default:
- dev_err(codec->dev, "format unsupported %d",
+ dev_err(codec->dev, "format unsupported %d\n",
params_format(params));
goto err;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 5/9] ASoC: max98927: Removed obsolete variables
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
` (2 preceding siblings ...)
2017-08-26 0:41 ` [PATCH 4/9] ASoC: max98927: Added missing \n to end of dev_err messages Ryan Lee
@ 2017-08-26 0:41 ` Ryan Lee
2017-08-26 0:41 ` [PATCH 6/9] ASoC: max98927: Modified chip default register values Ryan Lee
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : Removed obsolete variables from max98927_priv
sound/soc/codecs/max98927.h | 4 ----
1 file changed, 4 deletions(-)
mode change 100644 => 100755 sound/soc/codecs/max98927.h
diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h
old mode 100644
new mode 100755
index 3069a09..30cc40a
--- a/sound/soc/codecs/max98927.h
+++ b/sound/soc/codecs/max98927.h
@@ -263,16 +263,12 @@
struct max98927_priv {
struct regmap *regmap;
struct snd_soc_codec *codec;
- struct max98927_pdata *pdata;
- unsigned int spk_gain;
unsigned int sysclk;
unsigned int v_l_slot;
unsigned int i_l_slot;
bool interleave_mode;
unsigned int ch_size;
- unsigned int rate;
unsigned int iface;
unsigned int master;
- unsigned int digital_gain;
};
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/9] ASoC: max98927: Modified chip default register values
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
` (3 preceding siblings ...)
2017-08-26 0:41 ` [PATCH 5/9] ASoC: max98927: Removed obsolete variables Ryan Lee
@ 2017-08-26 0:41 ` Ryan Lee
2017-08-26 0:41 ` [PATCH 7/9] ASoC: max98927: Added PM suspend and resume function Ryan Lee
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : Updated chip default register values
sound/soc/codecs/max98927.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index 208d5ba..3ab8220 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -44,9 +44,9 @@
{MAX98927_R0011_CLK_MON, 0x00},
{MAX98927_R0012_WDOG_CTRL, 0x00},
{MAX98927_R0013_WDOG_RST, 0x00},
- {MAX98927_R0014_MEAS_ADC_THERM_WARN_THRESH, 0x00},
- {MAX98927_R0015_MEAS_ADC_THERM_SHDN_THRESH, 0x00},
- {MAX98927_R0016_MEAS_ADC_THERM_HYSTERESIS, 0x00},
+ {MAX98927_R0014_MEAS_ADC_THERM_WARN_THRESH, 0x75},
+ {MAX98927_R0015_MEAS_ADC_THERM_SHDN_THRESH, 0x8c},
+ {MAX98927_R0016_MEAS_ADC_THERM_HYSTERESIS, 0x08},
{MAX98927_R0017_PIN_CFG, 0x55},
{MAX98927_R0018_PCM_RX_EN_A, 0x00},
{MAX98927_R0019_PCM_RX_EN_B, 0x00},
@@ -82,14 +82,14 @@
{MAX98927_R003A_AMP_EN, 0x00},
{MAX98927_R003B_SPK_SRC_SEL, 0x00},
{MAX98927_R003C_SPK_GAIN, 0x00},
- {MAX98927_R003D_SSM_CFG, 0x01},
+ {MAX98927_R003D_SSM_CFG, 0x04},
{MAX98927_R003E_MEAS_EN, 0x00},
{MAX98927_R003F_MEAS_DSP_CFG, 0x04},
{MAX98927_R0040_BOOST_CTRL0, 0x00},
{MAX98927_R0041_BOOST_CTRL3, 0x00},
{MAX98927_R0042_BOOST_CTRL1, 0x00},
{MAX98927_R0043_MEAS_ADC_CFG, 0x00},
- {MAX98927_R0044_MEAS_ADC_BASE_MSB, 0x00},
+ {MAX98927_R0044_MEAS_ADC_BASE_MSB, 0x01},
{MAX98927_R0045_MEAS_ADC_BASE_LSB, 0x00},
{MAX98927_R0046_ADC_CH0_DIVIDE, 0x00},
{MAX98927_R0047_ADC_CH1_DIVIDE, 0x00},
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 7/9] ASoC: max98927: Added PM suspend and resume function
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
` (4 preceding siblings ...)
2017-08-26 0:41 ` [PATCH 6/9] ASoC: max98927: Modified chip default register values Ryan Lee
@ 2017-08-26 0:41 ` Ryan Lee
2017-08-26 0:41 ` [PATCH 8/9] ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path Ryan Lee
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : added PM suspend and resume function to keep register values from power down
sound/soc/codecs/max98927.c | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index 3ab8220..5517251 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -803,6 +803,31 @@ static int max98927_probe(struct snd_soc_codec *codec)
return 0;
}
+#ifdef CONFIG_PM_SLEEP
+static int max98927_suspend(struct device *dev)
+{
+ struct max98927_priv *max98927 = dev_get_drvdata(dev);
+
+ regcache_cache_only(max98927->regmap, true);
+ regcache_mark_dirty(max98927->regmap);
+ return 0;
+}
+static int max98927_resume(struct device *dev)
+{
+ struct max98927_priv *max98927 = dev_get_drvdata(dev);
+
+ regmap_write(max98927->regmap,
+ MAX98927_R0100_SOFT_RESET, MAX98927_SOFT_RESET);
+ regcache_cache_only(max98927->regmap, false);
+ regcache_sync(max98927->regmap);
+ return 0;
+}
+#endif
+
+static const struct dev_pm_ops max98927_pm = {
+ SET_SYSTEM_SLEEP_PM_OPS(max98927_suspend, max98927_resume)
+};
+
static const struct snd_soc_codec_driver soc_codec_dev_max98927 = {
.probe = max98927_probe,
.component_driver = {
@@ -936,7 +961,7 @@ static int max98927_i2c_remove(struct i2c_client *client)
.name = "max98927",
.of_match_table = of_match_ptr(max98927_of_match),
.acpi_match_table = ACPI_PTR(max98927_acpi_match),
- .pm = NULL,
+ .pm = &max98927_pm,
},
.probe = max98927_i2c_probe,
.remove = max98927_i2c_remove,
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 8/9] ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
` (5 preceding siblings ...)
2017-08-26 0:41 ` [PATCH 7/9] ASoC: max98927: Added PM suspend and resume function Ryan Lee
@ 2017-08-26 0:41 ` Ryan Lee
2017-08-31 11:54 ` Applied "ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path" to the asoc tree Mark Brown
2017-08-26 0:41 ` [PATCH 9/9] ASoC: max98927: Changed device property read function Ryan Lee
2017-08-27 14:02 ` [PATCH 1/9] ASoC: max98927: Added TDM support Mark Brown
8 siblings, 1 reply; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : Modified DAPM widget and audio map to enable/disable IV sensing path
sound/soc/codecs/max98927.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index 5517251..f944659 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -509,11 +509,6 @@ static int max98927_dac_event(struct snd_soc_dapm_widget *w,
regmap_update_bits(max98927->regmap,
MAX98927_R003A_AMP_EN,
MAX98927_AMP_EN_MASK, 1);
- /* enable VMON and IMON */
- regmap_update_bits(max98927->regmap,
- MAX98927_R003E_MEAS_EN,
- MAX98927_MEAS_V_EN | MAX98927_MEAS_I_EN,
- MAX98927_MEAS_V_EN | MAX98927_MEAS_I_EN);
regmap_update_bits(max98927->regmap,
MAX98927_R00FF_GLOBAL_SHDN,
MAX98927_GLOBAL_EN_MASK, 1);
@@ -525,10 +520,6 @@ static int max98927_dac_event(struct snd_soc_dapm_widget *w,
regmap_update_bits(max98927->regmap,
MAX98927_R003A_AMP_EN,
MAX98927_AMP_EN_MASK, 0);
- /* disable VMON and IMON */
- regmap_update_bits(max98927->regmap,
- MAX98927_R003E_MEAS_EN,
- MAX98927_MEAS_V_EN | MAX98927_MEAS_I_EN, 0);
break;
default:
return 0;
@@ -547,14 +538,24 @@ static int max98927_dac_event(struct snd_soc_dapm_widget *w,
static const struct snd_kcontrol_new max98927_dai_controls =
SOC_DAPM_ENUM("DAI Sel", dai_sel_enum);
+static const struct snd_kcontrol_new max98927_vi_control =
+ SOC_DAPM_SINGLE("Switch", MAX98927_R003F_MEAS_DSP_CFG, 2, 1, 0);
+
static const struct snd_soc_dapm_widget max98927_dapm_widgets[] = {
- SND_SOC_DAPM_AIF_IN("DAI_OUT", "HiFi Playback", 0, SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_DAC_E("Amp Enable", "HiFi Playback", MAX98927_R003A_AMP_EN,
0, 0, max98927_dac_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_MUX("DAI Sel Mux", SND_SOC_NOPM, 0, 0,
&max98927_dai_controls),
SND_SOC_DAPM_OUTPUT("BE_OUT"),
+ SND_SOC_DAPM_AIF_OUT("Voltage Sense", "HiFi Capture", 0,
+ MAX98927_R003E_MEAS_EN, 0, 0),
+ SND_SOC_DAPM_AIF_OUT("Current Sense", "HiFi Capture", 0,
+ MAX98927_R003E_MEAS_EN, 1, 0),
+ SND_SOC_DAPM_SWITCH("VI Sense", SND_SOC_NOPM, 0, 0,
+ &max98927_vi_control),
+ SND_SOC_DAPM_SIGGEN("VMON"),
+ SND_SOC_DAPM_SIGGEN("IMON"),
};
static DECLARE_TLV_DB_SCALE(max98927_spk_tlv, 300, 300, 0);
@@ -656,11 +657,16 @@ static SOC_ENUM_SINGLE_DECL(max98927_env_track_headroom,
};
static const struct snd_soc_dapm_route max98927_audio_map[] = {
- {"Amp Enable", NULL, "DAI_OUT"},
+ /* Plabyack */
{"DAI Sel Mux", "Left", "Amp Enable"},
{"DAI Sel Mux", "Right", "Amp Enable"},
{"DAI Sel Mux", "LeftRight", "Amp Enable"},
{"BE_OUT", NULL, "DAI Sel Mux"},
+ /* Capture */
+ { "VI Sense", "Switch", "VMON" },
+ { "VI Sense", "Switch", "IMON" },
+ { "Voltage Sense", NULL, "VI Sense" },
+ { "Current Sense", NULL, "VI Sense" },
};
static struct snd_soc_dai_driver max98927_dai[] = {
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 9/9] ASoC: max98927: Changed device property read function
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
` (6 preceding siblings ...)
2017-08-26 0:41 ` [PATCH 8/9] ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path Ryan Lee
@ 2017-08-26 0:41 ` Ryan Lee
2017-08-31 11:54 ` Applied "ASoC: max98927: Changed device property read function" to the asoc tree Mark Brown
2017-08-27 14:02 ` [PATCH 1/9] ASoC: max98927: Added TDM support Mark Brown
8 siblings, 1 reply; 13+ messages in thread
From: Ryan Lee @ 2017-08-26 0:41 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel
Cc: ryan.lee.maxim
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
---
Changes : Replaced 'of_property_read_u32' by 'device_property_read_u32'
sound/soc/codecs/max98927.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index f944659..4867f78 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -861,14 +861,14 @@ static void max98927_slot_config(struct i2c_client *i2c,
struct max98927_priv *max98927)
{
int value;
+ struct device *dev = &i2c->dev;
- if (!of_property_read_u32(i2c->dev.of_node,
- "vmon-slot-no", &value))
+ if (!device_property_read_u32(dev, "vmon-slot-no", &value))
max98927->v_l_slot = value & 0xF;
else
max98927->v_l_slot = 0;
- if (!of_property_read_u32(i2c->dev.of_node,
- "imon-slot-no", &value))
+
+ if (!device_property_read_u32(dev, "imon-slot-no", &value))
max98927->i_l_slot = value & 0xF;
else
max98927->i_l_slot = 1;
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/9] ASoC: max98927: Added TDM support
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
` (7 preceding siblings ...)
2017-08-26 0:41 ` [PATCH 9/9] ASoC: max98927: Changed device property read function Ryan Lee
@ 2017-08-27 14:02 ` Mark Brown
2017-08-28 23:34 ` Ryan Lee
8 siblings, 1 reply; 13+ messages in thread
From: Mark Brown @ 2017-08-27 14:02 UTC (permalink / raw)
To: Ryan Lee
Cc: lgirdwood, perex, tiwai, kuninori.morimoto.gx, alsa-devel,
linux-kernel, ryan.lee.maxim
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
On Fri, Aug 25, 2017 at 05:41:02PM -0700, Ryan Lee wrote:
> Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
This says it's adding support for TDM mode but...
> + case SND_SOC_DAIFMT_DSP_A:
> + format = MAX98927_PCM_FORMAT_TDM_MODE1;
> + break;
> + case SND_SOC_DAIFMT_DSP_B:
> + format = MAX98927_PCM_FORMAT_TDM_MODE0;
> + break;
> case SND_SOC_DAIFMT_PDM:
> - max98927->iface |= SND_SOC_DAIFMT_PDM;
> + use_pdm = true;
> break;
...it looks like it's adding support for two new DSP modes and generally
making a bunch of other changes. This probably needs splitting up, or
at least a bit more of a changelog.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [PATCH 1/9] ASoC: max98927: Added TDM support
2017-08-27 14:02 ` [PATCH 1/9] ASoC: max98927: Added TDM support Mark Brown
@ 2017-08-28 23:34 ` Ryan Lee
0 siblings, 0 replies; 13+ messages in thread
From: Ryan Lee @ 2017-08-28 23:34 UTC (permalink / raw)
To: Mark Brown
Cc: lgirdwood, perex, tiwai, kuninori.morimoto.gx, alsa-devel,
linux-kernel, ryan.lee.maxim
>Subject: Re: [PATCH 1/9] ASoC: max98927: Added TDM support
>
>On Fri, Aug 25, 2017 at 05:41:02PM -0700, Ryan Lee wrote:
>> Signed-off-by: Ryan Lee <mailto:ryans.lee@maximintegrated.com>
>
>This says it's adding support for TDM mode but...
>
>> + case SND_SOC_DAIFMT_DSP_A:
>> + format = MAX98927_PCM_FORMAT_TDM_MODE1;
>> + break;
>> + case SND_SOC_DAIFMT_DSP_B:
>> + format = MAX98927_PCM_FORMAT_TDM_MODE0;
>> + break;
>> case SND_SOC_DAIFMT_PDM:
>> - max98927->iface |= SND_SOC_DAIFMT_PDM;
>> + use_pdm = true;
>> break;
>
>...it looks like it's adding support for two new DSP modes and generally making a
>bunch of other changes. This probably needs splitting up, or at least a bit more
>of a changelog.
I wanted to split this patch but changes were all about DSP_A and DSP_B format support.
I added more description about this patch and send patch series again.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Applied "ASoC: max98927: Changed device property read function" to the asoc tree
2017-08-26 0:41 ` [PATCH 9/9] ASoC: max98927: Changed device property read function Ryan Lee
@ 2017-08-31 11:54 ` Mark Brown
0 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2017-08-31 11:54 UTC (permalink / raw)
To: Ryan Lee
Cc: Mark Brown, lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel, ryan.lee.maxim,
alsa-devel
The patch
ASoC: max98927: Changed device property read function
has been applied to the asoc tree at
git://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 dea110501745734baf7a90dc1e1b50481ade6191 Mon Sep 17 00:00:00 2001
From: Ryan Lee <ryans.lee@maximintegrated.com>
Date: Mon, 28 Aug 2017 16:31:01 -0700
Subject: [PATCH] ASoC: max98927: Changed device property read function
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/max98927.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index 4bbf2098f255..926871e36132 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -759,14 +759,14 @@ static void max98927_slot_config(struct i2c_client *i2c,
struct max98927_priv *max98927)
{
int value;
+ struct device *dev = &i2c->dev;
- if (!of_property_read_u32(i2c->dev.of_node,
- "vmon-slot-no", &value))
+ if (!device_property_read_u32(dev, "vmon-slot-no", &value))
max98927->v_l_slot = value & 0xF;
else
max98927->v_l_slot = 0;
- if (!of_property_read_u32(i2c->dev.of_node,
- "imon-slot-no", &value))
+
+ if (!device_property_read_u32(dev, "imon-slot-no", &value))
max98927->i_l_slot = value & 0xF;
else
max98927->i_l_slot = 1;
--
2.14.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Applied "ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path" to the asoc tree
2017-08-26 0:41 ` [PATCH 8/9] ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path Ryan Lee
@ 2017-08-31 11:54 ` Mark Brown
0 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2017-08-31 11:54 UTC (permalink / raw)
To: Ryan Lee
Cc: Mark Brown, lgirdwood, broonie, perex, tiwai, ryans.lee,
kuninori.morimoto.gx, alsa-devel, linux-kernel, ryan.lee.maxim,
alsa-devel
The patch
ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path
has been applied to the asoc tree at
git://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 607f7777bf0c0224bfadd31a37acc8d1fd25324d Mon Sep 17 00:00:00 2001
From: Ryan Lee <ryans.lee@maximintegrated.com>
Date: Mon, 28 Aug 2017 16:31:00 -0700
Subject: [PATCH] ASoC: max98927: Modified DAPM widget and map to
enable/disable VI sense path
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/max98927.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index caf5340ca6bb..4bbf2098f255 100644
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -418,11 +418,6 @@ static int max98927_dac_event(struct snd_soc_dapm_widget *w,
regmap_update_bits(max98927->regmap,
MAX98927_R003A_AMP_EN,
MAX98927_AMP_EN_MASK, 1);
- /* enable VMON and IMON */
- regmap_update_bits(max98927->regmap,
- MAX98927_R003E_MEAS_EN,
- MAX98927_MEAS_V_EN | MAX98927_MEAS_I_EN,
- MAX98927_MEAS_V_EN | MAX98927_MEAS_I_EN);
regmap_update_bits(max98927->regmap,
MAX98927_R00FF_GLOBAL_SHDN,
MAX98927_GLOBAL_EN_MASK, 1);
@@ -434,10 +429,6 @@ static int max98927_dac_event(struct snd_soc_dapm_widget *w,
regmap_update_bits(max98927->regmap,
MAX98927_R003A_AMP_EN,
MAX98927_AMP_EN_MASK, 0);
- /* disable VMON and IMON */
- regmap_update_bits(max98927->regmap,
- MAX98927_R003E_MEAS_EN,
- MAX98927_MEAS_V_EN | MAX98927_MEAS_I_EN, 0);
break;
default:
return 0;
@@ -456,14 +447,24 @@ static const struct soc_enum dai_sel_enum =
static const struct snd_kcontrol_new max98927_dai_controls =
SOC_DAPM_ENUM("DAI Sel", dai_sel_enum);
+static const struct snd_kcontrol_new max98927_vi_control =
+ SOC_DAPM_SINGLE("Switch", MAX98927_R003F_MEAS_DSP_CFG, 2, 1, 0);
+
static const struct snd_soc_dapm_widget max98927_dapm_widgets[] = {
- SND_SOC_DAPM_AIF_IN("DAI_OUT", "HiFi Playback", 0, SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_DAC_E("Amp Enable", "HiFi Playback", MAX98927_R003A_AMP_EN,
0, 0, max98927_dac_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_MUX("DAI Sel Mux", SND_SOC_NOPM, 0, 0,
&max98927_dai_controls),
SND_SOC_DAPM_OUTPUT("BE_OUT"),
+ SND_SOC_DAPM_AIF_OUT("Voltage Sense", "HiFi Capture", 0,
+ MAX98927_R003E_MEAS_EN, 0, 0),
+ SND_SOC_DAPM_AIF_OUT("Current Sense", "HiFi Capture", 0,
+ MAX98927_R003E_MEAS_EN, 1, 0),
+ SND_SOC_DAPM_SWITCH("VI Sense", SND_SOC_NOPM, 0, 0,
+ &max98927_vi_control),
+ SND_SOC_DAPM_SIGGEN("VMON"),
+ SND_SOC_DAPM_SIGGEN("IMON"),
};
static DECLARE_TLV_DB_SCALE(max98927_spk_tlv, 300, 300, 0);
@@ -550,11 +551,16 @@ static const struct snd_kcontrol_new max98927_snd_controls[] = {
};
static const struct snd_soc_dapm_route max98927_audio_map[] = {
- {"Amp Enable", NULL, "DAI_OUT"},
+ /* Plabyack */
{"DAI Sel Mux", "Left", "Amp Enable"},
{"DAI Sel Mux", "Right", "Amp Enable"},
{"DAI Sel Mux", "LeftRight", "Amp Enable"},
{"BE_OUT", NULL, "DAI Sel Mux"},
+ /* Capture */
+ { "VI Sense", "Switch", "VMON" },
+ { "VI Sense", "Switch", "IMON" },
+ { "Voltage Sense", NULL, "VI Sense" },
+ { "Current Sense", NULL, "VI Sense" },
};
static struct snd_soc_dai_driver max98927_dai[] = {
--
2.14.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-08-31 11:54 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-26 0:41 [PATCH 1/9] ASoC: max98927: Added TDM support Ryan Lee
2017-08-26 0:41 ` [PATCH 2/9] ASoC: max98927: Added controls for Envelope tracking Ryan Lee
2017-08-26 0:41 ` [PATCH 3/9] ASoC: max98927: Updated volatile register list Ryan Lee
2017-08-26 0:41 ` [PATCH 4/9] ASoC: max98927: Added missing \n to end of dev_err messages Ryan Lee
2017-08-26 0:41 ` [PATCH 5/9] ASoC: max98927: Removed obsolete variables Ryan Lee
2017-08-26 0:41 ` [PATCH 6/9] ASoC: max98927: Modified chip default register values Ryan Lee
2017-08-26 0:41 ` [PATCH 7/9] ASoC: max98927: Added PM suspend and resume function Ryan Lee
2017-08-26 0:41 ` [PATCH 8/9] ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path Ryan Lee
2017-08-31 11:54 ` Applied "ASoC: max98927: Modified DAPM widget and map to enable/disable VI sense path" to the asoc tree Mark Brown
2017-08-26 0:41 ` [PATCH 9/9] ASoC: max98927: Changed device property read function Ryan Lee
2017-08-31 11:54 ` Applied "ASoC: max98927: Changed device property read function" to the asoc tree Mark Brown
2017-08-27 14:02 ` [PATCH 1/9] ASoC: max98927: Added TDM support Mark Brown
2017-08-28 23:34 ` Ryan Lee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).