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

[alsa-devel] [PATCH] ASoC: Intel: Skylake: make function skl_clk_round_rate static
by Colin King 12 Feb '18

12 Feb '18

From: Colin Ian King <colin.king(a)canonical.com> The function skl_clk_round_rate is local to the source and does not need to be in global scope, so make it static. Cleans up sparse warning: sound/soc/intel/skylake/skl-ssp-clk.c:250:6: warning: symbol 'skl_clk_round_rate' was not declared. Should it be static? Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/intel/skylake/skl-ssp-clk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/skylake/skl-ssp-clk.c b/sound/soc/intel/skylake/skl-ssp-clk.c index 7fbddf5e3b00..cda1b5fa7436 100644 --- a/sound/soc/intel/skylake/skl-ssp-clk.c +++ b/sound/soc/intel/skylake/skl-ssp-clk.c @@ -247,8 +247,8 @@ static unsigned long skl_clk_recalc_rate(struct clk_hw *hw, } /* Not supported by clk driver. Implemented to satisfy clk fw */ -long skl_clk_round_rate(struct clk_hw *hw, unsigned long rate, - unsigned long *parent_rate) +static long skl_clk_round_rate(struct clk_hw *hw, unsigned long rate, + unsigned long *parent_rate) { return rate; } -- 2.15.1

4 3

[alsa-devel] [PATCH] ASoC: wm_adsp: Don't init cache from DSP memory if control is write-only
by Richard Fitzgerald 12 Feb '18

12 Feb '18

For controls marked write-only don't initialize the cache from the content of the DSP memory. We stil need the cache for any new data that is written to this control, and we need to return something for a read of the ALSA control because most user-side code assumes all ALSA controls are readable. The cache is already created zero- filled so the only change needed is to skip populating it from DSP memory if the control isn't readable. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- sound/soc/codecs/wm_adsp.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 66e32f5d2917..0060aeb63a9f 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1237,9 +1237,16 @@ static int wm_coeff_init_control_caches(struct wm_adsp *dsp) if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) continue; - ret = wm_coeff_read_control(ctl, ctl->cache, ctl->len); - if (ret < 0) - return ret; + /* + * For readable controls populate the cache from the DSP memory. + * For non-readable controls the cache was zero-filled when + * created so we don't need to do anything. + */ + if (!ctl->flags || (ctl->flags & WMFW_CTL_FLAG_READABLE)) { + ret = wm_coeff_read_control(ctl, ctl->cache, ctl->len); + if (ret < 0) + return ret; + } } return 0; -- 2.11.0

2 1

[alsa-devel] [PATCH 000/187] ASoC: replace codec to component
by Kuninori Morimoto 12 Feb '18

12 Feb '18

Hi Mark codec/platform can be replaced to component now. These patches do it for codec. These are based on "asoc-v4.16" tag Current existing "codec" related codes will be no longer needed by these patches. I can post it, but I don't know when is good timing Kuninori Morimoto (187): 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: 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/cs47l24/wm5102/wm5110/wm8997/wm8998/wm_adsp: replace codec to component ASoC: mc13783: replace codec to component ASoC: sgtl5000: replace codec to component ASoC: stac9766: replace codec to component ASoC: sn95031: replace codec to component ASoC: cx20442: 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/soc.h | 13 +- sound/soc/amd/acp-rt5645.c | 4 +- sound/soc/atmel/atmel-classd.c | 54 +- sound/soc/atmel/atmel-pdmic.c | 56 +- 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 | 67 +- 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 | 86 +-- sound/soc/codecs/cs53l30.c | 57 +- sound/soc/codecs/cx20442.c | 85 +-- 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 | 4 +- 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/sn95031.c | 219 +++--- sound/soc/codecs/sn95031.h | 2 +- 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 | 392 +++++----- sound/soc/codecs/tscs42xx.c | 222 +++--- sound/soc/codecs/twl4030.c | 379 +++++----- sound/soc/codecs/twl6040.c | 265 ++++--- sound/soc/codecs/twl6040.h | 10 +- sound/soc/codecs/uda134x.c | 78 +- sound/soc/codecs/uda1380.c | 156 ++-- 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 | 106 ++- sound/soc/codecs/wm5110.c | 140 ++-- 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/fsl/wm1133-ev1.c | 6 +- sound/soc/img/pistachio-internal-dac.c | 34 +- sound/soc/intel/boards/bdw-rt5677.c | 38 +- sound/soc/intel/boards/broadwell.c | 14 +- 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/kbl_rt5663_max98927.c | 14 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 14 +- sound/soc/intel/boards/mfld_machine.c | 12 +- 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/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/omap/ams-delta.c | 20 +- sound/soc/omap/omap-abe-twl6040.c | 8 +- sound/soc/pxa/mioa701_wm9713.c | 30 +- sound/soc/pxa/ttc-dkb.c | 6 +- sound/soc/rockchip/rk3399_gru_sound.c | 4 +- sound/soc/rockchip/rockchip_rt5645.c | 8 +- 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/soc-ac97.c | 84 ++- sound/soc/soc-utils.c | 22 +- sound/soc/sunxi/sun4i-codec.c | 71 +- sound/soc/sunxi/sun8i-codec.c | 23 +- sound/soc/tegra/tegra_wm8903.c | 8 +- sound/soc/uniphier/evea.c | 67 +- 303 files changed, 14204 insertions(+), 15237 deletions(-) -- 1.9.1

4 201

Re: [alsa-devel] [PATCH] ASoC: codecs: Add support for AK4458 DAC driver
by Fabio Estevam 12 Feb '18

12 Feb '18

