diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 14:04:48 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 14:04:48 -0800 |
| commit | b0ba6bde9d794e09bde7372a314a52ec9020eaab (patch) | |
| tree | bfaa2974b3b235d8c30479163fe5ad669216c537 | |
| parent | a8dd69178c8ab152111fcb1f0fb2b111002104b7 (diff) | |
| parent | 48809d97c1810e263f4a643f7dd9644b905048b4 (diff) | |
Merge "ASoC: wcd934x: Add missing INT0 interpolator path"
| -rw-r--r-- | sound/soc/codecs/wcd934x/wcd934x-routing.h | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/wcd934x/wcd934x.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wcd934x/wcd934x-routing.h b/sound/soc/codecs/wcd934x/wcd934x-routing.h index 940fdf89d361..8ca4c07a3327 100644 --- a/sound/soc/codecs/wcd934x/wcd934x-routing.h +++ b/sound/soc/codecs/wcd934x/wcd934x-routing.h @@ -761,7 +761,8 @@ const struct snd_soc_dapm_route tavil_audio_map[] = { {"RX INT0_2 MUX", "RX5", "CDC_IF RX5 MUX"}, {"RX INT0_2 MUX", "RX6", "CDC_IF RX6 MUX"}, {"RX INT0_2 MUX", "RX7", "CDC_IF RX7 MUX"}, - {"RX INT0 SEC MIX", NULL, "RX INT0_2 MUX"}, + {"RX INT0_2 INTERP", NULL, "RX INT0_2 MUX"}, + {"RX INT0 SEC MIX", NULL, "RX INT0_2 INTERP"}, /* Mixing path INT1 */ {"RX INT1_2 MUX", "RX0", "CDC_IF RX0 MUX"}, diff --git a/sound/soc/codecs/wcd934x/wcd934x.c b/sound/soc/codecs/wcd934x/wcd934x.c index 1fdf81a3a45f..8be608c8511c 100644 --- a/sound/soc/codecs/wcd934x/wcd934x.c +++ b/sound/soc/codecs/wcd934x/wcd934x.c @@ -8589,7 +8589,7 @@ static int tavil_handle_pdata(struct tavil_priv *tavil, if (pdata->dmic_clk_drv == WCD9XXX_DMIC_CLK_DRIVE_UNDEFINED) { pdata->dmic_clk_drv = WCD934X_DMIC_CLK_DRIVE_DEFAULT; - dev_info(codec->dev, + dev_dbg(codec->dev, "%s: dmic_clk_strength invalid, default = %d\n", __func__, pdata->dmic_clk_drv); } |