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

[alsa-devel] [PATCH v4] ASoC: tlv320aic31xx: Fix master mode clock I2S bus clocks
by Peter Ujfalusi 14 Feb '18

14 Feb '18

In the reset state of the codec we do not have complete playback or capture routes. The audio playback/capture will not work due to missing clock signals on the I2S bus if PLL, MDAC/NDAC/DAC MADC/NADC/ADC is powered down. To make sure that even if all output/input is disconnected the codec is generating clocks, we need to have valid DAPM route in every case to power up the must needed parts of the codec. I have verified that switching DAC (during playback) or ADC (during capture) will stop the I2S clocks, so the only solution is to connect the 'Off' routes as well to output/input. The routes will be only added if the codec is clock master. In case the role changes runtime, the applied routes are removed. Tested on am43x-epos-evm with aic3111 codec in master mode. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Hi, Changes since v3: - install or remove the master mode DAPM routes if needed - move the clock master DAPM route 'management' to a separate function Changes since v2: - Leftover debug prints removed. Changes since v1: - Only apply the master mode DAPM routes when the codec is clock master - comments added to explain the need. Regards, Peter sound/soc/codecs/tlv320aic31xx.c | 73 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 858cb8be445f..bd659c803f14 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -166,6 +166,7 @@ struct aic31xx_priv { unsigned int sysclk; u8 p_div; int rate_div_line; + bool master_dapm_route_applied; }; struct aic31xx_rate_divs { @@ -670,6 +671,29 @@ aic310x_audio_map[] = { {"SPK", NULL, "SPK ClassD"}, }; +/* + * Always connected DAPM routes for codec clock master modes. + * If the codec is the master on the I2S bus, we need to power on components + * to have valid DAC_CLK and also the DACs and ADC for playback/capture. + * Otherwise the codec will not generate clocks on the bus. + */ +static const struct snd_soc_dapm_route +common31xx_cm_audio_map[] = { + {"DAC Left Input", "Off", "DAC IN"}, + {"DAC Right Input", "Off", "DAC IN"}, + + {"HPL", NULL, "DAC Left"}, + {"HPR", NULL, "DAC Right"}, +}; + +static const struct snd_soc_dapm_route +aic31xx_cm_audio_map[] = { + {"MIC1LP P-Terminal", "Off", "MIC1LP"}, + {"MIC1RP P-Terminal", "Off", "MIC1RP"}, + {"MIC1LM P-Terminal", "Off", "MIC1LM"}, + {"MIC1LM M-Terminal", "Off", "MIC1LM"}, +}; + static int aic31xx_add_controls(struct snd_soc_codec *codec) { int ret = 0; @@ -912,6 +936,53 @@ static int aic31xx_dac_mute(struct snd_soc_dai *codec_dai, int mute) return 0; } +static int aic31xx_clock_master_routes(struct snd_soc_codec *codec, + unsigned int fmt) +{ + struct aic31xx_priv *aic31xx = snd_soc_codec_get_drvdata(codec); + struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); + int ret; + + fmt &= SND_SOC_DAIFMT_MASTER_MASK; + if (fmt == SND_SOC_DAIFMT_CBS_CFS && + aic31xx->master_dapm_route_applied) { + /* + * Remove the DAPM route(s) for codec clock master modes, + * if applied + */ + ret = snd_soc_dapm_del_routes(dapm, common31xx_cm_audio_map, + ARRAY_SIZE(common31xx_cm_audio_map)); + if (!ret && !(aic31xx->codec_type & DAC31XX_BIT)) + ret = snd_soc_dapm_del_routes(dapm, + aic31xx_cm_audio_map, + ARRAY_SIZE(aic31xx_cm_audio_map)); + + if (ret) + return ret; + + aic31xx->master_dapm_route_applied = false; + } else if (fmt != SND_SOC_DAIFMT_CBS_CFS && + !aic31xx->master_dapm_route_applied) { + /* + * Add the needed DAPM route(s) for codec clock master modes, + * if it is not done already + */ + ret = snd_soc_dapm_add_routes(dapm, common31xx_cm_audio_map, + ARRAY_SIZE(common31xx_cm_audio_map)); + if (!ret && !(aic31xx->codec_type & DAC31XX_BIT)) + ret = snd_soc_dapm_add_routes(dapm, + aic31xx_cm_audio_map, + ARRAY_SIZE(aic31xx_cm_audio_map)); + + if (ret) + return ret; + + aic31xx->master_dapm_route_applied = true; + } + + return 0; +} + static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { @@ -992,7 +1063,7 @@ static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai, AIC31XX_BCLKINV_MASK, iface_reg2); - return 0; + return aic31xx_clock_master_routes(codec, fmt); } static int aic31xx_set_dai_sysclk(struct snd_soc_dai *codec_dai, -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

4 5

[alsa-devel] [PATCH v2] ASoC: replace platform/codec component
by Kuninori Morimoto 14 Feb '18

14 Feb '18

Hi Mark These are v2 of replace platform/codec to component. Main diff between v1 -> v2 are - Based on v4.15 + asoc/for-next - Added missing new driver's replace - Added Tested-by / Acked-by from each driver author I will post both "replace platform" and "replace codec". Kuninori Morimoto (225): ASoC: remove rtd->platform checck ASoC: soc-utils: replace platform to component ASoC: soc-generic-dmaengine-pcm: replace platform to component ASoC: intel: atom: replace platform to component ASoC: intel: skylake: replace platform to component ASoC: intel: baytrail: replace platform to component ASoC: intel: haswell: replace platform to component ASoC: bcm: cygnus: replace platform to component ASoC: sh: rsnd: replace platform to component ASoC: sh: dma-sh7760: replace platform to component ASoC: sh: fsi: replace platform to component ASoC: sh: siu: replace platform to component ASoC: atmel: replace platform to component ASoC: amd: replace platform to component ASoC: cs47l24: replace platform to component ASoC: rt5514-spi: replace platform to component ASoC: wm5110: replace platform to component ASoC: wm5102: replace platform to component ASoC: davinci-i2s: replace platform to component ASoC: fsl: dma: replace platform to component ASoC: fsl: asrc: replace platform to component ASoC: fsl: imx: replace platform to component ASoC: fsl: mpc5200: replace platform to component ASoC: dwc-pcm: replace platform to component ASoC: kirkwood: replace platform to component ASoC: pxa: mmp: replace platform to component ASoC: pxa: pxa2xx: replace platform to component ASoC: qcom: lpass-platform: replace platform to component ASoC: samsung: idma: replace platform to component ASoC: xtfpga-i2s: replace platform to component ASoC: blackfin: bf5xx-ac97-pcm: replace platform to component ASoC: blackfin: bf5xx-i2s-pcm: replace platform to component ASoC: omap-pcm: replace platform to component ASoC: au1x: dbdma2: replace platform to component ASoC: au1x: dma: replace platform to component ASoC: nuc900-pcm: replace platform to component ASoC: txx9aclc: replace platform to component ASoC: mt2701/mt8173: replace platform to component ASoC: stm: stm32_adfsdm: replace platform to component ASoC: soc-utils: replace codec to component ASoC: ac97: replace codec to component ASoC: wm0010: replace codec to component ASoC: wm2000: replace codec to component ASoC: wm2200: replace codec to component ASoC: wm5100: replace codec to component ASoC: wm8350: replace codec to component ASoC: wm8400: replace codec to component ASoC: wm8580: replace codec to component ASoC: wm8524: replace codec to component ASoC: wm8510: replace codec to component ASoC: wm8523: replace codec to component ASoC: wm8711: replace codec to component ASoC: wm8750: replace codec to component ASoC: wm8737: replace codec to component ASoC: wm8776: replace codec to component ASoC: wm8770: replace codec to component ASoC: wm8727: replace codec to component ASoC: wm8731: replace codec to component ASoC: wm8782: replace codec to component ASoC: wm8728: replace codec to component ASoC: wm8741: replace codec to component ASoC: wm8753: replace codec to component ASoC: wm8804: replace codec to component ASoC: wm8900: replace codec to component ASoC: wm8903: replace codec to component ASoC: wm8955: replace codec to component ASoC: wm8960: replace codec to component ASoC: wm8985: replace codec to component ASoC: wm8971: replace codec to component ASoC: wm8978: replace codec to component ASoC: wm8974: replace codec to component ASoC: wm8990: replace codec to component ASoC: wm8988: replace codec to component ASoC: wm8983: replace codec to component ASoC: wm8962: replace codec to component ASoC: wm8996: replace codec to component ASoC: wm8991: replace codec to component ASoC: wm8995: replace codec to component ASoC: wm8961: replace codec to component ASoC: wm8940: replace codec to component ASoC: wm8904: replace codec to component ASoC: wm9081: replace codec to component ASoC: wm9090: replace codec to component ASoC: wm9705: replace codec to component ASoC: wm9712: replace codec to component ASoC: wm9713: replace codec to component ASoC: wm9867: replace codec to component ASoC: wm1250-ev1: replace codec to component ASoC: wm8993/wm8994/wm8958: replace codec to component ASoC: ak4613: replace codec to component ASoC: ak4642: replace codec to component ASoC: ak5386: replace codec to component ASoC: ak4671: replace codec to component ASoC: ak4104: replace codec to component ASoC: ak4535: replace codec to component ASoC: ak4641: replace codec to component ASoC: ak4554: replace codec to component ASoC: rt274: replace codec to component ASoC: rt5616: replace codec to component ASoC: rt5640: replace codec to component ASoC: rt5651: replace codec to component ASoC: rt5514: replace codec to component ASoC: rt5659: replace codec to component ASoC: rt5670: replace codec to component ASoC: rt5660: replace codec to component ASoC: rt5631: replace codec to component ASoC: rt5665: replace codec to component ASoC: rt5645/rt5677: replace codec to component ASoC: cs4271: replace codec to component ASoC: cs4270: replace codec to component ASoC: cs4349: replace codec to component ASoC: cs4265: replace codec to component ASoC: cs35l32: replace codec to component ASoC: cs35l33: replace codec to component ASoC: cs35l35: replace codec to component ASoC: cs35l34: replace codec to component ASoC: cs42xx8: replace codec to component ASoC: cs42l73: replace codec to component ASoC: cs42l52: replace codec to component ASoC: cs42l56: replace codec to component ASoC: cs42l51: replace codec to component ASoC: cs42l42: replace codec to component ASoC: cs43130: replace codec to component ASoC: cs53l30: replace codec to component ASoC: da732x: replace codec to component ASoC: da7210: replace codec to component ASoC: da7218: replace codec to component ASoC: da7213: replace codec to component ASoC: da9055: replace codec to component ASoC: max9860: replace codec to component ASoC: max9850: replace codec to component ASoC: max98371: replace codec to component ASoC: max98095: replace codec to component ASoC: max98090: replace codec to component ASoC: max98926: replace codec to component ASoC: max98088: replace codec to component ASoC: max98925: replace codec to component ASoC: max98927: replace codec to component ASoC: max98357a: replace codec to component ASoC: max98373: replace codec to component ASoC: adav80x: replace codec to component ASoC: adau1373: replace codec to component ASoC: adau7002: replace codec to component ASoC: adau1977: replace codec to component ASoC: adau1701: replace codec to component ASoC: adau17x1/adau1761/adau1781: replace codec to component ASoC: tlv320aic23: replace codec to component ASoC: tlv320aic26: replace codec to component ASoC: tlv320aic3x: replace codec to component ASoC: tlv320dac33: replace codec to component ASoC: tlv320aic32x4: replace codec to component ASoC: tlv320aic31xx: replace codec to component ASoC: cx20442: replace codec to component ASoC: tscs42xx: replace codec to component ASoC: pcm179x: replace codec to component ASoC: pcm3008: replace codec to component ASoC: pcm1681: replace codec to component ASoC: pcm512x: replace codec to component ASoC: pcm5102a: replace codec to component ASoC: pcm3168a: replace codec to component ASoC: twl6040: replace codec to component ASoC: twl4030: replace codec to component ASoC: msm8916-wcd-analog: replace codec to component ASoC: msm8916-wcd-digital: replace codec to component ASoC: spdif_transmitter: replace codec to component ASoC: spdif_receiver: replace codec to component ASoC: tas5720: replace codec to component ASoC: tas2552: replace codec to component ASoC: sun4i: replace codec to component ASoC: sun8i: replace codec to component ASoC: ads117x: replace codec to component ASoC: ab8500: replace codec to component ASoC: ad193x: replace codec to component ASoC: ad1836: replace codec to component ASoC: ad1980: replace codec to component ASoC: ad73311: replace codec to component ASoC: atmel-pdmic: replace codec to component ASoC: atmel-classd: replace codec to component ASoC: ssm4567: replace codec to component ASoC: ssm2602: replace codec to component ASoC: ssm2518: replace codec to component ASoC: sta350: replace codec to component ASoC: sta32x: replace codec to component ASoC: sta529: replace codec to component ASoC: tas5086: replace codec to component ASoC: tas571x: replace codec to component ASoC: nau8824: replace codec to component ASoC: nau8810: replace codec to component ASoC: nau8540: replace codec to component ASoC: es8316: replace codec to component ASoC: es7134: replace codec to component ASoC: es8328: replace codec to component ASoC: alc5632: replace codec to component ASoC: alc5623: replace codec to component ASoC: hdmi-codec: replace codec to component ASoC: bt-sco: replace codec to component ASoC: vc4_hdmi: replace codec to component ASoC: zx_aud96p22: replace codec to component ASoC: wl1273: replace codec to component ASoC: hdac_hdmi/nau8825/rt286/rt298/rt5663/da7219: replace codec to component ASoC: arizona: replace codec to component ASoC: mc13783: replace codec to component ASoC: sgtl5000: replace codec to component ASoC: stac9766: replace codec to component ASoC: sirf-audio: replace codec to component ASoC: inno_rk3036: replace codec to component ASoC: isabelle: replace codec to component ASoC: tfa9879: replace codec to component ASoC: dmic: replace codec to component ASoC: sti-sas: replace codec to component ASoC: gtm601: replace codec to component ASoC: 88pm860x: replace codec to component ASoC: pistachio: replace codec to component ASoC: lm49453: replace codec to component ASoC: cq93vc: replace codec to component ASoC: jz4740: replace codec to component ASoC: uda1380: replace codec to component ASoC: ml26124: replace codec to component ASoC: si476x: replace codec to component ASoC: uda134x: replace codec to component ASoC: ics43432: replace codec to component ASoC: pxa/mioa701_wm9713: replace codec to component ASoC: uniphier: evea: replace codec to component ASoC: pcm186x: replace codec to component ASoC: tas6424: replace codec to component drivers/gpu/drm/vc4/vc4_hdmi.c | 47 +- include/sound/dmaengine_pcm.h | 2 + include/sound/soc.h | 13 +- sound/soc/amd/acp-pcm-dma.c | 29 +- sound/soc/amd/acp-rt5645.c | 4 +- sound/soc/atmel/atmel-classd.c | 58 +- sound/soc/atmel/atmel-pcm-pdc.c | 6 +- sound/soc/atmel/atmel-pdmic.c | 60 +- sound/soc/au1x/dbdma2.c | 13 +- sound/soc/au1x/dma.c | 12 +- sound/soc/bcm/cygnus-pcm.c | 7 +- sound/soc/blackfin/bf5xx-ac97-pcm.c | 6 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 6 +- sound/soc/codecs/88pm860x-codec.c | 166 ++--- sound/soc/codecs/88pm860x-codec.h | 4 +- sound/soc/codecs/ab8500-codec.c | 295 ++++---- sound/soc/codecs/ac97.c | 46 +- sound/soc/codecs/ad1836.c | 68 +- sound/soc/codecs/ad193x-i2c.c | 7 - sound/soc/codecs/ad193x-spi.c | 7 - sound/soc/codecs/ad193x.c | 46 +- sound/soc/codecs/ad1980.c | 87 +-- sound/soc/codecs/ad73311.c | 27 +- sound/soc/codecs/adau1373.c | 84 +-- sound/soc/codecs/adau1701.c | 101 ++- sound/soc/codecs/adau1761.c | 88 +-- sound/soc/codecs/adau1781.c | 51 +- sound/soc/codecs/adau17x1.c | 67 +- sound/soc/codecs/adau17x1.h | 8 +- sound/soc/codecs/adau1977-i2c.c | 7 - sound/soc/codecs/adau1977-spi.c | 7 - sound/soc/codecs/adau1977.c | 59 +- sound/soc/codecs/adau7002.c | 20 +- sound/soc/codecs/adav801.c | 7 - sound/soc/codecs/adav803.c | 7 - sound/soc/codecs/adav80x.c | 130 ++-- sound/soc/codecs/ads117x.c | 27 +- sound/soc/codecs/ak4104.c | 68 +- sound/soc/codecs/ak4535.c | 78 +- sound/soc/codecs/ak4554.c | 27 +- sound/soc/codecs/ak4613.c | 73 +- sound/soc/codecs/ak4641.c | 91 +-- sound/soc/codecs/ak4642.c | 105 ++- sound/soc/codecs/ak4671.c | 67 +- sound/soc/codecs/ak5386.c | 62 +- sound/soc/codecs/alc5623.c | 147 ++-- sound/soc/codecs/alc5632.c | 138 ++-- sound/soc/codecs/arizona.c | 208 +++--- sound/soc/codecs/arizona.h | 24 +- sound/soc/codecs/bt-sco.c | 21 +- sound/soc/codecs/cq93vc.c | 33 +- sound/soc/codecs/cs35l32.c | 45 +- sound/soc/codecs/cs35l33.c | 186 +++-- sound/soc/codecs/cs35l34.c | 127 ++-- sound/soc/codecs/cs35l35.c | 104 ++- sound/soc/codecs/cs4265.c | 98 ++- sound/soc/codecs/cs4270.c | 124 ++-- sound/soc/codecs/cs4271-i2c.c | 7 - sound/soc/codecs/cs4271-spi.c | 7 - sound/soc/codecs/cs4271.c | 105 ++- sound/soc/codecs/cs42l42.c | 154 ++-- sound/soc/codecs/cs42l42.h | 2 +- sound/soc/codecs/cs42l51-i2c.c | 8 - sound/soc/codecs/cs42l51.c | 81 ++- sound/soc/codecs/cs42l52.c | 146 ++-- sound/soc/codecs/cs42l56.c | 158 ++-- sound/soc/codecs/cs42l73.c | 122 ++-- sound/soc/codecs/cs42xx8-i2c.c | 1 - sound/soc/codecs/cs42xx8.c | 57 +- sound/soc/codecs/cs43130.c | 243 ++++--- sound/soc/codecs/cs43130.h | 2 +- sound/soc/codecs/cs4349.c | 39 +- sound/soc/codecs/cs47l24.c | 120 ++- sound/soc/codecs/cs53l30.c | 57 +- sound/soc/codecs/cx20442.c | 89 ++- sound/soc/codecs/da7210.c | 181 +++-- sound/soc/codecs/da7213.c | 328 ++++----- sound/soc/codecs/da7218.c | 498 +++++++------ sound/soc/codecs/da7218.h | 2 +- sound/soc/codecs/da7219-aad.c | 236 +++--- sound/soc/codecs/da7219-aad.h | 12 +- sound/soc/codecs/da7219.c | 307 ++++---- sound/soc/codecs/da7219.h | 2 +- sound/soc/codecs/da732x.c | 241 +++--- sound/soc/codecs/da9055.c | 186 +++-- sound/soc/codecs/dmic.c | 33 +- sound/soc/codecs/es7134.c | 27 +- sound/soc/codecs/es8316.c | 80 +- sound/soc/codecs/es8328-i2c.c | 7 - sound/soc/codecs/es8328-spi.c | 7 - sound/soc/codecs/es8328.c | 147 ++-- sound/soc/codecs/gtm601.c | 28 +- sound/soc/codecs/hdac_hdmi.c | 47 +- sound/soc/codecs/hdac_hdmi.h | 2 +- sound/soc/codecs/hdmi-codec.c | 23 +- sound/soc/codecs/ics43432.c | 16 +- sound/soc/codecs/inno_rk3036.c | 70 +- sound/soc/codecs/isabelle.c | 57 +- sound/soc/codecs/jz4740.c | 50 +- sound/soc/codecs/lm49453.c | 65 +- sound/soc/codecs/max98088.c | 314 ++++---- sound/soc/codecs/max98090.c | 319 ++++---- sound/soc/codecs/max98090.h | 4 +- sound/soc/codecs/max98095.c | 448 ++++++------ sound/soc/codecs/max98095.h | 2 +- sound/soc/codecs/max98357a.c | 29 +- sound/soc/codecs/max98371.c | 43 +- sound/soc/codecs/max98371.h | 1 - sound/soc/codecs/max98373.c | 75 +- sound/soc/codecs/max9850.c | 80 +- sound/soc/codecs/max9860.c | 70 +- sound/soc/codecs/max9867.c | 65 +- sound/soc/codecs/max9867.h | 2 +- sound/soc/codecs/max98925.c | 72 +- sound/soc/codecs/max98925.h | 2 +- sound/soc/codecs/max98926.c | 56 +- sound/soc/codecs/max98926.h | 2 +- sound/soc/codecs/max98927.c | 82 +-- sound/soc/codecs/max98927.h | 2 +- sound/soc/codecs/mc13783.c | 68 +- sound/soc/codecs/ml26124.c | 103 ++- sound/soc/codecs/msm8916-wcd-analog.c | 207 +++--- sound/soc/codecs/msm8916-wcd-digital.c | 115 +-- sound/soc/codecs/nau8540.c | 79 +- sound/soc/codecs/nau8810.c | 73 +- sound/soc/codecs/nau8824.c | 113 ++- sound/soc/codecs/nau8824.h | 2 +- sound/soc/codecs/nau8825.c | 107 ++- sound/soc/codecs/nau8825.h | 2 +- sound/soc/codecs/pcm1681.c | 62 +- sound/soc/codecs/pcm179x-i2c.c | 6 - sound/soc/codecs/pcm179x-spi.c | 6 - sound/soc/codecs/pcm179x.c | 45 +- sound/soc/codecs/pcm179x.h | 1 - sound/soc/codecs/pcm186x-i2c.c | 8 - sound/soc/codecs/pcm186x-spi.c | 8 - sound/soc/codecs/pcm186x.c | 143 ++-- sound/soc/codecs/pcm186x.h | 1 - sound/soc/codecs/pcm3008.c | 36 +- sound/soc/codecs/pcm3168a.c | 51 +- sound/soc/codecs/pcm5102a.c | 16 +- sound/soc/codecs/pcm512x.c | 162 ++--- sound/soc/codecs/rt274.c | 206 +++--- sound/soc/codecs/rt286.c | 198 +++-- sound/soc/codecs/rt286.h | 2 +- sound/soc/codecs/rt298.c | 210 +++--- sound/soc/codecs/rt298.h | 2 +- sound/soc/codecs/rt5514-spi.c | 36 +- sound/soc/codecs/rt5514.c | 124 ++-- sound/soc/codecs/rt5514.h | 2 +- sound/soc/codecs/rt5616.c | 219 +++--- sound/soc/codecs/rt5631.c | 324 +++++---- sound/soc/codecs/rt5640.c | 260 ++++--- sound/soc/codecs/rt5640.h | 6 +- sound/soc/codecs/rt5645.c | 370 +++++----- sound/soc/codecs/rt5645.h | 4 +- sound/soc/codecs/rt5651.c | 220 +++--- sound/soc/codecs/rt5651.h | 4 +- sound/soc/codecs/rt5659.c | 307 ++++---- sound/soc/codecs/rt5659.h | 4 +- sound/soc/codecs/rt5660.c | 145 ++-- sound/soc/codecs/rt5660.h | 2 +- sound/soc/codecs/rt5663.c | 600 ++++++++------- sound/soc/codecs/rt5663.h | 4 +- sound/soc/codecs/rt5665.c | 345 +++++---- sound/soc/codecs/rt5665.h | 2 +- sound/soc/codecs/rt5670.c | 295 ++++---- sound/soc/codecs/rt5670.h | 10 +- sound/soc/codecs/rt5677.c | 205 +++--- sound/soc/codecs/rt5677.h | 4 +- sound/soc/codecs/sgtl5000.c | 173 +++-- sound/soc/codecs/si476x.c | 42 +- sound/soc/codecs/sirf-audio-codec.c | 58 +- sound/soc/codecs/spdif_receiver.c | 26 +- sound/soc/codecs/spdif_transmitter.c | 26 +- sound/soc/codecs/ssm2518.c | 57 +- sound/soc/codecs/ssm2602-i2c.c | 7 - sound/soc/codecs/ssm2602-spi.c | 7 - sound/soc/codecs/ssm2602.c | 77 +- sound/soc/codecs/ssm4567.c | 44 +- sound/soc/codecs/sta32x.c | 134 ++-- sound/soc/codecs/sta350.c | 117 ++- sound/soc/codecs/sta529.c | 69 +- sound/soc/codecs/stac9766.c | 77 +- sound/soc/codecs/sti-sas.c | 84 +-- sound/soc/codecs/tas2552.c | 178 +++-- sound/soc/codecs/tas5086.c | 94 +-- sound/soc/codecs/tas571x.c | 55 +- sound/soc/codecs/tas5720.c | 151 ++-- sound/soc/codecs/tas6424.c | 99 ++- sound/soc/codecs/tfa9879.c | 50 +- sound/soc/codecs/tlv320aic23-i2c.c | 7 - sound/soc/codecs/tlv320aic23-spi.c | 7 - sound/soc/codecs/tlv320aic23.c | 120 +-- sound/soc/codecs/tlv320aic26.c | 83 +-- sound/soc/codecs/tlv320aic31xx.c | 240 +++--- sound/soc/codecs/tlv320aic32x4.c | 207 +++--- sound/soc/codecs/tlv320aic3x.c | 293 ++++---- sound/soc/codecs/tlv320dac33.c | 402 +++++----- sound/soc/codecs/tscs42xx.c | 222 +++--- sound/soc/codecs/twl4030.c | 383 +++++----- sound/soc/codecs/twl6040.c | 269 ++++--- sound/soc/codecs/twl6040.h | 10 +- sound/soc/codecs/uda134x.c | 78 +- sound/soc/codecs/uda1380.c | 160 ++-- sound/soc/codecs/wl1273.c | 93 ++- sound/soc/codecs/wl1273.h | 2 +- sound/soc/codecs/wm0010.c | 181 +++-- sound/soc/codecs/wm1250-ev1.c | 27 +- sound/soc/codecs/wm2000.c | 78 +- sound/soc/codecs/wm2200.c | 157 ++-- sound/soc/codecs/wm5100.c | 260 ++++--- sound/soc/codecs/wm5100.h | 2 +- sound/soc/codecs/wm5102.c | 140 ++-- sound/soc/codecs/wm5110.c | 174 ++--- sound/soc/codecs/wm8350.c | 183 +++-- sound/soc/codecs/wm8350.h | 4 +- sound/soc/codecs/wm8400.c | 211 +++--- sound/soc/codecs/wm8510.c | 149 ++-- sound/soc/codecs/wm8523.c | 98 ++- sound/soc/codecs/wm8524.c | 56 +- sound/soc/codecs/wm8580.c | 150 ++-- sound/soc/codecs/wm8711.c | 116 ++- sound/soc/codecs/wm8727.c | 29 +- sound/soc/codecs/wm8728.c | 82 +-- sound/soc/codecs/wm8731.c | 101 ++- sound/soc/codecs/wm8737.c | 109 ++- sound/soc/codecs/wm8741.c | 133 ++-- sound/soc/codecs/wm8750.c | 115 ++- sound/soc/codecs/wm8753.c | 289 ++++---- sound/soc/codecs/wm8770.c | 131 ++-- sound/soc/codecs/wm8776.c | 105 ++- sound/soc/codecs/wm8782.c | 27 +- sound/soc/codecs/wm8804.c | 100 ++- sound/soc/codecs/wm8900.c | 251 ++++--- sound/soc/codecs/wm8903.c | 211 +++--- sound/soc/codecs/wm8903.h | 2 +- sound/soc/codecs/wm8904.c | 355 +++++---- sound/soc/codecs/wm8940.c | 159 ++-- sound/soc/codecs/wm8955.c | 189 +++-- sound/soc/codecs/wm8958-dsp2.c | 278 +++---- sound/soc/codecs/wm8960.c | 249 +++---- sound/soc/codecs/wm8961.c | 241 +++--- sound/soc/codecs/wm8962.c | 397 +++++----- sound/soc/codecs/wm8962.h | 2 +- sound/soc/codecs/wm8971.c | 108 ++- sound/soc/codecs/wm8974.c | 143 ++-- sound/soc/codecs/wm8978.c | 185 +++-- sound/soc/codecs/wm8983.c | 170 ++--- sound/soc/codecs/wm8985.c | 201 +++-- sound/soc/codecs/wm8988.c | 127 ++-- sound/soc/codecs/wm8990.c | 179 +++-- sound/soc/codecs/wm8991.c | 167 ++--- sound/soc/codecs/wm8993.c | 237 +++--- sound/soc/codecs/wm8994.c | 810 +++++++++++---------- sound/soc/codecs/wm8994.h | 8 +- sound/soc/codecs/wm8995.c | 286 ++++---- sound/soc/codecs/wm8996.c | 401 +++++----- sound/soc/codecs/wm8996.h | 4 +- sound/soc/codecs/wm8997.c | 62 +- sound/soc/codecs/wm8998.c | 88 ++- sound/soc/codecs/wm9081.c | 228 +++--- sound/soc/codecs/wm9090.c | 109 ++- sound/soc/codecs/wm9705.c | 83 +-- sound/soc/codecs/wm9712.c | 109 ++- sound/soc/codecs/wm9713.c | 201 +++-- sound/soc/codecs/wm_adsp.c | 58 +- sound/soc/codecs/wm_adsp.h | 6 +- sound/soc/codecs/wm_hubs.c | 254 +++---- sound/soc/codecs/wm_hubs.h | 18 +- sound/soc/codecs/zx_aud96p22.c | 35 +- sound/soc/davinci/davinci-i2s.c | 13 +- sound/soc/dwc/dwc-pcm.c | 5 +- sound/soc/fsl/fsl_asrc.c | 10 - sound/soc/fsl/fsl_asrc.h | 3 +- sound/soc/fsl/fsl_asrc_dma.c | 14 +- sound/soc/fsl/fsl_dma.c | 27 +- sound/soc/fsl/imx-pcm-fiq.c | 6 +- sound/soc/fsl/mpc5200_dma.c | 16 +- sound/soc/fsl/wm1133-ev1.c | 6 +- sound/soc/img/pistachio-internal-dac.c | 34 +- sound/soc/intel/atom/sst-atom-controls.c | 36 +- sound/soc/intel/atom/sst-mfld-platform-compress.c | 4 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 32 +- sound/soc/intel/atom/sst-mfld-platform.h | 4 +- sound/soc/intel/baytrail/sst-baytrail-pcm.c | 66 +- sound/soc/intel/boards/bdw-rt5677.c | 41 +- sound/soc/intel/boards/broadwell.c | 17 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 12 +- sound/soc/intel/boards/bxt_rt298.c | 12 +- sound/soc/intel/boards/byt-rt5640.c | 4 +- sound/soc/intel/boards/bytcr_rt5640.c | 8 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 8 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 18 +- sound/soc/intel/boards/haswell.c | 3 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 14 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 14 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 12 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 12 +- sound/soc/intel/boards/skl_rt286.c | 12 +- sound/soc/intel/haswell/sst-haswell-ipc.h | 2 + sound/soc/intel/haswell/sst-haswell-pcm.c | 118 ++- sound/soc/intel/skylake/skl-debug.c | 2 +- sound/soc/intel/skylake/skl-pcm.c | 52 +- sound/soc/intel/skylake/skl-topology.c | 26 +- sound/soc/intel/skylake/skl-topology.h | 2 +- sound/soc/intel/skylake/skl.h | 2 +- sound/soc/kirkwood/kirkwood-dma.c | 3 +- sound/soc/kirkwood/kirkwood-i2s.c | 20 +- sound/soc/kirkwood/kirkwood.h | 4 +- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 16 +- .../soc/mediatek/common/mtk-afe-platform-driver.c | 9 +- .../soc/mediatek/common/mtk-afe-platform-driver.h | 3 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 50 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 42 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 4 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 12 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 12 +- sound/soc/nuc900/nuc900-pcm.c | 5 +- sound/soc/omap/ams-delta.c | 20 +- sound/soc/omap/omap-abe-twl6040.c | 8 +- sound/soc/omap/omap-pcm.c | 5 +- sound/soc/pxa/mioa701_wm9713.c | 30 +- sound/soc/pxa/mmp-pcm.c | 11 +- sound/soc/pxa/pxa2xx-pcm.c | 5 +- sound/soc/pxa/ttc-dkb.c | 6 +- sound/soc/qcom/lpass-platform.c | 42 +- sound/soc/rockchip/rk3399_gru_sound.c | 4 +- sound/soc/rockchip/rockchip_rt5645.c | 8 +- sound/soc/samsung/idma.c | 5 +- sound/soc/samsung/littlemill.c | 8 +- sound/soc/samsung/lowland.c | 12 +- sound/soc/samsung/speyside.c | 12 +- sound/soc/samsung/tm2_wm5110.c | 54 +- sound/soc/samsung/tobermory.c | 6 +- sound/soc/sh/dma-sh7760.c | 5 +- sound/soc/sh/fsi.c | 24 +- sound/soc/sh/rcar/core.c | 22 +- sound/soc/sh/siu.h | 2 +- sound/soc/sh/siu_dai.c | 10 +- sound/soc/sh/siu_pcm.c | 9 +- sound/soc/soc-ac97.c | 84 ++- sound/soc/soc-core.c | 5 - sound/soc/soc-generic-dmaengine-pcm.c | 55 +- sound/soc/soc-utils.c | 28 +- sound/soc/stm/stm32_adfsdm.c | 7 +- sound/soc/sunxi/sun4i-codec.c | 71 +- sound/soc/sunxi/sun8i-codec.c | 23 +- sound/soc/tegra/tegra_wm8903.c | 8 +- sound/soc/txx9/txx9aclc.c | 26 +- sound/soc/uniphier/evea.c | 67 +- sound/soc/xtensa/xtfpga-i2s.c | 17 +- 354 files changed, 14618 insertions(+), 15702 deletions(-) Best regards --- Kuninori Morimoto

5 420

[alsa-devel] [PATCH] ASoC: ak4613: don't have .use_pmdown_time
by Kuninori Morimoto 14 Feb '18

14 Feb '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> snd_soc_runtime_ignore_pmdown_time() returns "ignore pmdown time" decision. Then, it collects each component driver's .use_pmdown_time settings by using AND operation. But, ak4613 has no reason to ignore/use pmdown time. Thus, It should has use_pmdown_time=0, it means it doesn't have decision right of "ignore pmdown time". Otherwise, ak4613 paired driver's pmdown_time settings doesn't have meaning. In other words, "ignore pmdown time" is determined irrespective of the value of paired driver's settings (= ignore will be 0 by ak4613). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/ak4613.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index a7b1e3a..8523ff9 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -610,7 +610,6 @@ static int ak4613_resume(struct snd_soc_component *component) .dapm_routes = ak4613_intercon, .num_dapm_routes = ARRAY_SIZE(ak4613_intercon), .idle_bias_on = 1, - .use_pmdown_time = 1, .endianness = 1, .non_legacy_dai_naming = 1, }; -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: ak4642: don't have .use_pmdown_time
by Kuninori Morimoto 14 Feb '18