On Wed, Jan 31, 2018 at 11:20 AM, Cosmin-Gabriel Samoila <cosmin.samoila(a)nxp.com> wrote: > The AK4458 is a 32-bit 8ch Premium DAC that corresponds > to a 768kHz PCM input and an 11.2MHz DSD input at maximum. > It supports I2S, DSD and TDM modes with 24 or 32 bit MSB > or 16, 24, 32 LSB formats. Its datasheet is available here: > https://www.akm.com/akm/en/file/datasheet/AK4458VN.pdf > > Signed-off-by: Junichi Wakasugi <wakasugi.jb(a)om.asahi-kasei.co.jp> > Signed-off-by: Mihai Serban <mihai.serban(a)nxp.com> > Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> > Signed-off-by: Cosmin-Gabriel Samoila <cosmin.samoila(a)nxp.com> Please sync with Daniel's recent codec submission. Many of the feedback provided there applies to this code as well.

1 0

[alsa-devel] Applied "ASoC: rt5659: replace codec to component" to the asoc tree
by Mark Brown 12 Feb '18

12 Feb '18

The patch ASoC: rt5659: replace codec to component has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From de86a33253d07675abbb1fa294ffb4f3df6f219e Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 29 Jan 2018 03:45:50 +0000 Subject: [PATCH] ASoC: rt5659: replace codec to component Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 1 -> .idle_bias_on = 0 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/rt5659.c | 307 ++++++++++++++++++++++------------------------ sound/soc/codecs/rt5659.h | 4 +- 2 files changed, 151 insertions(+), 160 deletions(-) diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index c4a704e9a4db..ef3a44d6386b 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -1238,26 +1238,26 @@ static SOC_VALUE_ENUM_SINGLE_DECL( static int rt5659_hp_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); int ret = snd_soc_put_volsw(kcontrol, ucontrol); - if (snd_soc_read(codec, RT5659_STO_NG2_CTRL_1) & RT5659_NG2_EN) { - snd_soc_update_bits(codec, RT5659_STO_NG2_CTRL_1, + if (snd_soc_component_read32(component, RT5659_STO_NG2_CTRL_1) & RT5659_NG2_EN) { + snd_soc_component_update_bits(component, RT5659_STO_NG2_CTRL_1, RT5659_NG2_EN_MASK, RT5659_NG2_DIS); - snd_soc_update_bits(codec, RT5659_STO_NG2_CTRL_1, + snd_soc_component_update_bits(component, RT5659_STO_NG2_CTRL_1, RT5659_NG2_EN_MASK, RT5659_NG2_EN); } return ret; } -static void rt5659_enable_push_button_irq(struct snd_soc_codec *codec, +static void rt5659_enable_push_button_irq(struct snd_soc_component *component, bool enable) { - struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); if (enable) { - snd_soc_write(codec, RT5659_4BTN_IL_CMD_1, 0x000b); + snd_soc_component_write(component, RT5659_4BTN_IL_CMD_1, 0x000b); /* MICBIAS1 and Mic Det Power for button detect*/ snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1"); @@ -1265,19 +1265,19 @@ static void rt5659_enable_push_button_irq(struct snd_soc_codec *codec, "Mic Det Power"); snd_soc_dapm_sync(dapm); - snd_soc_update_bits(codec, RT5659_PWR_ANLG_2, + snd_soc_component_update_bits(component, RT5659_PWR_ANLG_2, RT5659_PWR_MB1, RT5659_PWR_MB1); - snd_soc_update_bits(codec, RT5659_PWR_VOL, + snd_soc_component_update_bits(component, RT5659_PWR_VOL, RT5659_PWR_MIC_DET, RT5659_PWR_MIC_DET); - snd_soc_update_bits(codec, RT5659_IRQ_CTRL_2, + snd_soc_component_update_bits(component, RT5659_IRQ_CTRL_2, RT5659_IL_IRQ_MASK, RT5659_IL_IRQ_EN); - snd_soc_update_bits(codec, RT5659_4BTN_IL_CMD_2, + snd_soc_component_update_bits(component, RT5659_4BTN_IL_CMD_2, RT5659_4BTN_IL_MASK, RT5659_4BTN_IL_EN); } else { - snd_soc_update_bits(codec, RT5659_4BTN_IL_CMD_2, + snd_soc_component_update_bits(component, RT5659_4BTN_IL_CMD_2, RT5659_4BTN_IL_MASK, RT5659_4BTN_IL_DIS); - snd_soc_update_bits(codec, RT5659_IRQ_CTRL_2, + snd_soc_component_update_bits(component, RT5659_IRQ_CTRL_2, RT5659_IL_IRQ_MASK, RT5659_IL_IRQ_DIS); /* MICBIAS1 and Mic Det Power for button detect*/ snd_soc_dapm_disable_pin(dapm, "MICBIAS1"); @@ -1288,7 +1288,7 @@ static void rt5659_enable_push_button_irq(struct snd_soc_codec *codec, /** * rt5659_headset_detect - Detect headset. - * @codec: SoC audio codec device. + * @component: SoC audio component device. * @jack_insert: Jack insert or not. * * Detect whether is headset or not when jack inserted. @@ -1296,37 +1296,37 @@ static void rt5659_enable_push_button_irq(struct snd_soc_codec *codec, * Returns detect status. */ -static int rt5659_headset_detect(struct snd_soc_codec *codec, int jack_insert) +static int rt5659_headset_detect(struct snd_soc_component *component, int jack_insert) { - struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30}; int reg_63; - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); if (jack_insert) { snd_soc_dapm_force_enable_pin(dapm, "Mic Det Power"); snd_soc_dapm_sync(dapm); - reg_63 = snd_soc_read(codec, RT5659_PWR_ANLG_1); + reg_63 = snd_soc_component_read32(component, RT5659_PWR_ANLG_1); - snd_soc_update_bits(codec, RT5659_PWR_ANLG_1, + snd_soc_component_update_bits(component, RT5659_PWR_ANLG_1, RT5659_PWR_VREF2 | RT5659_PWR_MB, RT5659_PWR_VREF2 | RT5659_PWR_MB); msleep(20); - snd_soc_update_bits(codec, RT5659_PWR_ANLG_1, + snd_soc_component_update_bits(component, RT5659_PWR_ANLG_1, RT5659_PWR_FV2, RT5659_PWR_FV2); - snd_soc_write(codec, RT5659_EJD_CTRL_2, 0x4160); - snd_soc_update_bits(codec, RT5659_EJD_CTRL_1, + snd_soc_component_write(component, RT5659_EJD_CTRL_2, 0x4160); + snd_soc_component_update_bits(component, RT5659_EJD_CTRL_1, 0x20, 0x0); msleep(20); - snd_soc_update_bits(codec, RT5659_EJD_CTRL_1, + snd_soc_component_update_bits(component, RT5659_EJD_CTRL_1, 0x20, 0x20); while (i < 5) { msleep(sleep_time[i]); - val = snd_soc_read(codec, RT5659_EJD_CTRL_2) & 0x0003; + val = snd_soc_component_read32(component, RT5659_EJD_CTRL_2) & 0x0003; i++; if (val == 0x1 || val == 0x2 || val == 0x3) break; @@ -1335,10 +1335,10 @@ static int rt5659_headset_detect(struct snd_soc_codec *codec, int jack_insert) switch (val) { case 1: rt5659->jack_type = SND_JACK_HEADSET; - rt5659_enable_push_button_irq(codec, true); + rt5659_enable_push_button_irq(component, true); break; default: - snd_soc_write(codec, RT5659_PWR_ANLG_1, reg_63); + snd_soc_component_write(component, RT5659_PWR_ANLG_1, reg_63); rt5659->jack_type = SND_JACK_HEADPHONE; snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); snd_soc_dapm_sync(dapm); @@ -1348,21 +1348,21 @@ static int rt5659_headset_detect(struct snd_soc_codec *codec, int jack_insert) snd_soc_dapm_disable_pin(dapm, "Mic Det Power"); snd_soc_dapm_sync(dapm); if (rt5659->jack_type == SND_JACK_HEADSET) - rt5659_enable_push_button_irq(codec, false); + rt5659_enable_push_button_irq(component, false); rt5659->jack_type = 0; } - dev_dbg(codec->dev, "jack_type = %d\n", rt5659->jack_type); + dev_dbg(component->dev, "jack_type = %d\n", rt5659->jack_type); return rt5659->jack_type; } -static int rt5659_button_detect(struct snd_soc_codec *codec) +static int rt5659_button_detect(struct snd_soc_component *component) { int btn_type, val; - val = snd_soc_read(codec, RT5659_4BTN_IL_CMD_1); + val = snd_soc_component_read32(component, RT5659_4BTN_IL_CMD_1); btn_type = val & 0xfff0; - snd_soc_write(codec, RT5659_4BTN_IL_CMD_1, val); + snd_soc_component_write(component, RT5659_4BTN_IL_CMD_1, val); return btn_type; } @@ -1377,10 +1377,10 @@ static irqreturn_t rt5659_irq(int irq, void *data) return IRQ_HANDLED; } -int rt5659_set_jack_detect(struct snd_soc_codec *codec, +int rt5659_set_jack_detect(struct snd_soc_component *component, struct snd_soc_jack *hs_jack) { - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); rt5659->hs_jack = hs_jack; @@ -1396,19 +1396,19 @@ static void rt5659_jack_detect_work(struct work_struct *work) container_of(work, struct rt5659_priv, jack_detect_work.work); int val, btn_type, report = 0; - if (!rt5659->codec) + if (!rt5659->component) return; - val = snd_soc_read(rt5659->codec, RT5659_INT_ST_1) & 0x0080; + val = snd_soc_component_read32(rt5659->component, RT5659_INT_ST_1) & 0x0080; if (!val) { /* jack in */ if (rt5659->jack_type == 0) { /* jack was out, report jack type */ - report = rt5659_headset_detect(rt5659->codec, 1); + report = rt5659_headset_detect(rt5659->component, 1); } else { /* jack is already in, report button event */ report = SND_JACK_HEADSET; - btn_type = rt5659_button_detect(rt5659->codec); + btn_type = rt5659_button_detect(rt5659->component); /** * rt5659 can report three kinds of button behavior, * one click, double click and hold. However, @@ -1441,7 +1441,7 @@ static void rt5659_jack_detect_work(struct work_struct *work) break; default: btn_type = 0; - dev_err(rt5659->codec->dev, + dev_err(rt5659->component->dev, "Unexpected button code 0x%04x\n", btn_type); break; @@ -1453,7 +1453,7 @@ static void rt5659_jack_detect_work(struct work_struct *work) } } else { /* jack out */ - report = rt5659_headset_detect(rt5659->codec, 0); + report = rt5659_headset_detect(rt5659->component, 0); } snd_soc_jack_report(rt5659->hs_jack, report, SND_JACK_HEADSET | @@ -1605,8 +1605,8 @@ static const struct snd_kcontrol_new rt5659_snd_controls[] = { static int set_dmic_clk(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); int pd, idx = -EINVAL; pd = rl6231_get_pre_div(rt5659->regmap, @@ -1614,9 +1614,9 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, idx = rl6231_calc_dmic_clk(rt5659->sysclk / pd); if (idx < 0) - dev_err(codec->dev, "Failed to set DMIC clock\n"); + dev_err(component->dev, "Failed to set DMIC clock\n"); else { - snd_soc_update_bits(codec, RT5659_DMIC_CTRL_1, + snd_soc_component_update_bits(component, RT5659_DMIC_CTRL_1, RT5659_DMIC_CLK_MASK, idx << RT5659_DMIC_CLK_SFT); } return idx; @@ -1625,17 +1625,17 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, static int set_adc_clk(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); switch (event) { case SND_SOC_DAPM_POST_PMU: - snd_soc_update_bits(codec, RT5659_CHOP_ADC, + snd_soc_component_update_bits(component, RT5659_CHOP_ADC, RT5659_CKXEN_ADCC_MASK | RT5659_CKGEN_ADCC_MASK, RT5659_CKXEN_ADCC_MASK | RT5659_CKGEN_ADCC_MASK); break; case SND_SOC_DAPM_PRE_PMD: - snd_soc_update_bits(codec, RT5659_CHOP_ADC, + snd_soc_component_update_bits(component, RT5659_CHOP_ADC, RT5659_CKXEN_ADCC_MASK | RT5659_CKGEN_ADCC_MASK, 0); break; @@ -1650,15 +1650,15 @@ static int set_adc_clk(struct snd_soc_dapm_widget *w, static int rt5659_charge_pump_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); switch (event) { case SND_SOC_DAPM_PRE_PMU: /* Depop */ - snd_soc_write(codec, RT5659_DEPOP_1, 0x0009); + snd_soc_component_write(component, RT5659_DEPOP_1, 0x0009); break; case SND_SOC_DAPM_POST_PMD: - snd_soc_write(codec, RT5659_HP_CHARGE_PUMP_1, 0x0c16); + snd_soc_component_write(component, RT5659_HP_CHARGE_PUMP_1, 0x0c16); break; default: return 0; @@ -1671,9 +1671,9 @@ static int is_sys_clk_from_pll(struct snd_soc_dapm_widget *w, struct snd_soc_dapm_widget *sink) { unsigned int val; - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); - val = snd_soc_read(codec, RT5659_GLB_CLK); + val = snd_soc_component_read32(component, RT5659_GLB_CLK); val &= RT5659_SCLK_SRC_MASK; if (val == RT5659_SCLK_SRC_PLL1) return 1; @@ -1685,7 +1685,7 @@ static int is_using_asrc(struct snd_soc_dapm_widget *w, struct snd_soc_dapm_widget *sink) { unsigned int reg, shift, val; - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); switch (w->shift) { case RT5659_ADC_MONO_R_ASRC_SFT: @@ -1716,13 +1716,13 @@ static int is_using_asrc(struct snd_soc_dapm_widget *w, return 0; } - val = (snd_soc_read(codec, reg) >> shift) & 0xf; + val = (snd_soc_component_read32(component, reg) >> shift) & 0xf; switch (val) { case 1: case 2: case 3: /* I2S_Pre_Div1 should be 1 in asrc mode */ - snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, + snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1, RT5659_I2S_PD1_MASK, RT5659_I2S_PD1_2); return 1; default: @@ -2358,24 +2358,24 @@ static const struct snd_kcontrol_new pdm_r_switch = static int rt5659_spk_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); switch (event) { case SND_SOC_DAPM_PRE_PMU: - snd_soc_update_bits(codec, RT5659_CLASSD_CTRL_1, + snd_soc_component_update_bits(component, RT5659_CLASSD_CTRL_1, RT5659_POW_CLSD_DB_MASK, RT5659_POW_CLSD_DB_EN); - snd_soc_update_bits(codec, RT5659_CLASSD_2, + snd_soc_component_update_bits(component, RT5659_CLASSD_2, RT5659_M_RI_DIG, RT5659_M_RI_DIG); - snd_soc_write(codec, RT5659_CLASSD_1, 0x0803); - snd_soc_write(codec, RT5659_SPK_DC_CAILB_CTRL_3, 0x0000); + snd_soc_component_write(component, RT5659_CLASSD_1, 0x0803); + snd_soc_component_write(component, RT5659_SPK_DC_CAILB_CTRL_3, 0x0000); break; case SND_SOC_DAPM_POST_PMD: - snd_soc_write(codec, RT5659_CLASSD_1, 0x0011); - snd_soc_update_bits(codec, RT5659_CLASSD_2, + snd_soc_component_write(component, RT5659_CLASSD_1, 0x0011); + snd_soc_component_update_bits(component, RT5659_CLASSD_2, RT5659_M_RI_DIG, 0x0); - snd_soc_write(codec, RT5659_SPK_DC_CAILB_CTRL_3, 0x0003); - snd_soc_update_bits(codec, RT5659_CLASSD_CTRL_1, + snd_soc_component_write(component, RT5659_SPK_DC_CAILB_CTRL_3, 0x0003); + snd_soc_component_update_bits(component, RT5659_CLASSD_CTRL_1, RT5659_POW_CLSD_DB_MASK, RT5659_POW_CLSD_DB_DIS); break; @@ -2390,15 +2390,15 @@ static int rt5659_spk_event(struct snd_soc_dapm_widget *w, static int rt5659_mono_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); switch (event) { case SND_SOC_DAPM_PRE_PMU: - snd_soc_write(codec, RT5659_MONO_AMP_CALIB_CTRL_1, 0x1e00); + snd_soc_component_write(component, RT5659_MONO_AMP_CALIB_CTRL_1, 0x1e00); break; case SND_SOC_DAPM_POST_PMD: - snd_soc_write(codec, RT5659_MONO_AMP_CALIB_CTRL_1, 0x1e04); + snd_soc_component_write(component, RT5659_MONO_AMP_CALIB_CTRL_1, 0x1e04); break; default: @@ -2412,16 +2412,16 @@ static int rt5659_mono_event(struct snd_soc_dapm_widget *w, static int rt5659_hp_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); switch (event) { case SND_SOC_DAPM_POST_PMU: - snd_soc_write(codec, RT5659_HP_CHARGE_PUMP_1, 0x0e1e); - snd_soc_update_bits(codec, RT5659_DEPOP_1, 0x0010, 0x0010); + snd_soc_component_write(component, RT5659_HP_CHARGE_PUMP_1, 0x0e1e); + snd_soc_component_update_bits(component, RT5659_DEPOP_1, 0x0010, 0x0010); break; case SND_SOC_DAPM_PRE_PMD: - snd_soc_write(codec, RT5659_DEPOP_1, 0x0000); + snd_soc_component_write(component, RT5659_DEPOP_1, 0x0000); break; default: @@ -3287,21 +3287,21 @@ static const struct snd_soc_dapm_route rt5659_dapm_routes[] = { static int rt5659_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec = dai->codec; - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); unsigned int val_len = 0, val_clk, mask_clk; int pre_div, frame_size; rt5659->lrck[dai->id] = params_rate(params); pre_div = rl6231_get_clk_info(rt5659->sysclk, rt5659->lrck[dai->id]); if (pre_div < 0) { - dev_err(codec->dev, "Unsupported clock setting %d for DAI %d\n", + dev_err(component->dev, "Unsupported clock setting %d for DAI %d\n", rt5659->lrck[dai->id], dai->id); return -EINVAL; } frame_size = snd_soc_params_to_frame_size(params); if (frame_size < 0) { - dev_err(codec->dev, "Unsupported frame size: %d\n", frame_size); + dev_err(component->dev, "Unsupported frame size: %d\n", frame_size); return -EINVAL; } @@ -3328,39 +3328,39 @@ static int rt5659_hw_params(struct snd_pcm_substream *substream, case RT5659_AIF1: mask_clk = RT5659_I2S_PD1_MASK; val_clk = pre_div << RT5659_I2S_PD1_SFT; - snd_soc_update_bits(codec, RT5659_I2S1_SDP, + snd_soc_component_update_bits(component, RT5659_I2S1_SDP, RT5659_I2S_DL_MASK, val_len); break; case RT5659_AIF2: mask_clk = RT5659_I2S_PD2_MASK; val_clk = pre_div << RT5659_I2S_PD2_SFT; - snd_soc_update_bits(codec, RT5659_I2S2_SDP, + snd_soc_component_update_bits(component, RT5659_I2S2_SDP, RT5659_I2S_DL_MASK, val_len); break; case RT5659_AIF3: mask_clk = RT5659_I2S_PD3_MASK; val_clk = pre_div << RT5659_I2S_PD3_SFT; - snd_soc_update_bits(codec, RT5659_I2S3_SDP, + snd_soc_component_update_bits(component, RT5659_I2S3_SDP, RT5659_I2S_DL_MASK, val_len); break; default: - dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id); + dev_err(component->dev, "Invalid dai->id: %d\n", dai->id); return -EINVAL; } - snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, mask_clk, val_clk); + snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1, mask_clk, val_clk); switch (rt5659->lrck[dai->id]) { case 192000: - snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, + snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1, RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_32); break; case 96000: - snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, + snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1, RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_64); break; default: - snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, + snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1, RT5659_DAC_OSR_MASK, RT5659_DAC_OSR_128); break; } @@ -3370,8 +3370,8 @@ static int rt5659_hw_params(struct snd_pcm_substream *substream, static int rt5659_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - struct snd_soc_codec *codec = dai->codec; - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); unsigned int reg_val = 0; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { @@ -3414,31 +3414,31 @@ static int rt5659_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) switch (dai->id) { case RT5659_AIF1: - snd_soc_update_bits(codec, RT5659_I2S1_SDP, + snd_soc_component_update_bits(component, RT5659_I2S1_SDP, RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK | RT5659_I2S_DF_MASK, reg_val); break; case RT5659_AIF2: - snd_soc_update_bits(codec, RT5659_I2S2_SDP, + snd_soc_component_update_bits(component, RT5659_I2S2_SDP, RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK | RT5659_I2S_DF_MASK, reg_val); break; case RT5659_AIF3: - snd_soc_update_bits(codec, RT5659_I2S3_SDP, + snd_soc_component_update_bits(component, RT5659_I2S3_SDP, RT5659_I2S_MS_MASK | RT5659_I2S_BP_MASK | RT5659_I2S_DF_MASK, reg_val); break; default: - dev_err(codec->dev, "Invalid dai->id: %d\n", dai->id); + dev_err(component->dev, "Invalid dai->id: %d\n", dai->id); return -EINVAL; } return 0; } -static int rt5659_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id, +static int rt5659_set_component_sysclk(struct snd_soc_component *component, int clk_id, int source, unsigned int freq, int dir) { - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); unsigned int reg_val = 0; if (freq == rt5659->sysclk && clk_id == rt5659->sysclk_src) @@ -3455,25 +3455,25 @@ static int rt5659_set_codec_sysclk(struct snd_soc_codec *codec, int clk_id, reg_val |= RT5659_SCLK_SRC_RCCLK; break; default: - dev_err(codec->dev, "Invalid clock id (%d)\n", clk_id); + dev_err(component->dev, "Invalid clock id (%d)\n", clk_id); return -EINVAL; } - snd_soc_update_bits(codec, RT5659_GLB_CLK, + snd_soc_component_update_bits(component, RT5659_GLB_CLK, RT5659_SCLK_SRC_MASK, reg_val); rt5659->sysclk = freq; rt5659->sysclk_src = clk_id; - dev_dbg(codec->dev, "Sysclk is %dHz and clock id is %d\n", + dev_dbg(component->dev, "Sysclk is %dHz and clock id is %d\n", freq, clk_id); return 0; } -static int rt5659_set_codec_pll(struct snd_soc_codec *codec, int pll_id, +static int rt5659_set_component_pll(struct snd_soc_component *component, int pll_id, int source, unsigned int freq_in, unsigned int freq_out) { - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); struct rl6231_pll_code pll_code; int ret; @@ -3482,50 +3482,50 @@ static int rt5659_set_codec_pll(struct snd_soc_codec *codec, int pll_id, return 0; if (!freq_in || !freq_out) { - dev_dbg(codec->dev, "PLL disabled\n"); + dev_dbg(component->dev, "PLL disabled\n"); rt5659->pll_in = 0; rt5659->pll_out = 0; - snd_soc_update_bits(codec, RT5659_GLB_CLK, + snd_soc_component_update_bits(component, RT5659_GLB_CLK, RT5659_SCLK_SRC_MASK, RT5659_SCLK_SRC_MCLK); return 0; } switch (source) { case RT5659_PLL1_S_MCLK: - snd_soc_update_bits(codec, RT5659_GLB_CLK, + snd_soc_component_update_bits(component, RT5659_GLB_CLK, RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_MCLK); break; case RT5659_PLL1_S_BCLK1: - snd_soc_update_bits(codec, RT5659_GLB_CLK, + snd_soc_component_update_bits(component, RT5659_GLB_CLK, RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK1); break; case RT5659_PLL1_S_BCLK2: - snd_soc_update_bits(codec, RT5659_GLB_CLK, + snd_soc_component_update_bits(component, RT5659_GLB_CLK, RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK2); break; case RT5659_PLL1_S_BCLK3: - snd_soc_update_bits(codec, RT5659_GLB_CLK, + snd_soc_component_update_bits(component, RT5659_GLB_CLK, RT5659_PLL1_SRC_MASK, RT5659_PLL1_SRC_BCLK3); break; default: - dev_err(codec->dev, "Unknown PLL source %d\n", source); + dev_err(component->dev, "Unknown PLL source %d\n", source); return -EINVAL; } ret = rl6231_pll_calc(freq_in, freq_out, &pll_code); if (ret < 0) { - dev_err(codec->dev, "Unsupport input clock %d\n", freq_in); + dev_err(component->dev, "Unsupport input clock %d\n", freq_in); return ret; } - dev_dbg(codec->dev, "bypass=%d m=%d n=%d k=%d\n", + dev_dbg(component->dev, "bypass=%d m=%d n=%d k=%d\n", pll_code.m_bp, (pll_code.m_bp ? 0 : pll_code.m_code), pll_code.n_code, pll_code.k_code); - snd_soc_write(codec, RT5659_PLL_CTRL_1, + snd_soc_component_write(component, RT5659_PLL_CTRL_1, pll_code.n_code << RT5659_PLL_N_SFT | pll_code.k_code); - snd_soc_write(codec, RT5659_PLL_CTRL_2, + snd_soc_component_write(component, RT5659_PLL_CTRL_2, (pll_code.m_bp ? 0 : pll_code.m_code) << RT5659_PLL_M_SFT | pll_code.m_bp << RT5659_PLL_M_BP_SFT); @@ -3539,7 +3539,7 @@ static int rt5659_set_codec_pll(struct snd_soc_codec *codec, int pll_id, static int rt5659_set_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 snd_soc_component *component = dai->component; unsigned int val = 0; if (rx_mask || tx_mask) @@ -3583,29 +3583,29 @@ static int rt5659_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, return -EINVAL; } - snd_soc_update_bits(codec, RT5659_TDM_CTRL_1, 0x8ff0, val); + snd_soc_component_update_bits(component, RT5659_TDM_CTRL_1, 0x8ff0, val); return 0; } static int rt5659_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) { - struct snd_soc_codec *codec = dai->codec; - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); - dev_dbg(codec->dev, "%s ratio=%d\n", __func__, ratio); + dev_dbg(component->dev, "%s ratio=%d\n", __func__, ratio); rt5659->bclk[dai->id] = ratio; if (ratio == 64) { switch (dai->id) { case RT5659_AIF2: - snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, + snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1, RT5659_I2S_BCLK_MS2_MASK, RT5659_I2S_BCLK_MS2_64); break; case RT5659_AIF3: - snd_soc_update_bits(codec, RT5659_ADDA_CLK_1, + snd_soc_component_update_bits(component, RT5659_ADDA_CLK_1, RT5659_I2S_BCLK_MS3_MASK, RT5659_I2S_BCLK_MS3_64); break; @@ -3615,11 +3615,11 @@ static int rt5659_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) return 0; } -static int rt5659_set_bias_level(struct snd_soc_codec *codec, +static int rt5659_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); int ret; switch (level) { @@ -3641,7 +3641,7 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec, if (dapm->bias_level == SND_SOC_BIAS_OFF) { ret = clk_prepare_enable(rt5659->mclk); if (ret) { - dev_err(codec->dev, + dev_err(component->dev, "failed to enable MCLK: %d\n", ret); return ret; } @@ -3667,37 +3667,35 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int rt5659_probe(struct snd_soc_codec *codec) +static int rt5659_probe(struct snd_soc_component *component) { - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); - rt5659->codec = codec; + rt5659->component = component; return 0; } -static int rt5659_remove(struct snd_soc_codec *codec) +static void rt5659_remove(struct snd_soc_component *component) { - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); regmap_write(rt5659->regmap, RT5659_RESET, 0); - - return 0; } #ifdef CONFIG_PM -static int rt5659_suspend(struct snd_soc_codec *codec) +static int rt5659_suspend(struct snd_soc_component *component) { - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); regcache_cache_only(rt5659->regmap, true); regcache_mark_dirty(rt5659->regmap); return 0; } -static int rt5659_resume(struct snd_soc_codec *codec) +static int rt5659_resume(struct snd_soc_component *component) { - struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component); regcache_cache_only(rt5659->regmap, false); regcache_sync(rt5659->regmap); @@ -3780,23 +3778,23 @@ static struct snd_soc_dai_driver rt5659_dai[] = { }, }; -static const struct snd_soc_codec_driver soc_codec_dev_rt5659 = { - .probe = rt5659_probe, - .remove = rt5659_remove, - .suspend = rt5659_suspend, - .resume = rt5659_resume, - .set_bias_level = rt5659_set_bias_level, - .idle_bias_off = true, - .component_driver = { - .controls = rt5659_snd_controls, - .num_controls = ARRAY_SIZE(rt5659_snd_controls), - .dapm_widgets = rt5659_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt5659_dapm_widgets), - .dapm_routes = rt5659_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt5659_dapm_routes), - }, - .set_sysclk = rt5659_set_codec_sysclk, - .set_pll = rt5659_set_codec_pll, +static const struct snd_soc_component_driver soc_component_dev_rt5659 = { + .probe = rt5659_probe, + .remove = rt5659_remove, + .suspend = rt5659_suspend, + .resume = rt5659_resume, + .set_bias_level = rt5659_set_bias_level, + .controls = rt5659_snd_controls, + .num_controls = ARRAY_SIZE(rt5659_snd_controls), + .dapm_widgets = rt5659_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt5659_dapm_widgets), + .dapm_routes = rt5659_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt5659_dapm_routes), + .set_sysclk = rt5659_set_component_sysclk, + .set_pll = rt5659_set_component_pll, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; @@ -3899,7 +3897,7 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659) break; if (count > 30) { - dev_err(rt5659->codec->dev, + dev_err(rt5659->component->dev, "HP Calibration 1 Failure\n"); return; } @@ -3924,7 +3922,7 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659) break; if (count > 85) { - dev_err(rt5659->codec->dev, + dev_err(rt5659->component->dev, "HP Calibration 2 Failure\n"); return; } @@ -3972,7 +3970,7 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659) break; if (count > 10) { - dev_err(rt5659->codec->dev, + dev_err(rt5659->component->dev, "SPK Calibration Failure\n"); return; } @@ -4005,7 +4003,7 @@ static void rt5659_calibrate(struct rt5659_priv *rt5659) break; if (count > 35) { - dev_err(rt5659->codec->dev, + dev_err(rt5659->component->dev, "Mono Calibration Failure\n"); return; } @@ -4301,17 +4299,11 @@ static int rt5659_i2c_probe(struct i2c_client *i2c, RT5659_GP1_PIN_MASK, RT5659_GP1_PIN_IRQ); } - return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659, + return devm_snd_soc_register_component(&i2c->dev, + &soc_component_dev_rt5659, rt5659_dai, ARRAY_SIZE(rt5659_dai)); } -static int rt5659_i2c_remove(struct i2c_client *i2c) -{ - snd_soc_unregister_codec(&i2c->dev); - - return 0; -} - static void rt5659_i2c_shutdown(struct i2c_client *client) { struct rt5659_priv *rt5659 = i2c_get_clientdata(client); @@ -4344,7 +4336,6 @@ static struct i2c_driver rt5659_i2c_driver = { .acpi_match_table = ACPI_PTR(rt5659_acpi_match), }, .probe = rt5659_i2c_probe, - .remove = rt5659_i2c_remove, .shutdown = rt5659_i2c_shutdown, .id_table = rt5659_i2c_id, }; diff --git a/sound/soc/codecs/rt5659.h b/sound/soc/codecs/rt5659.h index bea0433c164c..73969ef5029f 100644 --- a/sound/soc/codecs/rt5659.h +++ b/sound/soc/codecs/rt5659.h @@ -1789,7 +1789,7 @@ struct rt5659_pll_code { }; struct rt5659_priv { - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct rt5659_platform_data pdata; struct regmap *regmap; struct gpio_desc *gpiod_ldo1_en; @@ -1814,7 +1814,7 @@ struct rt5659_priv { bool hda_mic_plugged; }; -int rt5659_set_jack_detect(struct snd_soc_codec *codec, +int rt5659_set_jack_detect(struct snd_soc_component *component, struct snd_soc_jack *hs_jack); #endif /* __RT5659_H__ */ -- 2.16.1

1 0

[alsa-devel] [PATCH 0/x] ASoC: replace platform to component
by Kuninori Morimoto 12 Feb '18

12 Feb '18

Hi Mark These are for replace "platform" to "component". It needs 3 steps I think. step1. "component" needs _add_ function, like "platform" step2. "component" level pcm_new/free support step3. replace platform to component We can get platform pointer from rtd->platform on current style. But these are very categorized pointer, in other words, non generic pointer. This cleanup is 1st step of merging all feature into component. I think new style wil be CPU + Codec + Platform = Component I think merging CPU into Component is already done. This patch set merges Platform feature into Component, and remove Platform. Merging Codec into Component is next step. This patch set will add new rtd connected component list. All CPU/Codec/Platform are connected to this list. And we can get each component pointer by using rtd and its driver name. Here, We can replace rtd->platform like below - struct device *dev = rtd->platform->dev; + struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRIVER_NAME); + struct device *dev = component->dev; - if(rtd->platform->pcm_new) - rtd->platform->pcm_new(yyy); + for_each_rtdcom(rtd, rtdcom) { + component = rtdcom->component; /* rtd connected CPU/Codec/Platform */ + if (component->pcm_new) + component->pcm_new(yyy); + } Now, only platform has pcm_new/free, but in new style, all component can have it. I will post step1/2/3 patch-set. step1 is normal patches. step2/3 are now still [RFC]. Best regards --- Kuninori Morimoto

2 23

[alsa-devel] [PATCH 0/x][RFC] ASoC: replace codec/platform to component
by Kuninori Morimoto 12 Feb '18

12 Feb '18

Hi Mark Finally, all prepare patch-set were accepted. These are [RFC] of codec/platform replace to component patch-set. It will be almost 200 patches in total. Thus, to avoid patch bomb (in case of rejection), I pickuped few patches and post these as [RFC]. Main is replacing codec/platform to component xxx_codec_xxx() -> xxx_component_xxx() xxx_platform_xxx() -> xxx_component_xxx() Note1 is that it is using devm_ version register function, and removed unregister from .remove (sometimes, removes .remove function itself) - snd_soc_register_xxx() + devm_snd_soc_register_component() ... - snd_soc_unregister_xxx() Note2 is that rtd->platform will be removed, thus it will be replaced to snd_soc_rtdcom_lookup() with driver name - rtd->platform + snd_soc_rtdcom_lookup(rtd, DRV_NAME) Note3 is that codec driver needs to have some flags which is needed for Codec -static const struct snd_soc_codec_driver xxx_codec; +static const struct snd_soc_component_driver xxx_codec = { + .idle_bias_on = 1, + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, +}; here, .idle_bias_on was originally .idle_bias_off .pmdown_time was originally .ignore_pmdown_time .endianness is needed for Codec endianness check .non_legacy_dai_naming is needed for Codec DAI name matching Note4 is that some driver is controlling CPU/Platform in one driver as 2 component. Now we can merge these into one component. - snd_soc_register_platform(xxx) // for Platform - snd_soc_register_component(xxx) // for CPU + snd_soc_register_component(xxx) // for CPU/Platform Note4 is that [1/x] patch which removes (!rtd->platform) check from soc-core is needed for all platforms. This check is no longer needed for component version. If these [RFC] were OK, I will post all replacement patch-set. I think good timing to posting is around next -rc1 or merge-window About removing all unneeded codec/platform patch-set, when is good timing ? +1 version: includes replacement patch-set +2 version: includes remove patch-set or +1 version: includes both replacement/remove patch-set Best regards --- Kuninori Morimoto

2 11

[alsa-devel] [PATCH 00/38] ASoC: replace platform to component
by Kuninori Morimoto 12 Feb '18

12 Feb '18

Hi Mark codec/platform can be replaced to component now. These patches do it for platform. One none is that all platform should be based [01/38] patch. These are based on "asoc-v4.16" tag Current existing "platform" related codes will be no longer needed by these patches. I can post it, but I don't know when is good timing Kuninori Morimoto (38): 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 include/sound/dmaengine_pcm.h | 2 + sound/soc/amd/acp-pcm-dma.c | 29 +++-- sound/soc/atmel/atmel-classd.c | 4 +- sound/soc/atmel/atmel-pcm-pdc.c | 6 +- sound/soc/atmel/atmel-pdmic.c | 4 +- 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/cs47l24.c | 42 +++----- sound/soc/codecs/rt5514-spi.c | 32 +++--- sound/soc/codecs/wm5102.c | 42 +++----- sound/soc/codecs/wm5110.c | 42 +++----- 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/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 | 3 +- sound/soc/intel/boards/broadwell.c | 3 +- sound/soc/intel/boards/haswell.c | 3 +- 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/nuc900/nuc900-pcm.c | 5 +- sound/soc/omap/omap-pcm.c | 5 +- sound/soc/pxa/mmp-pcm.c | 11 +- sound/soc/pxa/pxa2xx-pcm.c | 5 +- sound/soc/qcom/lpass-platform.c | 42 ++++---- sound/soc/samsung/idma.c | 5 +- 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-core.c | 5 - sound/soc/soc-generic-dmaengine-pcm.c | 55 ++++++---- sound/soc/soc-utils.c | 6 +- sound/soc/txx9/txx9aclc.c | 26 +++-- sound/soc/xtensa/xtfpga-i2s.c | 17 +-- 62 files changed, 518 insertions(+), 579 deletions(-) -- 1.9.1

6 78

[alsa-devel] Applied "ASoC: samsung: clean makefile about inexistant files" to the asoc tree
by Mark Brown 12 Feb '18

12 Feb '18

The patch ASoC: samsung: clean makefile about inexistant files has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From beff23ff26db0c1df2eaabc0dfe877bcbf05f6db Mon Sep 17 00:00:00 2001 From: Corentin Labbe <clabbe(a)baylibre.com> Date: Mon, 29 Jan 2018 12:26:16 +0000 Subject: [PATCH] ASoC: samsung: clean makefile about inexistant files Clean makefile rules about inexistant files. Thoses files were removed in commit a076d418235f ("ASoC: samsung: Drop AC97 drivers") Signed-off-by: Corentin Labbe <clabbe(a)baylibre.com> Reviewed-by: Krzysztof Kozlowski <krzk(a)kernel.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/samsung/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile index 030949e1e434..c3b76035f69c 100644 --- a/sound/soc/samsung/Makefile +++ b/sound/soc/samsung/Makefile @@ -21,8 +21,6 @@ obj-$(CONFIG_SND_SAMSUNG_I2S) += snd-soc-idma.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o -snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o -snd-soc-ln2440sbc-alc650-objs := ln2440sbc_alc650.o snd-soc-s3c24xx-uda134x-objs := s3c24xx_uda134x.o snd-soc-s3c24xx-simtec-objs := s3c24xx_simtec.o snd-soc-s3c24xx-simtec-hermes-objs := s3c24xx_simtec_hermes.o @@ -32,7 +30,6 @@ snd-soc-rx1950-uda1380-objs := rx1950_uda1380.o snd-soc-smdk-wm8580-objs := smdk_wm8580.o snd-soc-smdk-wm8994-objs := smdk_wm8994.o snd-soc-snow-objs := snow.o -snd-soc-smdk-wm9713-objs := smdk_wm9713.o snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o snd-soc-smdk-spdif-objs := smdk_spdif.o snd-soc-smdk-wm8994pcm-objs := smdk_wm8994pcm.o -- 2.16.1

1 0

[alsa-devel] Applied "ASoC: sn95031: remove dead makefile about sn95031" to the asoc tree
by Mark Brown 12 Feb '18

12 Feb '18

The patch ASoC: sn95031: remove dead makefile about sn95031 has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From e0b9f3aa45fcfce1873503e5ff85d919697427cb Mon Sep 17 00:00:00 2001 From: Corentin Labbe <clabbe(a)baylibre.com> Date: Mon, 29 Jan 2018 12:28:54 +0000 Subject: [PATCH] ASoC: sn95031: remove dead makefile about sn95031 All sn95031 stuff was removed in commit 987da3fe1759 ("ASoC: sn95031: remove this code") Since SND_SOC_SN95031 was gone, remove makefile about it. Signed-off-by: Corentin Labbe <clabbe(a)baylibre.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index da1571336f1e..4053c72d852b 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -387,7 +387,6 @@ obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o obj-$(CONFIG_SND_SOC_SIGMADSP_I2C) += snd-soc-sigmadsp-i2c.o obj-$(CONFIG_SND_SOC_SIGMADSP_REGMAP) += snd-soc-sigmadsp-regmap.o obj-$(CONFIG_SND_SOC_SI476X) += snd-soc-si476x.o -obj-$(CONFIG_SND_SOC_SN95031) +=snd-soc-sn95031.o obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif-rx.o snd-soc-spdif-tx.o obj-$(CONFIG_SND_SOC_SIRF_AUDIO_CODEC) += sirf-audio-codec.o obj-$(CONFIG_SND_SOC_SSM2518) += snd-soc-ssm2518.o -- 2.16.1

1 0