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

[alsa-devel] [PATCH v2 0/2] Add freescale S/PDIF CPU DAI and machine drivers
by Nicolin Chen 05 Aug '13

05 Aug '13

Changelog: v1->v2: * Dropped one applied patch for spdif dummy codec drivers. * Use generic DMA DT binding. * Let spdif controller driver calculate the clock div. * Added one optional clock source for spdif tx. * Reivsed documentation accordingly. Nicolin Chen (2): ASoC: fsl: Add S/PDIF CPU DAI driver ASoC: fsl: Add S/PDIF machine driver .../devicetree/bindings/sound/fsl,spdif.txt | 62 + .../devicetree/bindings/sound/imx-audio-spdif.txt | 29 + sound/soc/fsl/Kconfig | 14 + sound/soc/fsl/Makefile | 4 + sound/soc/fsl/fsl_spdif.c | 1311 ++++++++++++++++++++ sound/soc/fsl/fsl_spdif.h | 227 ++++ sound/soc/fsl/imx-spdif.c | 134 ++ 7 files changed, 1781 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.txt create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-spdif.txt create mode 100644 sound/soc/fsl/fsl_spdif.c create mode 100644 sound/soc/fsl/fsl_spdif.h create mode 100644 sound/soc/fsl/imx-spdif.c

2 4

Re: [alsa-devel] hda: sink info in case of AMD Radeon GPU card (no ELD?)
by Pierre Ossman 05 Aug '13

05 Aug '13

On Wed, 17 Apr 2013 14:04:00 +0200 Rafał Miłecki <zajec5(a)gmail.com> wrote: > > I tried hacking this sink info problem again. I've installed "fglrx" > on my AMD Radeon HD 6970M (BARTS == DCE5) and verified it sets SAD > registers: Any progress on this? I fiddled around with providing the ELD stuff out-of-band, but that's apparently not sufficient. I guess the widget capabilities property also needs to change. Did you check to see if that happened with fglrx? Rgds -- -- Pierre Ossman WARNING: This correspondence is being monitored by FRA, a Swedish intelligence agency. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.

2 1

[alsa-devel] [PATCH] ASoC: rt5640: change widget sequence for depop
by bardliao＠realtek.com 05 Aug '13

05 Aug '13