14 Feb '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> snd_soc_runtime_ignore_pmdown_time() returns "ignore pmdown time" decision. Then, it collects each component driver's .use_pmdown_time settings by using AND operation. But, ak4613 has no reason to ignore/use pmdown time. Thus, It should has use_pmdown_time=0, it means it doesn't have decision right of "ignore pmdown time". Otherwise, ak4642 paired driver's pmdown_time settings doesn't have meaning. In other words, "ignore pmdown time" is determined irrespective of the value of paired driver's settings (= ignore will be 0 by ak4642). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/ak4642.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 9c35e91..6050559 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -562,7 +562,6 @@ static int ak4642_probe(struct snd_soc_component *component) .dapm_routes = ak4642_intercon, .num_dapm_routes = ARRAY_SIZE(ak4642_intercon), .idle_bias_on = 1, - .use_pmdown_time = 1, .endianness = 1, .non_legacy_dai_naming = 1, }; -- 1.9.1

2 1

[alsa-devel] [PATCH 1/2] ASoC: wm9712: Use empty struct initializer
by Fabio Estevam 14 Feb '18

14 Feb '18

From: Fabio Estevam <fabio.estevam(a)nxp.com> { 0 } only clears the first member of the structure. The first member of the snd_soc_dapm_update struct is pointer, so wrting 0 to a pointer results in the following sparse warning: sound/soc/codecs/wm9712.c:229:47: warning: Using plain integer as NULL pointer Use the empty struct initializer that clears all the struct members and fixes the sparse warning. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/codecs/wm9712.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 7aeeeec..953d94d 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -226,7 +226,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol, struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; unsigned int mixer, mask, shift, old; - struct snd_soc_dapm_update update = { 0 }; + struct snd_soc_dapm_update update = {}; bool change; mixer = mc->shift >> 8; -- 2.7.4