From: Bard Liao <bardliao(a)realtek.com> Add mute/unmute control in widget event and modify the power on/off sequence to avoid pop noise. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5640.c | 387 ++++++++++++++++++++++++++++++++++++++++------ sound/soc/codecs/rt5640.h | 15 ++ 2 files changed, 352 insertions(+), 50 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 4db7314..3490f38 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -378,21 +378,119 @@ static const SOC_ENUM_SINGLE_DECL(rt5640_if2_adc_enum, RT5640_DIG_INF_DATA, static const char * const rt5640_clsd_spk_ratio[] = {"1.66x", "1.83x", "1.94x", "2x", "2.11x", "2.22x", "2.33x", "2.44x", "2.55x", "2.66x", "2.77x"}; +static const char * const rt5640_mute_mode[] = {"mute", "unmute"}; + +static const SOC_ENUM_SINGLE_DECL(rt5640_hp_enum, 0, 0, rt5640_mute_mode); +static const SOC_ENUM_SINGLE_DECL(rt5640_spo_enum, 0, 0, rt5640_mute_mode); + static const SOC_ENUM_SINGLE_DECL( rt5640_clsd_spk_ratio_enum, RT5640_CLS_D_OUT, RT5640_CLSD_RATIO_SFT, rt5640_clsd_spk_ratio); +static int rt5640_spo_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + + ucontrol->value.integer.value[0] = !rt5640->spo_l_mute; + ucontrol->value.integer.value[1] = !rt5640->spo_r_mute; + + return 0; +} + +static int rt5640_spo_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + unsigned int pow; + + pow = snd_soc_read(codec, RT5640_PWR_DIG1) & RT5640_PWR_CLS_D; + + if (ucontrol->value.integer.value[0]) { + rt5640->spo_l_mute = false; + if (pow) + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_L_MUTE, 0); + } else { + rt5640->spo_l_mute = true; + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_L_MUTE, + RT5640_L_MUTE); + } + if (ucontrol->value.integer.value[1]) { + rt5640->spo_r_mute = false; + if (pow) + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_R_MUTE, 0); + } else { + rt5640->spo_r_mute = true; + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_R_MUTE, + RT5640_R_MUTE); + } + + return 0; +} + +static int rt5640_hp_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + + ucontrol->value.integer.value[0] = !rt5640->hp_l_mute; + ucontrol->value.integer.value[1] = !rt5640->hp_r_mute; + + return 0; +} + +static int rt5640_hp_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + unsigned int pow; + + pow = snd_soc_read(codec, RT5640_PWR_ANLG1); + + if (ucontrol->value.integer.value[0]) { + rt5640->hp_l_mute = false; + if (pow & RT5640_PWR_HP_L) + snd_soc_update_bits(codec, RT5640_HP_VOL, + RT5640_L_MUTE, 0); + } else { + rt5640->hp_l_mute = true; + snd_soc_update_bits(codec, RT5640_HP_VOL, + RT5640_L_MUTE, RT5640_L_MUTE); + } + if (ucontrol->value.integer.value[1]) { + rt5640->hp_r_mute = false; + if (pow & RT5640_PWR_HP_R) + snd_soc_update_bits(codec, RT5640_HP_VOL, + RT5640_R_MUTE, 0); + } else { + rt5640->hp_r_mute = true; + snd_soc_update_bits(codec, RT5640_HP_VOL, + RT5640_R_MUTE, RT5640_R_MUTE); + } + + + return 0; +} + static const struct snd_kcontrol_new rt5640_snd_controls[] = { /* Speaker Output Volume */ - SOC_DOUBLE("Speaker Playback Switch", RT5640_SPK_VOL, - RT5640_L_MUTE_SFT, RT5640_R_MUTE_SFT, 1, 1), + SOC_DOUBLE_EXT("Speaker Playback Switch", SND_SOC_NOPM, + 0, 1, 1, 0, rt5640_spo_get, rt5640_spo_put), SOC_DOUBLE("Speaker Channel Switch", RT5640_SPK_VOL, RT5640_VOL_L_SFT, RT5640_VOL_R_SFT, 1, 1), SOC_DOUBLE_TLV("Speaker Playback Volume", RT5640_SPK_VOL, RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 39, 1, out_vol_tlv), /* Headphone Output Volume */ - SOC_DOUBLE("HP Playback Switch", RT5640_HP_VOL, - RT5640_L_MUTE_SFT, RT5640_R_MUTE_SFT, 1, 1), + SOC_DOUBLE_EXT("HP Playback Switch", SND_SOC_NOPM, + 0, 1, 1, 0, rt5640_hp_get, rt5640_hp_put), SOC_DOUBLE("HP Channel Switch", RT5640_HP_VOL, RT5640_VOL_L_SFT, RT5640_VOL_R_SFT, 1, 1), SOC_DOUBLE_TLV("HP Playback Volume", RT5640_HP_VOL, @@ -868,33 +966,6 @@ static const SOC_ENUM_SINGLE_DECL( static const struct snd_kcontrol_new rt5640_sdi_mux = SOC_DAPM_ENUM("SDI select", rt5640_sdi_sel_enum); -static int spk_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - struct snd_soc_codec *codec = w->codec; - struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); - - switch (event) { - case SND_SOC_DAPM_POST_PMU: - regmap_update_bits(rt5640->regmap, RT5640_PWR_DIG1, - 0x0001, 0x0001); - regmap_update_bits(rt5640->regmap, RT5640_PR_BASE + 0x1c, - 0xf000, 0xf000); - break; - - case SND_SOC_DAPM_PRE_PMD: - regmap_update_bits(rt5640->regmap, RT5640_PR_BASE + 0x1c, - 0xf000, 0x0000); - regmap_update_bits(rt5640->regmap, RT5640_PWR_DIG1, - 0x0001, 0x0000); - break; - - default: - return 0; - } - return 0; -} - static int rt5640_set_dmic1_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -943,6 +1014,216 @@ static int rt5640_set_dmic2_event(struct snd_soc_dapm_widget *w, return 0; } +static int rt5640_spo_r_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + if (!rt5640->spo_r_mute) + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_R_MUTE, 0); + break; + + case SND_SOC_DAPM_PRE_PMD: + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_R_MUTE, + RT5640_R_MUTE); + break; + + default: + return 0; + } + + return 0; +} + +static int rt5640_spo_l_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + if (!rt5640->spo_l_mute) + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_L_MUTE, 0); + break; + + case SND_SOC_DAPM_PRE_PMD: + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_L_MUTE, RT5640_L_MUTE); + break; + + default: + return 0; + } + + return 0; +} + +void hp_amp_power_on(struct snd_soc_codec *codec) +{ + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + /* depop parameters */ + regmap_update_bits(rt5640->regmap, RT5640_PR_BASE + + RT5640_CHPUMP_INT_REG1, 0x0700, 0x0200); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M2, + RT5640_DEPOP_MASK, + RT5640_DEPOP_MAN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_CP_MASK | + RT5640_HP_SG_MASK | + RT5640_HP_CB_MASK, + RT5640_HP_CP_PU | RT5640_HP_SG_DIS | + RT5640_HP_CB_PU); + regmap_write(rt5640->regmap, RT5640_PR_BASE + RT5640_HP_DCC_INT1, + 0x9f00); + /* headphone amp power on */ + regmap_update_bits(rt5640->regmap, RT5640_PWR_ANLG1, + RT5640_PWR_FV1 | RT5640_PWR_FV2, 0); + regmap_update_bits(rt5640->regmap, RT5640_PWR_ANLG1, + RT5640_PWR_HA, + RT5640_PWR_HA); + usleep_range(20000, 25000); + regmap_update_bits(rt5640->regmap, RT5640_PWR_ANLG1, + RT5640_PWR_FV1 | RT5640_PWR_FV2, + RT5640_PWR_FV1 | RT5640_PWR_FV2); + + regmap_update_bits(rt5640->regmap, RT5640_CHARGE_PUMP, + RT5640_PM_HP_MASK, RT5640_PM_HP_HV); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_CO_MASK | + RT5640_HP_SG_MASK, + RT5640_HP_CO_EN | RT5640_HP_SG_EN); + regmap_update_bits(rt5640->regmap, RT5640_PR_BASE + + RT5640_CHPUMP_INT_REG1, 0x0700, 0x0400); +} + +static void rt5640_pmu_depop(struct snd_soc_codec *codec) +{ + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + unsigned int val = 0, pow; + + regmap_read(rt5640->regmap, RT5640_PWR_ANLG1, &pow); + if (rt5640->hp_l_mute || !(pow & RT5640_PWR_HP_L)) + val |= RT5640_L_MUTE; + if (rt5640->hp_r_mute || !(pow & RT5640_PWR_HP_R)) + val |= RT5640_R_MUTE; + /* headphone unmute sequence */ + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M3, + RT5640_CP_FQ1_MASK | RT5640_CP_FQ2_MASK | + RT5640_CP_FQ3_MASK, + (RT5640_CP_FQ_192_KHZ << RT5640_CP_FQ1_SFT) | + (RT5640_CP_FQ_12_KHZ << RT5640_CP_FQ2_SFT) | + (RT5640_CP_FQ_192_KHZ << RT5640_CP_FQ3_SFT)); + regmap_write(rt5640->regmap, + RT5640_PR_BASE + RT5640_MAMP_INT_REG2, 0xfc00); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_SMT_TRIG_MASK, RT5640_SMT_TRIG_EN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_RSTN_MASK, RT5640_RSTN_EN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_RSTN_MASK | RT5640_HP_L_SMT_MASK | + RT5640_HP_R_SMT_MASK, + RT5640_RSTN_DIS | RT5640_HP_L_SMT_EN | + RT5640_HP_R_SMT_EN); + regmap_update_bits(rt5640->regmap, RT5640_HP_VOL, + RT5640_L_MUTE | RT5640_R_MUTE, val); + usleep_range(40000, 45000); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_SG_MASK | RT5640_HP_L_SMT_MASK | + RT5640_HP_R_SMT_MASK, RT5640_HP_SG_DIS | + RT5640_HP_L_SMT_DIS | RT5640_HP_R_SMT_DIS); + +} + +static void rt5640_pmd_depop(struct snd_soc_codec *codec) +{ + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + /* headphone mute sequence */ + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M3, + RT5640_CP_FQ1_MASK | RT5640_CP_FQ2_MASK | + RT5640_CP_FQ3_MASK, + (RT5640_CP_FQ_96_KHZ << RT5640_CP_FQ1_SFT) | + (RT5640_CP_FQ_12_KHZ << RT5640_CP_FQ2_SFT) | + (RT5640_CP_FQ_96_KHZ << RT5640_CP_FQ3_SFT)); + regmap_write(rt5640->regmap, + RT5640_PR_BASE + RT5640_MAMP_INT_REG2, 0xfc00); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_SG_MASK, RT5640_HP_SG_EN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_RSTP_MASK, RT5640_RSTP_EN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_RSTP_MASK | RT5640_HP_L_SMT_MASK | + RT5640_HP_R_SMT_MASK, RT5640_RSTP_DIS | + RT5640_HP_L_SMT_EN | RT5640_HP_R_SMT_EN); + + regmap_update_bits(rt5640->regmap, RT5640_HP_VOL, + RT5640_L_MUTE | RT5640_R_MUTE, + RT5640_L_MUTE | RT5640_R_MUTE); + usleep_range(40000, 45000); + + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_SG_MASK | + RT5640_HP_L_SMT_MASK | + RT5640_HP_R_SMT_MASK, + RT5640_HP_SG_DIS | + RT5640_HP_L_SMT_DIS | + RT5640_HP_R_SMT_DIS); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_SMT_TRIG_MASK | + RT5640_HP_CD_PD_MASK | + RT5640_HP_CO_MASK | + RT5640_HP_CP_MASK | + RT5640_HP_SG_MASK | + RT5640_HP_CB_MASK, + RT5640_SMT_TRIG_DIS | + RT5640_HP_CD_PD_EN | + RT5640_HP_CO_DIS | RT5640_HP_CP_PD | + RT5640_HP_SG_EN | RT5640_HP_CB_PD); +} + +static int rt5640_hp_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + rt5640_pmu_depop(codec); + break; + + case SND_SOC_DAPM_PRE_PMD: + rt5640_pmd_depop(codec); + break; + + default: + return 0; + } + + return 0; +} + +static int rt5640_hp_power_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + hp_amp_power_on(codec); + break; + default: + return 0; + } + + return 0; +} + static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("PLL1", RT5640_PWR_ANLG2, RT5640_PWR_PLL_BIT, 0, NULL, 0), @@ -1132,15 +1413,23 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { rt5640_mono_mix, ARRAY_SIZE(rt5640_mono_mix)), SND_SOC_DAPM_SUPPLY("Improve MONO Amp Drv", RT5640_PWR_ANLG1, RT5640_PWR_MA_BIT, 0, NULL, 0), - SND_SOC_DAPM_SUPPLY("Improve HP Amp Drv", RT5640_PWR_ANLG1, - SND_SOC_NOPM, 0, NULL, 0), - SND_SOC_DAPM_PGA("HP L Amp", RT5640_PWR_ANLG1, + SND_SOC_DAPM_SUPPLY_S("Improve HP Amp Drv", 1, SND_SOC_NOPM, + 0, 0, rt5640_hp_power_event, SND_SOC_DAPM_POST_PMU), + SND_SOC_DAPM_PGA_S("HP Amp", 1, SND_SOC_NOPM, 0, 0, + rt5640_hp_event, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), + SND_SOC_DAPM_SUPPLY("HP L Amp", RT5640_PWR_ANLG1, RT5640_PWR_HP_L_BIT, 0, NULL, 0), - SND_SOC_DAPM_PGA("HP R Amp", RT5640_PWR_ANLG1, + SND_SOC_DAPM_SUPPLY("HP R Amp", RT5640_PWR_ANLG1, RT5640_PWR_HP_R_BIT, 0, NULL, 0), + SND_SOC_DAPM_PGA_E("SPO L Amp", SND_SOC_NOPM, + 0, 0, NULL, 0, rt5640_spo_l_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_PGA_E("SPO R Amp", SND_SOC_NOPM, + 0, 0, NULL, 0, rt5640_spo_r_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_SUPPLY("Improve SPK Amp Drv", RT5640_PWR_DIG1, - SND_SOC_NOPM, 0, spk_event, - SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), + RT5640_PWR_CLS_D_BIT, 0, NULL, 0), /* Output Lines */ SND_SOC_DAPM_OUTPUT("SPOLP"), SND_SOC_DAPM_OUTPUT("SPOLN"), @@ -1396,13 +1685,15 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { {"Mono MIX", "OUTVOL L Switch", "OUTVOL L"}, {"Mono MIX", "BST1 Switch", "BST1"}, - {"HP L Amp", NULL, "HPO MIX L"}, - {"HP R Amp", NULL, "HPO MIX R"}, + {"HP Amp", NULL, "HPO MIX L"}, + {"HP Amp", NULL, "HPO MIX R"}, - {"SPOLP", NULL, "SPOL MIX"}, - {"SPOLN", NULL, "SPOL MIX"}, - {"SPORP", NULL, "SPOR MIX"}, - {"SPORN", NULL, "SPOR MIX"}, + {"SPO L Amp", NULL, "SPOL MIX"}, + {"SPO R Amp", NULL, "SPOR MIX"}, + {"SPOLP", NULL, "SPO L Amp"}, + {"SPOLN", NULL, "SPO L Amp"}, + {"SPORP", NULL, "SPO R Amp"}, + {"SPORN", NULL, "SPO R Amp"}, {"SPOLP", NULL, "Improve SPK Amp Drv"}, {"SPOLN", NULL, "Improve SPK Amp Drv"}, @@ -1412,7 +1703,9 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { {"HPOL", NULL, "Improve HP Amp Drv"}, {"HPOR", NULL, "Improve HP Amp Drv"}, + {"HPOL", NULL, "HP Amp"}, {"HPOL", NULL, "HP L Amp"}, + {"HPOR", NULL, "HP Amp"}, {"HPOR", NULL, "HP R Amp"}, {"LOUTL", NULL, "LOUT MIX"}, {"LOUTR", NULL, "LOUT MIX"}, @@ -1792,17 +2085,13 @@ static int rt5640_set_bias_level(struct snd_soc_codec *codec, RT5640_PWR_BG | RT5640_PWR_VREF2, RT5640_PWR_VREF1 | RT5640_PWR_MB | RT5640_PWR_BG | RT5640_PWR_VREF2); - mdelay(10); + usleep_range(15000, 20000); snd_soc_update_bits(codec, RT5640_PWR_ANLG1, RT5640_PWR_FV1 | RT5640_PWR_FV2, RT5640_PWR_FV1 | RT5640_PWR_FV2); regcache_sync(rt5640->regmap); snd_soc_update_bits(codec, RT5640_DUMMY1, 0x0301, 0x0301); - snd_soc_update_bits(codec, RT5640_DEPOP_M1, - 0x001d, 0x0019); - snd_soc_update_bits(codec, RT5640_DEPOP_M2, - 0x2000, 0x2000); snd_soc_update_bits(codec, RT5640_MICBIAS, 0x0030, 0x0030); } @@ -1846,8 +2135,6 @@ static int rt5640_probe(struct snd_soc_codec *codec) rt5640_set_bias_level(codec, SND_SOC_BIAS_OFF); snd_soc_update_bits(codec, RT5640_DUMMY1, 0x0301, 0x0301); - snd_soc_update_bits(codec, RT5640_DEPOP_M1, 0x001d, 0x0019); - snd_soc_update_bits(codec, RT5640_DEPOP_M2, 0x2000, 0x2000); snd_soc_update_bits(codec, RT5640_MICBIAS, 0x0030, 0x0030); snd_soc_update_bits(codec, RT5640_DSP_PATH2, 0xfc00, 0x0c00); diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h index c48286d..cb6bce9 100644 --- a/sound/soc/codecs/rt5640.h +++ b/sound/soc/codecs/rt5640.h @@ -145,6 +145,8 @@ /* Index of Codec Private Register definition */ +#define RT5640_CHPUMP_INT_REG1 0x24 +#define RT5640_MAMP_INT_REG2 0x37 #define RT5640_3D_SPK 0x63 #define RT5640_WND_1 0x6c #define RT5640_WND_2 0x6d @@ -153,6 +155,7 @@ #define RT5640_WND_5 0x70 #define RT5640_WND_8 0x73 #define RT5640_DIP_SPK_INF 0x75 +#define RT5640_HP_DCC_INT1 0x77 #define RT5640_EQ_BW_LOP 0xa0 #define RT5640_EQ_GN_LOP 0xa1 #define RT5640_EQ_FC_BP1 0xa2 @@ -1201,6 +1204,14 @@ #define RT5640_CP_FQ2_SFT 4 #define RT5640_CP_FQ3_MASK (0x7) #define RT5640_CP_FQ3_SFT 0 +#define RT5640_CP_FQ_1_5_KHZ 0 +#define RT5640_CP_FQ_3_KHZ 1 +#define RT5640_CP_FQ_6_KHZ 2 +#define RT5640_CP_FQ_12_KHZ 3 +#define RT5640_CP_FQ_24_KHZ 4 +#define RT5640_CP_FQ_48_KHZ 5 +#define RT5640_CP_FQ_96_KHZ 6 +#define RT5640_CP_FQ_192_KHZ 7 /* HPOUT charge pump (0x91) */ #define RT5640_OSW_L_MASK (0x1 << 11) @@ -2087,6 +2098,10 @@ struct rt5640_priv { int pll_out; int dmic_en; + bool spo_l_mute; + bool spo_r_mute; + bool hp_l_mute; + bool hp_r_mute; }; #endif -- 1.8.1.1.439.g50a6b54

3 2

Re: [alsa-devel] [PATCH v3 4/4] ASoC: kirkwood: change kirkwood-i2s to mvebu-pcm-audio and DT doc
by Russell King - ARM Linux 04 Aug '13

04 Aug '13

On Wed, Jul 31, 2013 at 08:18:58AM +0200, Jean-Francois Moine wrote: > diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c > index 9844010..4f817a2 100644 > --- a/sound/soc/kirkwood/kirkwood-i2s.c > +++ b/sound/soc/kirkwood/kirkwood-i2s.c > @@ -25,7 +25,7 @@ > > #include "kirkwood.h" > > -#define DRV_NAME "kirkwood-i2s" > +#define DRV_NAME "mvebu-pcm-audio" This breaks non-DT users of this driver. The device in arch/arm/mach-kirkwood is left as "kirkwood-i2s" but the platform device is now called something different. > static struct of_device_id kirkwood_i2s_of_match[] = { > - { .compatible = "marvell,kirkwood-i2s" }, > + { .compatible = "marvell,mvebu-pcm-audio" }, You've only just introduced "marvell,kirkwood-i2s" in the previous patch. Why introduce something and then immediately change its name? This makes no sense what so ever.

3 2

Re: [alsa-devel] [PATCH v3 2/4] ASoc: kirkwood: merge kirkwood-i2c and kirkwood-dma
by Russell King - ARM Linux 04 Aug '13

04 Aug '13

On Wed, Jul 31, 2013 at 08:18:06AM +0200, Jean-Francois Moine wrote: > To avoid the declaration of a 'kirkwood-pcm-audio' device in the DT, > this patch merges the kirkwood-i2c and kirkwood-dma drivers into one > module associated with 'kirkwood-i2s'. I suggest holding off on this stuff at the moment. I think Mark and Liam (who now have a whole raft of emails from me today) have some work to do to fix ASoC to work how they're saying it should work, because to me ASoC seems to contradict what they're telling me. To put it another way, it must be buggy. The DAPM stuff seems to be the worst thing since mouldy bread. I'm chasing what seems to be multiple bugs through this stuff, and many of them are not particularly nice. For example - we register multiple copies of DAPM widgets for the same set of declarations if both a CPU DAI and a platform share the same struct device, and thereby end up overwriting some pointers in the DAI structure. It seems that CPU DAIs themselves aren't supposed to have DAPM widgets, but the core creates some... but there's no explicit cleanup of them unlike the other DAPMs, and there's no debugfs for them. The bias levels are stuck at off/standby all the time, which makes any kind of PM with spdif-dit impossible - or even any routing between stream input and output. Basically, I'm tearing my hair out today looking at this stuff and getting nowhere fast - all I'm doing is finding more and more problems. For example, where a codec has no input/output widgets declared, it used to be powered up automatically by ASoC as a matter of course. Things like UDA134x and other things. Things like spdif-dit. That "mysteriously" stopped happening. ASoC: dapm: Treat DAI widgets like AIF widgets for power seems to be the cause, this results in such setups having zero connected inputs/outputs reported, which causes them to remain powered down - because what used to happen before was the DAI links would report their powered state depending on whether they were active, and they are set active in soc_dapm_stream_event(). Now, when playback widget for the Codec and CPU DAIs get marked as active. The playback widget is created as a snd_soc_dapm_dai_in. It's power check function is set to dapm_dac_check_power. Since this widget is active, it checks for connected outputs via is_connected_output_ep(). We drop through to the second switch statement (why do we have two there? They're both switching on the same damned variable and its not like a widget can change its ID.) This is where the different behaviour has appeared - when these were just a simple snd_soc_dapm_dai, we used to just do the snd_soc_dapm_suspend_check() here, but we don't anymore. This is a snd_soc_dapm_dai_in type of widget, so we fall through this switch statement now and start searching the paths. As these codecs have no paths, this ultimately ends up returning no connections. Hence why these codecs with no DAPM widgets declared but have PM support via the bias level stuff have stopped working. Now, about the spdif-dit, if we're going to have to add "pin" widgets to it, what the output of a SPDIF in terms of DAPM widgets? At a guess, it's a "codec pin" despite there being no codec and no "pin" on that codec in reality, and that "pin" is always active. With that "fixed" (rather, altered to a state where it behaves the same way as it used to before the above commit) if I set up a DAPM route between the CPU DAI playback stream, an AIF (for spdif output) and the spdif-dit playback stream, I see the playback streams marked active and powered up, but the AIF stream remains powered down: spdif-dit/dapm/Playback:Playback: On in 1 out 1 spdif-dit/dapm/Playback: stream Playback active spdif-dit/dapm/Playback: in "static" "spdif-playback" spdif-dit/dapm/bias_level:On kirkwood-audio.1/dapm/spdif-playback:spdif-playback: Off in 1 out 0 kirkwood-audio.1/dapm/spdif-playback: in "static" "dma-playback" kirkwood-audio.1/dapm/spdif-playback: out "static" "Playback" kirkwood-audio.1/dapm/dma-playback:dma-playback: On in 1 out 1 kirkwood-audio.1/dapm/dma-playback: stream dma-playback active kirkwood-audio.1/dapm/dma-playback: out "static" "spdif-playback" kirkwood-audio.1/dapm/dma-playback: out "static" "i2s-playback" It looks to me like the DAPM stuff is - in one plain and simple word - buggered. I've no idea what the right fixes are in this area. It needs someone like Mark or Liam who supposedly understand this to spend time checking that it actually operates as they _think_ it should operate, because at the moment it plainly doesn't.

2 1

[alsa-devel] [PATCH V2 0/8] Add audio support on smdk5420
by Padmavathi Venna 04 Aug '13

04 Aug '13

Samsung has different versions of I2S introduced in different platforms. Each version has some new support added for multichannel, secondary fifo, s/w reset control, internal mux for rclk src clk and tdm support. Each newly added change has a quirk. So this patch adds all the required quirks as driver data and based on compatible string from dtsi fetches the quirks. This also adds i2s support on exynos5420 and make relevent changes in the dtsi files. Changes since V1: - Pass quirks as driver data and fetch the quirks based on compatible string from dtsi file as suggested by Tomasz Figa and Mark Brown - Make the I2S driver more flexible with respect to register access as suggested by Tomasz Figa and Mark Brown - Add 5420 support in the driver. - Modify the dtsi files with the corresponding compatible strings and removed the i2s quirks from 5250 dtsi file. - Updated the i2s Documentation with relevent changes and i2s versioning info. - Add i2s nodes on exynos5420.dtsi - Enable sound support on smdk5420 This patch set is dependent on the following dma and audio subsystem clk controller patches. http://comments.gmane.org/gmane.linux.kernel.samsung-soc/20661 http://comments.gmane.org/gmane.linux.kernel.samsung-soc/20668 This patch set is made based on Kukjin Kim for-next branch. Andrew Bresticker (1): ARM: dts: exynos5420: add i2s controllers Padmavathi Venna (7): platform: Increase platform name size ASoC: Samsung: I2S: Add quirks as driver data in I2S ARM: dts: Change i2s compatible string on exynos5250 ASoC: Samsung: I2S: Modify driver to give more flexibility ASoC: Samsung: I2S: Modify the I2S driver to support I2S on Exynos5420 ARM: dts: wm8994: Add wm8994 support on smdk5420 ARM: dts: Enable sound support on smdk5420 .../devicetree/bindings/sound/samsung-i2s.txt | 25 ++- arch/arm/boot/dts/exynos5250.dtsi | 9 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 60 ++++++ arch/arm/boot/dts/exynos5420.dtsi | 44 +++++ include/linux/mod_devicetable.h | 2 +- include/linux/platform_data/asoc-s3c.h | 1 + sound/soc/samsung/i2s-regs.h | 51 ++++-- sound/soc/samsung/i2s.c | 205 +++++++++++++++----- 8 files changed, 312 insertions(+), 85 deletions(-) -- 1.7.4.4

7 30

Re: [alsa-devel] [PATCH v3 1/4] ASoc: kirkwood: simplify probe error
by Russell King - ARM Linux 03 Aug '13

03 Aug '13

On Wed, Jul 31, 2013 at 08:17:39AM +0200, Jean-Francois Moine wrote: > The function kirkwood_i2s_dev_remove() may be used when probe fails. Looking at this deeper, I'm not happy with this. > +static int kirkwood_i2s_dev_remove(struct platform_device *pdev) > +{ > + struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev); > + > + snd_soc_unregister_component(&pdev->dev); ... > @@ -519,30 +532,17 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) > > err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component, > soc_dai, 1); > + if (err) { > + dev_err(&pdev->dev, "snd_soc_register_component failed\n"); > + goto fail; > + } > + return 0; > > +fail: > + kirkwood_i2s_dev_remove(pdev); What this means is that if snd_soc_register_component() fails, we end up calling snd_soc_unregister_component(). This may be fine with the way snd_soc_unregister_component() is currently implemented, but you're making the assumption that it's fine to call snd_soc_unregister_component() for a device which hasn't been registered. Technically, this is a layering violation, which makes this change fragile if the behaviour of snd_soc_unregister_component() changes in the future. For the sake of two calls in the error path, I don't think the benefits of this patch outweigh the risk.

2 1

Re: [alsa-devel] [PATCH v3 1/4] ASoc: kirkwood: simplify probe error
by Russell King - ARM Linux 03 Aug '13

03 Aug '13

On Wed, Jul 31, 2013 at 08:17:39AM +0200, Jean-Francois Moine wrote: > @@ -519,30 +532,17 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) > > err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component, > soc_dai, 1); > - if (!err) > - return 0; > - dev_err(&pdev->dev, "snd_soc_register_component failed\n"); > - > - if (!IS_ERR(priv->extclk)) > - clk_disable_unprepare(priv->extclk); > - clk_disable_unprepare(priv->clk); > + if (err) { > + dev_err(&pdev->dev, "snd_soc_register_component failed\n"); > + goto fail; > + } > + return 0; This doesn't apply to mainline as there's a clk_put() there.

3 3

Re: [alsa-devel] [PATCH v3 3/4] ASoc: kirkwood: add DT support
by Russell King - ARM Linux 03 Aug '13

03 Aug '13

On Wed, Jul 31, 2013 at 08:18:32AM +0200, Jean-Francois Moine wrote: > The kirkwood audio driver is used without DT in the Kirkwood machine. > This patch adds a DT compatible definition for use in other Marvell > machines such as the Armada 88AP510 (Dove). > > Signed-off-by: Jean-Francois Moine <moinejf(a)free.fr> > --- > sound/soc/kirkwood/kirkwood-i2s.c | 27 ++++++++++++++++------ > 1 file changed, 20 insertions(+), 7 deletions(-) This misses documentation for the DT conversion. Documentation should be created at the same time as a driver is converted. I think you should combine patches 3 and 4 together given that you add the documentation and change the DT compatible name you've given this driver in this patch in patch 4. > > diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c > index a13fffb..234b5a1 100644 > --- a/sound/soc/kirkwood/kirkwood-i2s.c > +++ b/sound/soc/kirkwood/kirkwood-i2s.c > @@ -12,7 +12,6 @@ > > #include <linux/init.h> > #include <linux/module.h> > -#include <linux/platform_device.h> Why are you getting rid of this include? It still makes use of platform devices and the like, so it _should_ continue to include this. Don't rely on implicit includes.

1 0

Re: [alsa-devel] [PATCH v3 2/4] ASoc: kirkwood: merge kirkwood-i2c and kirkwood-dma
by Russell King - ARM Linux 03 Aug '13

03 Aug '13

On Wed, Jul 31, 2013 at 08:18:06AM +0200, Jean-Francois Moine wrote: > To avoid the declaration of a 'kirkwood-pcm-audio' device in the DT, > this patch merges the kirkwood-i2c and kirkwood-dma drivers into one > module associated with 'kirkwood-i2s'. This is broken unless you use my patch. You can't just stick the two drivers together because they both make use of the platform device's driver data field for two incompatible uses. I've already explained that, and I've even sent you a patch to fix that, but you seem to ignore anything that you didn't write. So... I'm going to work on this issue this weekend and merge the two drivers myself, and send Mark my own patches to do this.

1 1