3 4

[alsa-devel] [PATCH] ASoC: uniphier: fix an error code in uniphier_aio_comprdma_new()
by Dan Carpenter 14 Feb '18

14 Feb '18

The dma_mapping_error() returns true or false, but we want to return -ENOMEM if there was an error. Fixes: e98131222ff9 ("ASoC: uniphier: add support for UniPhier AIO compress audio") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/uniphier/aio-compress.c b/sound/soc/uniphier/aio-compress.c index 7f7abe3ae99d..4751c8bdabec 100644 --- a/sound/soc/uniphier/aio-compress.c +++ b/sound/soc/uniphier/aio-compress.c @@ -54,12 +54,11 @@ static int uniphier_aio_comprdma_new(struct snd_soc_pcm_runtime *rtd) dma_dir = DMA_TO_DEVICE; sub->compr_addr = dma_map_single(dev, sub->compr_area, size, dma_dir); - ret = dma_mapping_error(dev, sub->compr_addr); - if (ret) { + if (dma_mapping_error(dev, sub->compr_addr)) { kfree(sub->compr_area); sub->compr_area = NULL; - return ret; + return -ENOMEM; } sub->compr_bytes = size;

2 1

[alsa-devel] [PATCH][RFC] ASoC: soc-core: soc_probe_dai() code simplification
by Kuninori Morimoto 14 Feb '18

14 Feb '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current soc_probe_dai() is using deep nested condition. Thus, it is difficult to read/understand. This patch simplification it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9c65477..7687515 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1619,22 +1619,21 @@ static int soc_probe_link_components(struct snd_soc_card *card, static int soc_probe_dai(struct snd_soc_dai *dai, int order) { - int ret; + if (dai->probed || + dai->driver->probe_order != order) + return 0; - if (!dai->probed && dai->driver->probe_order == order) { - if (dai->driver->probe) { - ret = dai->driver->probe(dai); - if (ret < 0) { - dev_err(dai->dev, - "ASoC: failed to probe DAI %s: %d\n", - dai->name, ret); - return ret; - } + if (dai->driver->probe) { + int ret = dai->driver->probe(dai); + if (ret < 0) { + dev_err(dai->dev, "ASoC: failed to probe DAI %s: %d\n", + dai->name, ret); + return ret; } - - dai->probed = 1; } + dai->probed = 1; + return 0; } -- 1.9.1

2 1

[alsa-devel] [PATCH v2 0/7] ASoC: samsung: Add HDMI sound support for tm2 board
by Sylwester Nawrocki 14 Feb '18

14 Feb '18

This series adds support for HDMI audio on exynos5433 tm2 board, it includes a few fixes for the I2S driver and an extension of the existing card driver to support the I2S1<->HDMI transmitter path. In v2 only support for 48k/96k/192k samples rate is left, as adjusting the AUD PLL output frequency might cause regressions. Sylwester Nawrocki (7): ASoC: samsung: i2s: Update clock-output-names property documentation ASoC: samsung: i2s: Ensure names of supplied clocks are unique ASoC: samsung: i2s: Prevent external abort on exynos5433 I2S1 access ASoC: samsung: i2s: Define the parameters list for SAMSUNG_I2S_OPCLK ASoC: samsung,tm2-audio DT binding documentation update ASoC: samsung: Add support for HDMI audio on TM2 board ASoC: samsung: Add missing #sound-dai-cells property documentation .../bindings/sound/samsung,tm2-audio.txt | 14 +- .../devicetree/bindings/sound/samsung-i2s.txt | 22 +-- sound/soc/samsung/i2s-regs.h | 11 +- sound/soc/samsung/i2s.c | 39 ++++-- sound/soc/samsung/i2s.h | 11 +- sound/soc/samsung/tm2_wm5110.c | 152 +++++++++++++++++---- 6 files changed, 191 insertions(+), 58 deletions(-) -- 2.14.2

3 16

[alsa-devel] [PATCH 0/8] ASoC: samsung: Add HDMI sound support for tm2 board
by Sylwester Nawrocki 14 Feb '18

14 Feb '18

This series adds support for HDMI audio on exynos5433 tm2 board, it includes a few fixes for the I2S driver and an extension of the existing card driver to support the I2S1<->HDMI transmitter path. Sylwester Nawrocki (8): ASoC: samsung: i2s: Ensure the RCLK rate is properly determined ASoC: samsung: i2s: Ensure names of supplied clocks are unique ASoC: samsung: i2s: Prevent external abort on exynos5433 I2S1 access ASoC: samsung: i2s: Define the parameters list for SAMSUNG_I2S_OPCLK ASoC: samsung: Add support for HDMI audio on TM2 board ASoC: samsung: i2s: Update clock-output-names property documentation ASoC: samsung: Add missing #sound-dai-cells property documentation ASoC: samsung,tm2-audio DT binding documentation update .../bindings/sound/samsung,tm2-audio.txt | 14 +- .../devicetree/bindings/sound/samsung-i2s.txt | 22 +-- sound/soc/samsung/i2s-regs.h | 11 +- sound/soc/samsung/i2s.c | 50 ++++-- sound/soc/samsung/i2s.h | 11 +- sound/soc/samsung/tm2_wm5110.c | 180 ++++++++++++++++++--- 6 files changed, 229 insertions(+), 59 deletions(-) -- 2.14.2

4 28

[alsa-devel] [PATCH v5] ASoC: tlv320aic31xx: Fix master mode clock I2S bus clocks
by Peter Ujfalusi 14 Feb '18

14 Feb '18

In the reset state of the codec we do not have complete playback or capture routes. The audio playback/capture will not work due to missing clock signals on the I2S bus if PLL, MDAC/NDAC/DAC MADC/NADC/ADC is powered down. To make sure that even if all output/input is disconnected the codec is generating clocks, we need to have valid DAPM route in every case to power up the must needed parts of the codec. I have verified that switching DAC (during playback) or ADC (during capture) will stop the I2S clocks, so the only solution is to connect the 'Off' routes as well to output/input. The routes will be only added if the codec is clock master. In case the role changes runtime, the applied routes are removed. Tested on am43x-epos-evm with aic3111 codec in master mode. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Reviewed-by: Jyri Sarha <jsarha(a)ti.com> --- Hi, CHanges since v4: - Rebased on top of CODEC to component conversion - Added Reviewed-by from Jyri Changes since v3: - install or remove the master mode DAPM routes if needed - move the clock master DAPM route 'management' to a separate function Changes since v2: - Leftover debug prints removed. Changes since v1: - Only apply the master mode DAPM routes when the codec is clock master - comments added to explain the need. Regards, Peter sound/soc/codecs/tlv320aic31xx.c | 73 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index d3cd924dc300..7090342e8285 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -166,6 +166,7 @@ struct aic31xx_priv { unsigned int sysclk; u8 p_div; int rate_div_line; + bool master_dapm_route_applied; }; struct aic31xx_rate_divs { @@ -670,6 +671,29 @@ aic310x_audio_map[] = { {"SPK", NULL, "SPK ClassD"}, }; +/* + * Always connected DAPM routes for codec clock master modes. + * If the codec is the master on the I2S bus, we need to power on components + * to have valid DAC_CLK and also the DACs and ADC for playback/capture. + * Otherwise the codec will not generate clocks on the bus. + */ +static const struct snd_soc_dapm_route +common31xx_cm_audio_map[] = { + {"DAC Left Input", "Off", "DAC IN"}, + {"DAC Right Input", "Off", "DAC IN"}, + + {"HPL", NULL, "DAC Left"}, + {"HPR", NULL, "DAC Right"}, +}; + +static const struct snd_soc_dapm_route +aic31xx_cm_audio_map[] = { + {"MIC1LP P-Terminal", "Off", "MIC1LP"}, + {"MIC1RP P-Terminal", "Off", "MIC1RP"}, + {"MIC1LM P-Terminal", "Off", "MIC1LM"}, + {"MIC1LM M-Terminal", "Off", "MIC1LM"}, +}; + static int aic31xx_add_controls(struct snd_soc_component *component) { int ret = 0; @@ -912,6 +936,53 @@ static int aic31xx_dac_mute(struct snd_soc_dai *codec_dai, int mute) return 0; } +static int aic31xx_clock_master_routes(struct snd_soc_component *component, + unsigned int fmt) +{ + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); + struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component); + int ret; + + fmt &= SND_SOC_DAIFMT_MASTER_MASK; + if (fmt == SND_SOC_DAIFMT_CBS_CFS && + aic31xx->master_dapm_route_applied) { + /* + * Remove the DAPM route(s) for codec clock master modes, + * if applied + */ + ret = snd_soc_dapm_del_routes(dapm, common31xx_cm_audio_map, + ARRAY_SIZE(common31xx_cm_audio_map)); + if (!ret && !(aic31xx->codec_type & DAC31XX_BIT)) + ret = snd_soc_dapm_del_routes(dapm, + aic31xx_cm_audio_map, + ARRAY_SIZE(aic31xx_cm_audio_map)); + + if (ret) + return ret; + + aic31xx->master_dapm_route_applied = false; + } else if (fmt != SND_SOC_DAIFMT_CBS_CFS && + !aic31xx->master_dapm_route_applied) { + /* + * Add the needed DAPM route(s) for codec clock master modes, + * if it is not done already + */ + ret = snd_soc_dapm_add_routes(dapm, common31xx_cm_audio_map, + ARRAY_SIZE(common31xx_cm_audio_map)); + if (!ret && !(aic31xx->codec_type & DAC31XX_BIT)) + ret = snd_soc_dapm_add_routes(dapm, + aic31xx_cm_audio_map, + ARRAY_SIZE(aic31xx_cm_audio_map)); + + if (ret) + return ret; + + aic31xx->master_dapm_route_applied = true; + } + + return 0; +} + static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { @@ -992,7 +1063,7 @@ static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai, AIC31XX_BCLKINV_MASK, iface_reg2); - return 0; + return aic31xx_clock_master_routes(component, fmt); } static int aic31xx_set_dai_sysclk(struct snd_soc_dai *codec_dai, -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 1