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

[alsa-devel] [PATCH 1/4] ASoC: fsl-asoc-card: Use 'snd_pcm_format_t' type when appropriate
by Fabio Estevam 12 Feb '18

12 Feb '18

From: Fabio Estevam <fabio.estevam(a)nxp.com> A better suited type for 'sample_format' and 'asrc_format' is 'snd_pcm_format_t'. Change the type so that the following build warnings with W=1 are gone: sound/soc/fsl/fsl-asoc-card.c:153:29: warning: incorrect type in assignment (different base types) sound/soc/fsl/fsl-asoc-card.c:153:29: expected unsigned int [unsigned] [usertype] sample_format sound/soc/fsl/fsl-asoc-card.c:153:29: got restricted snd_pcm_format_t sound/soc/fsl/fsl-asoc-card.c:258:44: warning: restricted snd_pcm_format_t degrades to integer sound/soc/fsl/fsl-asoc-card.c:525:29: warning: incorrect type in assignment (different base types) sound/soc/fsl/fsl-asoc-card.c:525:29: expected unsigned int [unsigned] [usertype] sample_format sound/soc/fsl/fsl-asoc-card.c:525:29: got restricted snd_pcm_format_t [usertype] <noident> sound/soc/fsl/fsl-asoc-card.c:680:43: warning: incorrect type in assignment (different base types) sound/soc/fsl/fsl-asoc-card.c:680:43: expected unsigned int [unsigned] [usertype] asrc_format sound/soc/fsl/fsl-asoc-card.c:680:43: got restricted snd_pcm_format_t [usertype] <noident> sound/soc/fsl/fsl-asoc-card.c:682:43: warning: incorrect type in assignment (different base types) sound/soc/fsl/fsl-asoc-card.c:682:43: expected unsigned int [unsigned] [usertype] asrc_format sound/soc/fsl/fsl-asoc-card.c:682:43: got restricted snd_pcm_format_t [usertype] <noident> Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/fsl/fsl-asoc-card.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 989be51..4a6750a 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -91,9 +91,9 @@ struct fsl_asoc_card_priv { struct cpu_priv cpu_priv; struct snd_soc_card card; u32 sample_rate; - u32 sample_format; + snd_pcm_format_t sample_format; u32 asrc_rate; - u32 asrc_format; + snd_pcm_format_t asrc_format; u32 dai_fmt; char name[32]; }; @@ -199,7 +199,7 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); snd_mask_none(mask); - snd_mask_set(mask, priv->asrc_format); + snd_mask_set(mask, (__force int)priv->asrc_format); return 0; } -- 2.7.4

2 7

[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

[alsa-devel] [PATCH] ASoC: rt5665: remove rt5668 support
by Bard Liao 12 Feb '18

12 Feb '18

Remove rt5668 support from rt5665 codec driver since rt5668 will not go into mass production. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- Documentation/devicetree/bindings/sound/rt5665.txt | 4 ++-- sound/soc/codecs/rt5665.c | 5 ----- sound/soc/codecs/rt5665.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rt5665.txt b/Documentation/devicetree/bindings/sound/rt5665.txt index 419c892..8df1705 100644 --- a/Documentation/devicetree/bindings/sound/rt5665.txt +++ b/Documentation/devicetree/bindings/sound/rt5665.txt @@ -1,10 +1,10 @@ -RT5665/RT5666/RT5668 audio CODEC +RT5665/RT5666 audio CODEC This device supports I2C only. Required properties: -- compatible : One of "realtek,rt5665", "realtek,rt5666" or "realtek,rt5668". +- compatible : One of "realtek,rt5665", "realtek,rt5666". - reg : The I2C address of the device. diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index f05d362..e1b558b 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c @@ -4828,9 +4828,6 @@ static int rt5665_i2c_probe(struct i2c_client *i2c, case 0x0: rt5665->id = CODEC_5666; break; - case 0x6: - rt5665->id = CODEC_5668; - break; case 0x3: default: rt5665->id = CODEC_5665; @@ -4963,7 +4960,6 @@ static void rt5665_i2c_shutdown(struct i2c_client *client) static const struct of_device_id rt5665_of_match[] = { {.compatible = "realtek,rt5665"}, {.compatible = "realtek,rt5666"}, - {.compatible = "realtek,rt5668"}, {}, }; MODULE_DEVICE_TABLE(of, rt5665_of_match); @@ -4973,7 +4969,6 @@ MODULE_DEVICE_TABLE(of, rt5665_of_match); static const struct acpi_device_id rt5665_acpi_match[] = { {"10EC5665", 0,}, {"10EC5666", 0,}, - {"10EC5668", 0,}, {}, }; MODULE_DEVICE_TABLE(acpi, rt5665_acpi_match); diff --git a/sound/soc/codecs/rt5665.h b/sound/soc/codecs/rt5665.h index 5ddebd6..5abff0f 100644 --- a/sound/soc/codecs/rt5665.h +++ b/sound/soc/codecs/rt5665.h @@ -1978,7 +1978,6 @@ enum { enum { CODEC_5665, CODEC_5666, - CODEC_5668, }; /* filter mask */ -- 2.7.4

2 1

[alsa-devel] Applied "ASoC: soc-core: remove error due to probe deferral" to the asoc tree
by Mark Brown 12 Feb '18

12 Feb '18

The patch ASoC: soc-core: remove error due to probe deferral 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 6b49087912e311bc884d36874592595508630b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <mnhu(a)prevas.dk> Date: Thu, 1 Feb 2018 11:09:41 +0100 Subject: [PATCH] ASoC: soc-core: remove error due to probe deferral MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Deferred probes shouldn't cause error messages in the boot log, so change the dev_err() to the more harmless dev_info(). Signed-off-by: Martin Hundebøll <mnhu(a)prevas.dk> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 96c44f6576c9..60a542f35dbd 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1100,8 +1100,8 @@ static int soc_bind_dai_link(struct snd_soc_card *card, cpu_dai_component.dai_name = dai_link->cpu_dai_name; rtd->cpu_dai = snd_soc_find_dai(&cpu_dai_component); if (!rtd->cpu_dai) { - dev_err(card->dev, "ASoC: CPU DAI %s not registered\n", - dai_link->cpu_dai_name); + dev_info(card->dev, "ASoC: CPU DAI %s not registered\n", + dai_link->cpu_dai_name); goto _err_defer; } snd_soc_rtdcom_add(rtd, rtd->cpu_dai->component); -- 2.16.1

1 0

[alsa-devel] [PATCH 0/2] ASoC: stm32: spdifrx: change dai name
by Olivier Moysan 12 Feb '18

12 Feb '18

This patchset changes spdifrx dai name and fixes a typo issue. Olivier Moysan (2): ASoC: stm32: spdifrx: fix typo in function name. ASoC: stm32: spdifrx: Use default dai name sound/soc/stm/stm32_spdifrx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 1.9.1

2 4

[alsa-devel] [PATCH] ALSA: usb: add more device quirks for USB DSD devices
by Daniel Mack 12 Feb '18

12 Feb '18

Add some more devices that need quirks to handle DSD modes correctly. Signed-off-by: Daniel Mack <daniel(a)zonque.org> Reported-and-tested-by: Thomas Gresens <tgresens(a)gmail.com> --- sound/usb/quirks.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index a66ef5777887..ea8f3de92fa4 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1363,8 +1363,11 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; - /* Amanero Combo384 USB interface with native DSD support */ - case USB_ID(0x16d0, 0x071a): + /* Amanero Combo384 USB based DACs with native DSD support */ + case USB_ID(0x16d0, 0x071a): /* Amanero - Combo384 */ + case USB_ID(0x2ab6, 0x0004): /* T+A DAC8DSD-V2.0, MP1000E-V2.0, MP2000R-V2.0, MP2500R-V2.0, MP3100HV-V2.0 */ + case USB_ID(0x2ab6, 0x0005): /* T+A USB HD Audio 1 */ + case USB_ID(0x2ab6, 0x0006): /* T+A USB HD Audio 2 */ if (fp->altsetting == 2) { switch (le16_to_cpu(chip->dev->descriptor.bcdDevice)) { case 0x199: -- 2.14.3

2 1

Re: [alsa-devel] [PATCH] ALSA: usb-audio: add implicit fb quirk for Behringer UFX1204
by Takashi Iwai 12 Feb '18

12 Feb '18

On Sat, 03 Feb 2018 15:42:40 +0100, Lassi Ylikojola wrote: > > Add quirk to ensure a sync endpoint is properly configured. > This patch is a fix for same symptoms on Behringer UFX1204 as patch > from Albertto Aquirre on Dec 8 2016 for Axe-Fx II. > > Signed-off-by: Lassi Ylikojola <lassi.ylikojola(a)gmail.com> The patch doesn't seem applied cleanly to the latest tree. Could you check it and repost with the proper patch for the latest Linus tree? thanks, Takashi

2 2

Re: [alsa-devel] [PATCH] ALSA: ac97: kconfig: Remove select of undefined symbol AC97
by Takashi Iwai 12 Feb '18

12 Feb '18

On Fri, 09 Feb 2018 00:20:21 +0100, Ulf Magnusson wrote: > > On Fri, Feb 09, 2018 at 12:15:36AM +0100, Ulf Magnusson wrote: > > The AC97_BUS_NEW Kconfig symbol selects the globally undefined symbol > > AC97. > > > > Robert Jarzmik confirmed in https://lkml.org/lkml/2018/2/7/96 that the > > select was put in by mistake and can be safely removed, with no other > > changes required. Remove it. > > > > Signed-off-by: Ulf Magnusson <ulfalizer(a)gmail.com> > > --- > > sound/ac97/Kconfig | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/sound/ac97/Kconfig b/sound/ac97/Kconfig > > index f8a64e15e5bf..baa5f8ef89d2 100644 > > --- a/sound/ac97/Kconfig > > +++ b/sound/ac97/Kconfig > > @@ -5,7 +5,6 @@ > > > > config AC97_BUS_NEW > > tristate > > - select AC97 > > help > > This is the new AC97 bus type, successor of AC97_BUS. The ported > > drivers which benefit from the AC97 automatic probing should "select" > > -- > > 2.14.1 > > > > I didn't have a particular tree in mind for this patchset by the way. > Feel free to take the patch in wherever it makes sense. Applied now, thanks. Takashi

1 0

[alsa-devel] arecord read error, input/output error in embedded linux project
by Christopher. Sierra Melendez 12 Feb '18

12 Feb '18

Hello, Did this issue solved? I have same problem… Enviado desde Correo<https://go.microsoft.com/fwlink/?LinkId=550986> para Windows 10

1 0

[alsa-devel] [PATCH RESEND] sound: omap-twl4030: do not complain on -EPROBE_DEFER when initializing
by Ladislav Michl 11 Feb '18

11 Feb '18

Don't complain on -EPROBE_DEFER when when initializing, the driver probe will be retried later. Signed-off-by: Ladislav Michl <ladis(a)linux-mips.org> --- Note: Just a resend of patch from 9 Nov 2016 as there were no reply by then. sound/soc/omap/omap-twl4030.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c index cccc316743fa..7c1f71884768 100644 --- a/sound/soc/omap/omap-twl4030.c +++ b/sound/soc/omap/omap-twl4030.c @@ -322,8 +322,10 @@ static int omap_twl4030_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, priv); ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { - dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n", - ret); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "devm_snd_soc_register_card() failed: %d\n", + ret); return ret; } -- 2.15.1

2 1

[alsa-devel] Fixing the CA0132 driver for Sound Blaster Z
by Connor McAdams 10 Feb '18

10 Feb '18

Hi, first time here and first time working on any sort of Kernel driver, so I hope I'm doing things right by asking my question through this list. I have managed to get audio working for the Creative Sound Blaster Z by reverse engineering the driver and firmware from Windows. I created a program to capture the HDA verbs as they happen in Windows through QEMU using vfio pci passthrough. Now, here's where I'm kind of stumped. I created a program to send the commands that route the audio to it's output on the card. If I run these commands after the driver has already loaded in Linux, it works fine and I get audio. However, if I run these commands inside of the driver, there is no audio. There is an 8051 cpu onboard, and I can dump the contents of its memory through HDA-verbs. I compared dumps of the 8051 while audio is working with the script to dumps when the audio is broken from putting the commands inside of the driver. Just about everything is the same, except for a region I have figured out has to do with the streams. Each audio stream seems to have an ID, and for some reason, if the commands are run inside of the driver, it seems like the stream ID's get messed with. My current theory is that the streams are assigned in order of streams started. So, after my command to start audio, it expects the next stream to be the output audio stream. It also seems like compared to Windows, a lot more stream commands are used. Maybe extra streams are being initiated that are unused, and are interfering with the card. So, my question is, how would I go about starting a stream, maybe like a dummy stream, so it is assigned properly? Are there any examples of this? If someone could point me to where streams are even initiated it would be helpful. My next question is the legality of distributing the firmware. I was able to pull the Sound Blaster Z's firmware from the Windows driver file. Since that is a publicly available file, is it legal to redistribute? I have no experience with this kind of thing. Maybe someone here has someone within Creative I could ask or something. Anyways, like I said, this is my first time doing anything like this. Please correct me if I've done anything wrong, and let me know if anyone needs to see my current driver. Thanks, Connor M.

1 0

[alsa-devel] [PATCH] ASoC: use DEFINE_SHOW_ATTRIBUTE() to decrease code duplication
by Donglin Peng 09 Feb '18

09 Feb '18

There is some duplicate code in soc-core.c,and the kernel provides DEFINE_SHOW_ATTRIBUTE() helper macro to decrease it in seq_file.h. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- sound/soc/soc-core.c | 51 +++++++++------------------------------------------ 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 96c44f6576c9..cb52d1e8e0b9 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -349,33 +349,22 @@ static void soc_init_codec_debugfs(struct snd_soc_component *component) "ASoC: Failed to create codec register debugfs file\n"); } -static int codec_list_seq_show(struct seq_file *m, void *v) +static int codec_list_show(struct seq_file *s, void *v) { struct snd_soc_codec *codec; mutex_lock(&client_mutex); list_for_each_entry(codec, &codec_list, list) - seq_printf(m, "%s\n", codec->component.name); + seq_printf(s, "%s\n", codec->component.name); mutex_unlock(&client_mutex); return 0; } +DEFINE_SHOW_ATTRIBUTE(codec_list); -static int codec_list_seq_open(struct inode *inode, struct file *file) -{ - return single_open(file, codec_list_seq_show, NULL); -} - -static const struct file_operations codec_list_fops = { - .open = codec_list_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int dai_list_seq_show(struct seq_file *m, void *v) +static int dai_list_show(struct seq_file *s, void *v) { struct snd_soc_component *component; struct snd_soc_dai *dai; @@ -384,50 +373,28 @@ static int dai_list_seq_show(struct seq_file *m, void *v) list_for_each_entry(component, &component_list, list) list_for_each_entry(dai, &component->dai_list, list) - seq_printf(m, "%s\n", dai->name); + seq_printf(s, "%s\n", dai->name); mutex_unlock(&client_mutex); return 0; } +DEFINE_SHOW_ATTRIBUTE(dai_list); -static int dai_list_seq_open(struct inode *inode, struct file *file) -{ - return single_open(file, dai_list_seq_show, NULL); -} - -static const struct file_operations dai_list_fops = { - .open = dai_list_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int platform_list_seq_show(struct seq_file *m, void *v) +static int platform_list_show(struct seq_file *s, void *v) { struct snd_soc_platform *platform; mutex_lock(&client_mutex); list_for_each_entry(platform, &platform_list, list) - seq_printf(m, "%s\n", platform->component.name); + seq_printf(s, "%s\n", platform->component.name); mutex_unlock(&client_mutex); return 0; } - -static int platform_list_seq_open(struct inode *inode, struct file *file) -{ - return single_open(file, platform_list_seq_show, NULL); -} - -static const struct file_operations platform_list_fops = { - .open = platform_list_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(platform_list); static void soc_init_card_debugfs(struct snd_soc_card *card) { -- 2.16.1

2 6

[alsa-devel] [PATCH] ASoC: use DEFINE_SHOW_ATTRIBUTE() to decrease code duplication
by Peng Donglin 09 Feb '18

09 Feb '18

There is some duplicate code in soc-core.c,and the kernel provides DEFINE_SHOW_ATTRIBUTE() helper macro to decrease it in seq_file.h. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- sound/soc/soc-core.c | 51 +++++++++------------------------------------------ 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 96c44f6576c9..cb52d1e8e0b9 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -349,33 +349,22 @@ static void soc_init_codec_debugfs(struct snd_soc_component *component) "ASoC: Failed to create codec register debugfs file\n"); } -static int codec_list_seq_show(struct seq_file *m, void *v) +static int codec_list_show(struct seq_file *s, void *v) { struct snd_soc_codec *codec; mutex_lock(&client_mutex); list_for_each_entry(codec, &codec_list, list) - seq_printf(m, "%s\n", codec->component.name); + seq_printf(s, "%s\n", codec->component.name); mutex_unlock(&client_mutex); return 0; } +DEFINE_SHOW_ATTRIBUTE(codec_list); -static int codec_list_seq_open(struct inode *inode, struct file *file) -{ - return single_open(file, codec_list_seq_show, NULL); -} - -static const struct file_operations codec_list_fops = { - .open = codec_list_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int dai_list_seq_show(struct seq_file *m, void *v) +static int dai_list_show(struct seq_file *s, void *v) { struct snd_soc_component *component; struct snd_soc_dai *dai; @@ -384,50 +373,28 @@ static int dai_list_seq_show(struct seq_file *m, void *v) list_for_each_entry(component, &component_list, list) list_for_each_entry(dai, &component->dai_list, list) - seq_printf(m, "%s\n", dai->name); + seq_printf(s, "%s\n", dai->name); mutex_unlock(&client_mutex); return 0; } +DEFINE_SHOW_ATTRIBUTE(dai_list); -static int dai_list_seq_open(struct inode *inode, struct file *file) -{ - return single_open(file, dai_list_seq_show, NULL); -} - -static const struct file_operations dai_list_fops = { - .open = dai_list_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static int platform_list_seq_show(struct seq_file *m, void *v) +static int platform_list_show(struct seq_file *s, void *v) { struct snd_soc_platform *platform; mutex_lock(&client_mutex); list_for_each_entry(platform, &platform_list, list) - seq_printf(m, "%s\n", platform->component.name); + seq_printf(s, "%s\n", platform->component.name); mutex_unlock(&client_mutex); return 0; } - -static int platform_list_seq_open(struct inode *inode, struct file *file) -{ - return single_open(file, platform_list_seq_show, NULL); -} - -static const struct file_operations platform_list_fops = { - .open = platform_list_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(platform_list); static void soc_init_card_debugfs(struct snd_soc_card *card) { -- 2.16.1

1 0

[alsa-devel] [PATCH v9 0/8] TDA1997x HDMI video reciver
by Tim Harvey 09 Feb '18

09 Feb '18

This is a v4l2 subdev driver supporting the TDA1997x HDMI video receiver. I've tested this on a Gateworks GW54xx/GW551x with an IMX6Q/IMX6DL which uses the TDA19971 with 16bits connected to the IMX6 CSI and single-lane I2S audio providing 2-channel audio. For this configuration I've tested both 16bit YUV422 and 8bit BT656 parallel video bus modes. While the driver should support the TDA1993 I do not have one for testing. Further potential development efforts include: - CEC support - HDCP support - TDA19972 support (2 inputs) Media graphs can be found at http://dev.gateworks.com/docs/linux/media History: v9: - add digital video decoder video interface entity function v8: - fix clearing pad for VIDIOC_DV_TIMIGNS_CAP - support full range of input modes based on timings_cap - add patch to fix clearing pad for VIDIOC_DV_TIMIGINGS - fix available formats for tda19971 bt656 bus width >12 - fix set_format (compliance) - fixed get/set edid (compliance) - add init_cfg to setup default pad config (compliance) - added missing pad checks to get_dv_timings_cap/enum_dv_timings (compliance) - fix alignment of if statement and whitespace in comment (Hans) - move regs to tda1997x_regs.h to clean up (Hans) - add define and sanity check for num of mbus_codes (Hans) v7: - fix interlaced mode - support no AVI infoframe (ie DVI) (Hans) - add support for multiple output formats (Hans) v6: - tda1997x: fix return on regulator enablei in tda1997x_set_power() (Fabio) - tda1997x: fix colorspace handling (Hans) - bindings: added Robs's ack (Rob) - replace copyright with SPDX tag (Philippe) v5: - added v4l2_hdmi_colorimetry() patch from Hans to series - bindings: added Sakari's ack - tda1997x: uppercase string constants - tda1997x: use v4l2_hdmi_rx_coloriemtry to fill format - tda1997x: fix V4L2_CID_DV_RX_RGB_RANGE - tda1997x: fix interlaced mode format - dts: remove leading 0 from unit address - dts: add newline between property list and child node - dts: added missing audmux in GW551x dts v4: - move include/dt-bindings/media/tda1997x.h to bindings patch - clarify port node details in bindings - fix typos - fix default quant range for VGA - fix quant range handling and conv matrix - add additional standards and capabilities to timings_cap v3: - fix typo in dt bindings - added dt bindings for GW551x - use V4L2_DV_BT_FRAME_WIDTH/HEIGHT macros - fixed missing break - use only hdmi_infoframe_log for infoframe logging - simplify tda1997x_s_stream error handling - add delayed work proc to handle hotplug enable/disable - fix set_edid (disable HPD before writing, enable after) - remove enabling edid by default - initialize timings - take quant range into account in colorspace conversion - remove vendor/product tracking (we provide this in log_status via infoframes) - add v4l_controls - add more detail to log_status - calculate vhref generator timings - timing detection fixes (rounding errors, hswidth errors) - rename configure_input/configure_conv functions v2: - encorporate feedback into dt bindings - change audio dt bindings - implement dv timings enum/cap - remove deprecated g_mbus_config op - fix dv_query_timings - add EDID get/set handling - remove max-pixel-rate support - add audio codec DAI support - added media-ctl and v4l2-compliance details v1: - initial RFC # media-ctl -d /dev/media0 -p Media controller API version 4.15.0 Media device information ------------------------ driver imx-media model imx-media serial bus info hw revision 0x0 driver version 4.15.0 Device topology - entity 1: adv7180 2-0020 (1 pad, 1 link) type V4L2 subdev subtype Unknown flags 20004 device node name /dev/v4l-subdev0 pad0: Source [fmt:UYVY8_2X8/720x480 field:interlaced colorspace:smpte170m] -> "ipu2_csi1_mux":1 [] - entity 3: tda19971 2-0048 (1 pad, 1 link) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev1 pad0: Source [fmt:UYVY8_2X8/1280x720 field:none colorspace:srgb] [dv.caps:BT.656/1120 min:640x350@13000000 max:1920x1200@165000000 stds:CEA-861,DMT,CVT,GTF caps:interlaced,progressive,reduced-blanking,custom] [dv.detect:BT.656/1120 1280x720p60 (1650x750) stds:CEA-861 flags:can-reduce-fps,CE-video,has-cea861-vic] [dv.current:BT.656/1120 1280x720p60 (1650x750) stds:CEA-861 flags:can-reduce-fps,CE-video,has-cea861-vic] -> "ipu1_csi0_mux":1 [ENABLED] - entity 5: ipu1_vdic (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev2 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_csi0":1 [] <- "ipu1_csi1":1 [] pad1: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] pad2: Source [fmt:AYUV8_1X32/640x480@1/60 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] - entity 9: ipu2_vdic (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev3 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_csi0":1 [] <- "ipu2_csi1":1 [] pad1: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] pad2: Source [fmt:AYUV8_1X32/640x480@1/60 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] - entity 13: ipu1_ic_prp (3 pads, 5 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev4 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_vdic":2 [] <- "ipu1_csi0":1 [] <- "ipu1_csi1":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpenc":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpvf":0 [] - entity 17: ipu1_ic_prpenc (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev5 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_ic_prp":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpenc capture":0 [] - entity 20: ipu1_ic_prpenc capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video0 pad0: Sink <- "ipu1_ic_prpenc":1 [] - entity 26: ipu1_ic_prpvf (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev6 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_ic_prp":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpvf capture":0 [] - entity 29: ipu1_ic_prpvf capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video1 pad0: Sink <- "ipu1_ic_prpvf":1 [] - entity 35: ipu2_ic_prp (3 pads, 5 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev7 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_vdic":2 [] <- "ipu2_csi0":1 [] <- "ipu2_csi1":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpenc":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpvf":0 [] - entity 39: ipu2_ic_prpenc (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev8 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_ic_prp":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpenc capture":0 [] - entity 42: ipu2_ic_prpenc capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video2 pad0: Sink <- "ipu2_ic_prpenc":1 [] - entity 48: ipu2_ic_prpvf (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev9 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_ic_prp":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpvf capture":0 [] - entity 51: ipu2_ic_prpvf capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video3 pad0: Sink <- "ipu2_ic_prpvf":1 [] - entity 57: ipu1_csi0 (3 pads, 4 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev10 pad0: Sink [fmt:UYVY8_2X8/1280x720@1/30 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:lim-range crop.bounds:(0,0)/1280x720 crop:(0,0)/1280x720 compose.bounds:(0,0)/1280x720 compose:(0,0)/1280x720] <- "ipu1_csi0_mux":2 [ENABLED] pad1: Source [fmt:AYUV8_1X32/1280x720@1/30 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] -> "ipu1_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/1280x720@1/30 field:none colorspace:srgb xfer:srgb ycbcr:601 quantization:lim-range] -> "ipu1_csi0 capture":0 [ENABLED] - entity 61: ipu1_csi0 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video4 pad0: Sink <- "ipu1_csi0":2 [ENABLED] - entity 67: ipu1_csi1 (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev11 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] -> "ipu1_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_csi1 capture":0 [] - entity 71: ipu1_csi1 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video5 pad0: Sink <- "ipu1_csi1":2 [] - entity 77: ipu2_csi0 (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev12 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] -> "ipu2_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_csi0 capture":0 [] - entity 81: ipu2_csi0 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video6 pad0: Sink <- "ipu2_csi0":2 [] - entity 87: ipu2_csi1 (3 pads, 4 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev13 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] <- "ipu2_csi1_mux":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] -> "ipu2_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_csi1 capture":0 [] - entity 91: ipu2_csi1 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video7 pad0: Sink <- "ipu2_csi1":2 [] - entity 97: ipu1_csi0_mux (3 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev14 pad0: Sink [fmt:unknown/0x0] pad1: Sink [fmt:UYVY8_2X8/1280x720 field:none colorspace:srgb] <- "tda19971 2-0048":0 [ENABLED] pad2: Source [fmt:UYVY8_2X8/1280x720 field:none colorspace:srgb] -> "ipu1_csi0":0 [ENABLED] - entity 101: ipu2_csi1_mux (3 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev15 pad0: Sink [fmt:unknown/0x0] pad1: Sink [fmt:unknown/0x0] <- "adv7180 2-0020":0 [] pad2: Source [fmt:unknown/0x0] -> "ipu2_csi1":0 [] v4l2-compliance test results: - with the following kernel patches: v4l2-subdev: clear reserved fields v4l2-subdev: without controls return -ENOTTY # v4l2-compliance -u1 v4l2-compliance SHA : b2f8f9049056eb6f9e028927dacb2c715a062df8 Media Driver Info: Driver name : imx-media Model : imx-media Serial : Bus info : Media version : 4.15.0 Hardware revision: 0x00000000 (0) Driver version : 4.15.0 Interface Info: ID : 0x0300008f Type : V4L Sub-Device Entity Info: ID : 0x00000003 (3) Name : tda19971 2-0048 Function : FAIL: Unknown Function (00006001) Pad 0x01000004 : Source Link 0x0200006f: to remote pad 0x1000063 of entity 'ipu1_csi0_mux': Data, Enabled Compliance test for device /dev/v4l-subdev1: Required ioctls: test MC information: FAIL Allow for multiple opens: test second /dev/v4l-subdev1 open: OK test for unlimited opens: OK Debug ioctls: test VIDIOC_LOG_STATUS: OK Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK test VIDIOC_DV_TIMINGS_CAP: OK test VIDIOC_G/S_EDID: OK Sub-Device ioctls (Source Pad 0): test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK test Try VIDIOC_SUBDEV_G/S_FMT: OK test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported) test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK test Active VIDIOC_SUBDEV_G/S_FMT: OK test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported) test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK test VIDIOC_G/S_CTRL: OK test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 4 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported) test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK (Not Supported) test VIDIOC_TRY_FMT: OK (Not Supported) test VIDIOC_S_FMT: OK (Not Supported) test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK (Not Supported) Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported) test VIDIOC_EXPBUF: OK (Not Supported) Total: 47, Succeeded: 46, Failed: 1, Warnings: 0 # v4l2-compliance -m0 -M v4l2-compliance SHA : b2f8f9049056eb6f9e028927dacb2c715a062df8 Media Driver Info: Driver name : imx-media Model : imx-media Serial : Bus info : Media version : 4.15.0 Hardware revision: 0x00000000 (0) Driver version : 4.15.0 Compliance test for device /dev/media0: Required ioctls: test MEDIA_IOC_DEVICE_INFO: OK Allow for multiple opens: test second /dev/media0 open: OK test MEDIA_IOC_DEVICE_INFO: OK test for unlimited opens: OK Media Controller ioctls: fail: v4l2-test-media.cpp(94): function == MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN fail: v4l2-test-media.cpp(156): checkFunction(ent.function, true) test MEDIA_IOC_G_TOPOLOGY: FAIL fail: v4l2-test-media.cpp(275): num_data_links != num_links test MEDIA_IOC_ENUM_ENTITIES/LINKS: FAIL test MEDIA_IOC_SETUP_LINK: OK Total: 7, Succeeded: 5, Failed: 2, Warnings: 0 ^^^^ above failures are due to imx/adv7180 not setting a valid entity function Hans Verkuil (1): v4l2-dv-timings: add v4l2_hdmi_colorimetry() Tim Harvey (7): media: v4l-ioctl: fix clearing pad for VIDIOC_DV_TIMIGNS_CAP media: add digital video decoder video interface entity functions MAINTAINERS: add entry for NXP TDA1997x driver media: dt-bindings: Add bindings for TDA1997X media: i2c: Add TDA1997x HDMI receiver driver ARM: dts: imx: Add TDA19971 HDMI Receiver to GW54xx ARM: dts: imx: Add TDA19971 HDMI Receiver to GW551x .../devicetree/bindings/media/i2c/tda1997x.txt | 179 ++ Documentation/media/uapi/mediactl/media-types.rst | 11 + MAINTAINERS | 8 + arch/arm/boot/dts/imx6q-gw54xx.dts | 105 + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 29 +- arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 138 + drivers/media/i2c/Kconfig | 9 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/tda1997x.c | 2848 ++++++++++++++++++++ drivers/media/i2c/tda1997x_regs.h | 641 +++++ drivers/media/v4l2-core/v4l2-dv-timings.c | 141 + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- include/dt-bindings/media/tda1997x.h | 74 + include/media/i2c/tda1997x.h | 42 + include/media/v4l2-dv-timings.h | 21 + include/uapi/linux/media.h | 5 + 16 files changed, 4250 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/i2c/tda1997x.txt create mode 100644 drivers/media/i2c/tda1997x.c create mode 100644 drivers/media/i2c/tda1997x_regs.h create mode 100644 include/dt-bindings/media/tda1997x.h create mode 100644 include/media/i2c/tda1997x.h -- 2.7.4

2 10

[alsa-devel] [PATCH] ASoC: rt5645: Introduce mapping for ACPI-defined GPIO
by Carlo Caione 08 Feb '18

08 Feb '18

From: Carlo Caione <carlo(a)endlessm.com> On at least one notebook (ECS EF20EA) the 'hp-detect' GPIO is defined in the DSDT table by the ACPI GpioIo resources in _CRS. Add this mapping to the rt5645 driver to enable the jack detection also on non-DT platforms. Method (_CRS, 0, NotSerialized) { Name (SBUF, ResourceTemplate () { I2cSerialBusV2 (0x001A, ControllerInitiated, 0x00061A80, AddressingMode7Bit, "\\_SB.PCI0.I2C2", 0x00, ResourceConsumer, , Exclusive, ) GpioInt (Edge, ActiveBoth, SharedAndWake, PullNone, 0x0000, "\\_SB.GPO3", 0x00, ResourceConsumer, , ) { // Pin list 0x004F } GpioIo (Shared, PullDefault, 0x0000, 0x0000, IoRestrictionInputOnly, "\\_SB.GPO3", 0x00, ResourceConsumer, , ) { // Pin list 0x004F } }) Return (SBUF) /* \_SB_.PCI0.I2C2.RTK2._CRS.SBUF */ } Signed-off-by: Carlo Caione <carlo(a)endlessm.com> --- sound/soc/codecs/rt5645.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 8f140c8b93ac..7f2d83884556 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3764,6 +3764,13 @@ static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev) return 0; } +static const struct acpi_gpio_params hp_detect_gpios = { 1, 0, false }; + +static const struct acpi_gpio_mapping cht_rt5645_gpios[] = { + { "hp-detect-gpios", &hp_detect_gpios, 1 }, + {}, +}; + static int rt5645_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -3779,6 +3786,10 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, if (rt5645 == NULL) return -ENOMEM; + if (ACPI_HANDLE(&i2c->dev)) + if (devm_acpi_dev_add_driver_gpios(&i2c->dev, cht_rt5645_gpios)) + dev_dbg(&i2c->dev, "Failed to add driver gpios\n"); + rt5645->i2c = i2c; i2c_set_clientdata(i2c, rt5645); -- 2.14.1

1 0

[alsa-devel] Adding support for CMEDIA USB2.0 High-Speed True HD Audio
by Jean-Philippe Guillemin 08 Feb '18

08 Feb '18

Hi, CMEDIA USB2.0 High-Speed True HD Audio has iec958 output on device 2 and iec958 input on device 0. root[~]# cat /proc/asound/cards 0 [Audio ]: USB-Audio - USB2.0 High-Speed True HD Audio CMEDIA USB2.0 High-Speed True HD Audio at usb-0000:00:12.2-2, high speed I'm trying to create a mapping in USB-Audio.conf : # If a device does not use the first PCM device for digital data, the device # number for the iec958 device can be changed here. USB-Audio.pcm.iec958_device { # "NoiseBlaster 3000" 42 "USB Sound Blaster HD" 1 "USB2.0 High-Speed True HD Audio" 2 ... But I never got a match on "USB2.0 High-Speed True HD Audio". Please could you provide me correct config ? I will test it and report results so that you can append this card to ALSA. Thanks (below lsusb output) root[~]# lsusb -v Bus 001 Device 009: ID 147a:e055 Formosa Industrial Computing, Inc. Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 239 Miscellaneous Device bDeviceSubClass 2 bDeviceProtocol 1 Interface Association bMaxPacketSize0 64 idVendor 0x147a Formosa Industrial Computing, Inc. idProduct 0xe055 bcdDevice 1.08 iManufacturer 1 CMEDIA iProduct 2 USB2.0 High-Speed True HD Audio iSerial 0 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 1170 bNumInterfaces 6 bConfigurationValue 1 iConfiguration 0 bmAttributes 0x80 (Bus Powered) MaxPower 500mA Interface Association: bLength 8 bDescriptorType 11 bFirstInterface 0 bInterfaceCount 5 bFunctionClass 1 Audio bFunctionSubClass 0 bFunctionProtocol 32 iFunction 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 1 Control Device bInterfaceProtocol 32 iInterface 0 AudioControl Interface Descriptor: bLength 9 bDescriptorType 36 bDescriptorSubtype 1 (HEADER) bcdADC 2.00 bCategory 10 wTotalLength 378 bmControl 0x00 AudioControl Interface Descriptor: bLength 17 bDescriptorType 36 bDescriptorSubtype 2 (INPUT_TERMINAL) bTerminalID 1 wTerminalType 0x0101 USB Streaming bAssocTerminal 0 bCSourceID 22 bNrChannels 0 bmChannelConfig 0x00000000 bmControls 0x0040 Cluster Control (read-only) iChannelNames 0 iTerminal 0 AudioControl Interface Descriptor: bLength 17 bDescriptorType 36 bDescriptorSubtype 2 (INPUT_TERMINAL) bTerminalID 2 wTerminalType 0x0101 USB Streaming bAssocTerminal 0 bCSourceID 23 bNrChannels 0 bmChannelConfig 0x00000000 bmControls 0x0040 Cluster Control (read-only) iChannelNames 0 iTerminal 0 AudioControl Interface Descriptor: bLength 17 bDescriptorType 36 bDescriptorSubtype 2 (INPUT_TERMINAL) bTerminalID 3 wTerminalType 0x0201 Microphone bAssocTerminal 0 bCSourceID 24 bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) bmControls 0x0040 Cluster Control (read-only) iChannelNames 0 iTerminal 0 AudioControl Interface Descriptor: bLength 17 bDescriptorType 36 bDescriptorSubtype 2 (INPUT_TERMINAL) bTerminalID 4 wTerminalType 0x0603 Line Connector bAssocTerminal 0 bCSourceID 24 bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) bmControls 0x0040 Cluster Control (read-only) iChannelNames 0 iTerminal 0 AudioControl Interface Descriptor: bLength 17 bDescriptorType 36 bDescriptorSubtype 2 (INPUT_TERMINAL) bTerminalID 5 wTerminalType 0x0605 SPDIF interface bAssocTerminal 0 bCSourceID 25 bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) bmControls 0x0040 Cluster Control (read-only) iChannelNames 0 iTerminal 0 AudioControl Interface Descriptor: bLength 12 bDescriptorType 36 bDescriptorSubtype 3 (OUTPUT_TERMINAL) bTerminalID 6 wTerminalType 0x0301 Speaker bAssocTerminal 0 bSourceID 11 bCSourceID 22 bmControls 0x0000 iTerminal 0 AudioControl Interface Descriptor: bLength 12 bDescriptorType 36 bDescriptorSubtype 3 (OUTPUT_TERMINAL) bTerminalID 7 wTerminalType 0x0605 SPDIF interface bAssocTerminal 0 bSourceID 12 bCSourceID 23 bmControls 0x0000 iTerminal 0 AudioControl Interface Descriptor: bLength 12 bDescriptorType 36 bDescriptorSubtype 3 (OUTPUT_TERMINAL) bTerminalID 8 wTerminalType 0x0101 USB Streaming bAssocTerminal 0 bSourceID 10 bCSourceID 24 bmControls 0x0000 iTerminal 0 AudioControl Interface Descriptor: bLength 12 bDescriptorType 36 bDescriptorSubtype 3 (OUTPUT_TERMINAL) bTerminalID 9 wTerminalType 0x0101 USB Streaming bAssocTerminal 0 bSourceID 5 bCSourceID 25 bmControls 0x0000 iTerminal 0 AudioControl Interface Descriptor: bLength 10 bDescriptorType 36 bDescriptorSubtype 5 (SELECTOR_UNIT) bUnitID 10 bNrInPins 3 baSource( 0) 13 baSource( 1) 14 baSource( 2) 15 bmControls 0x03 Selector Control (read/write) iSelector 0 AudioControl Interface Descriptor: bLength 42 bDescriptorType 36 bDescriptorSubtype 6 (FEATURE_UNIT) bUnitID 11 bSourceID 18 bmaControls( 0) 0x00000003 Mute Control (read/write) bmaControls( 1) 0x0000000c Volume Control (read/write) bmaControls( 2) 0x0000000c Volume Control (read/write) bmaControls( 3) 0x0000000c Volume Control (read/write) bmaControls( 4) 0x0000000c Volume Control (read/write) bmaControls( 5) 0x0000000c Volume Control (read/write) bmaControls( 6) 0x0000000c Volume Control (read/write) bmaControls( 7) 0x0000000c Volume Control (read/write) bmaControls( 8) 0x0000000c Volume Control (read/write) iFeature 0 AudioControl Interface Descriptor: bLength 18 bDescriptorType 36 bDescriptorSubtype 6 (FEATURE_UNIT) bUnitID 12 bSourceID 2 bmaControls( 0) 0x00000003 Mute Control (read/write) bmaControls( 1) 0x00000000 bmaControls( 2) 0x00000000 iFeature 0 AudioControl Interface Descriptor: bLength 18 bDescriptorType 36 bDescriptorSubtype 6 (FEATURE_UNIT) bUnitID 13 bSourceID 3 bmaControls( 0) 0x00003003 Mute Control (read/write) Automatic Gain Control (read/write) bmaControls( 1) 0x0000000c Volume Control (read/write) bmaControls( 2) 0x0000000c Volume Control (read/write) iFeature 0 AudioControl Interface Descriptor: bLength 18 bDescriptorType 36 bDescriptorSubtype 6 (FEATURE_UNIT) bUnitID 14 bSourceID 4 bmaControls( 0) 0x00000003 Mute Control (read/write) bmaControls( 1) 0x0000000c Volume Control (read/write) bmaControls( 2) 0x0000000c Volume Control (read/write) iFeature 0 AudioControl Interface Descriptor: bLength 18 bDescriptorType 36 bDescriptorSubtype 6 (FEATURE_UNIT) bUnitID 15 bSourceID 19 bmaControls( 0) 0x00000003 Mute Control (read/write) bmaControls( 1) 0x0000000c Volume Control (read/write) bmaControls( 2) 0x0000000c Volume Control (read/write) iFeature 0 AudioControl Interface Descriptor: bLength 18 bDescriptorType 36 bDescriptorSubtype 6 (FEATURE_UNIT) bUnitID 16 bSourceID 3 bmaControls( 0) 0x00000003 Mute Control (read/write) bmaControls( 1) 0x0000000c Volume Control (read/write) bmaControls( 2) 0x0000000c Volume Control (read/write) iFeature 0 AudioControl Interface Descriptor: bLength 18 bDescriptorType 36 bDescriptorSubtype 6 (FEATURE_UNIT) bUnitID 17 bSourceID 4 bmaControls( 0) 0x00000003 Mute Control (read/write) bmaControls( 1) 0x0000000c Volume Control (read/write) bmaControls( 2) 0x0000000c Volume Control (read/write) iFeature 0 AudioControl Interface Descriptor: bLength 28 bDescriptorType 36 bDescriptorSubtype 4 (MIXER_UNIT) bUnitID 18 bNrPins 3 baSourceID( 0) 1 baSourceID( 1) 16 baSourceID( 2) 17 bNrChannels 8 bmChannelConfig 0x0000063f Front Left (FL) Front Right (FR) Front Center (FC) Low Frequency Effects (LFE) Back Left (BL) Back Right (BR) Side Left (SL) Side Right (SR) iChannelNames 0 00 00 00 00 00 00 00 00 00 00 00 00 bmControls 01 Cluster Control (read-only) iMixer 0 AudioControl Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 4 (MIXER_UNIT) bUnitID 19 bNrPins 2 baSourceID( 0) 3 baSourceID( 1) 4 bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 00 bmControls 01 Cluster Control (read-only) iMixer 0 AudioControl Interface Descriptor: bLength 8 bDescriptorType 36 bDescriptorSubtype 10 (CLOCK_SOURCE) bClockID 22 bmAttributes 0x07 Internal programmable Clock (synced to SOF) bmControls 0x07 Clock Frequency Control (read/write) Clock Validity Control (read-only) bAssocTerminal 0 iClockSource 0 AudioControl Interface Descriptor: bLength 8 bDescriptorType 36 bDescriptorSubtype 10 (CLOCK_SOURCE) bClockID 23 bmAttributes 0x07 Internal programmable Clock (synced to SOF) bmControls 0x07 Clock Frequency Control (read/write) Clock Validity Control (read-only) bAssocTerminal 0 iClockSource 0 AudioControl Interface Descriptor: bLength 8 bDescriptorType 36 bDescriptorSubtype 10 (CLOCK_SOURCE) bClockID 24 bmAttributes 0x03 Internal programmable Clock bmControls 0x07 Clock Frequency Control (read/write) Clock Validity Control (read-only) bAssocTerminal 0 iClockSource 0 AudioControl Interface Descriptor: bLength 8 bDescriptorType 36 bDescriptorSubtype 10 (CLOCK_SOURCE) bClockID 25 bmAttributes 0x00 External Clock bmControls 0x07 Clock Frequency Control (read/write) Clock Validity Control (read-only) bAssocTerminal 0 iClockSource 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x8f EP 15 IN bmAttributes 3 Transfer Type Interrupt Synch Type None Usage Type Data wMaxPacketSize 0x0006 1x 6 bytes bInterval 4 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 4 Output Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 1 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 8 bmChannelConfig 0x0000063f Front Left (FL) Front Right (FR) Front Center (FC) Low Frequency Effects (LFE) Back Left (BL) Back Right (BR) Side Left (SL) Side Right (SR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 2 bBitResolution 16 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x01a0 1x 416 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 2 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 1 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 8 bmChannelConfig 0x0000063f Front Left (FL) Front Right (FR) Front Center (FC) Low Frequency Effects (LFE) Back Left (BL) Back Right (BR) Side Left (SL) Side Right (SR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 4 bBitResolution 24 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x0340 1x 832 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 3 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 1 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 2 bBitResolution 16 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x0068 1x 104 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 4 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 1 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 4 bBitResolution 24 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x00d0 1x 208 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 5 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 1 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 6 bmChannelConfig 0x0000003f Front Left (FL) Front Right (FR) Front Center (FC) Low Frequency Effects (LFE) Back Left (BL) Back Right (BR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 2 bBitResolution 16 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x0138 1x 312 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 6 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 1 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 6 bmChannelConfig 0x0000003f Front Left (FL) Front Right (FR) Front Center (FC) Low Frequency Effects (LFE) Back Left (BL) Back Right (BR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 4 bBitResolution 24 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x0270 1x 624 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 7 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 1 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 4 bmChannelConfig 0x00000033 Front Left (FL) Front Right (FR) Back Left (BL) Back Right (BR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 2 bBitResolution 16 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x00d0 1x 208 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 8 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 1 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 4 bmChannelConfig 0x00000033 Front Left (FL) Front Right (FR) Back Left (BL) Back Right (BR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 4 bBitResolution 24 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x01a0 1x 416 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 5 SPDIF Output Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 2 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 2 bBitResolution 16 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x06 EP 6 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x0068 1x 104 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 2 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 2 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 4 bBitResolution 24 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x06 EP 6 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x00d0 1x 208 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 3 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 2 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 3 bmFormats 0x00001381 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 3 (FORMAT_TYPE_III) bSubslotSize 2 bBitResolution 16 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x06 EP 6 OUT bmAttributes 13 Transfer Type Isochronous Synch Type Synchronous Usage Type Data wMaxPacketSize 0x0068 1x 104 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 3 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 6 Input Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 3 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 8 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 2 bBitResolution 16 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x88 EP 8 IN bmAttributes 5 Transfer Type Isochronous Synch Type Asynchronous Usage Type Data wMaxPacketSize 0x0068 1x 104 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 3 bAlternateSetting 2 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 8 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 4 bBitResolution 24 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x88 EP 8 IN bmAttributes 5 Transfer Type Isochronous Synch Type Asynchronous Usage Type Data wMaxPacketSize 0x00d0 1x 208 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 4 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 7 SPDIF Input Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 4 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 9 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 2 bBitResolution 16 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x8a EP 10 IN bmAttributes 5 Transfer Type Isochronous Synch Type Asynchronous Usage Type Data wMaxPacketSize 0x0068 1x 104 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 4 bAlternateSetting 2 bNumEndpoints 1 bInterfaceClass 1 Audio bInterfaceSubClass 2 Streaming bInterfaceProtocol 32 iInterface 0 AudioStreaming Interface Descriptor: bLength 16 bDescriptorType 36 bDescriptorSubtype 1 (AS_GENERAL) bTerminalLink 9 bmControls 0x05 Active Alternate Setting Control (read-only) Valid Alternate Setting Control (read-only) bFormatType 1 bmFormats 0x00000001 PCM bNrChannels 2 bmChannelConfig 0x00000003 Front Left (FL) Front Right (FR) iChannelNames 0 AudioStreaming Interface Descriptor: bLength 6 bDescriptorType 36 bDescriptorSubtype 2 (FORMAT_TYPE) bFormatType 1 (FORMAT_TYPE_I) bSubslotSize 4 bBitResolution 24 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x8a EP 10 IN bmAttributes 5 Transfer Type Isochronous Synch Type Asynchronous Usage Type Data wMaxPacketSize 0x00d0 1x 208 bytes bInterval 1 AudioControl Endpoint Descriptor: bLength 8 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x00 bmControls 0x00 bLockDelayUnits 0 Undefined wLockDelay 0 Interface Association: bLength 8 bDescriptorType 11 bFirstInterface 5 bInterfaceCount 1 bFunctionClass 3 Human Interface Device bFunctionSubClass 0 bFunctionProtocol 0 iFunction 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 5 bAlternateSetting 0 bNumEndpoints 1 bInterfaceClass 3 Human Interface Device bInterfaceSubClass 0 bInterfaceProtocol 0 iInterface 0 HID Device Descriptor: bLength 9 bDescriptorType 33 bcdHID 1.00 bCountryCode 0 Not supported bNumDescriptors 1 bDescriptorType 34 Report wDescriptorLength 50 Report Descriptors: ** UNAVAILABLE ** Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x84 EP 4 IN bmAttributes 3 Transfer Type Interrupt Synch Type None Usage Type Data wMaxPacketSize 0x0010 1x 16 bytes bInterval 4 Device Qualifier (for other device speed): bLength 10 bDescriptorType 6 bcdUSB 2.00 bDeviceClass 239 Miscellaneous Device bDeviceSubClass 2 bDeviceProtocol 1 Interface Association bMaxPacketSize0 64 bNumConfigurations 1 Device Status: 0x0000 (Bus Powered) I'm trying to create a mapping in

2 6

[alsa-devel] [PATCH v2] ASoC: use seq_file to dump the contents of dai_list, platform_list and codec_list
by Donglin Peng 08 Feb '18

08 Feb '18

Now the debugfs files dais/platforms/codecs have a size limit PAGE_SIZE and the user can not see the whole contents of dai_list/platform_list/codec_list when they are larger than this limit. This patch uses seq_file instead to make sure dais/platforms/codecs show the full contents of dai_list/platform_list/codec_list. Signed-off-by: Donglin Peng <dolinux.peng(a)gmail.com> --- Changelog v2 -fix commit log error sound/soc/soc-core.c | 111 +++++++++++++++++---------------------------------- 1 file changed, 37 insertions(+), 74 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c0edac80df34..7b582112e3fc 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -349,120 +349,84 @@ static void soc_init_codec_debugfs(struct snd_soc_component *component) "ASoC: Failed to create codec register debugfs file\n"); } -static ssize_t codec_list_read_file(struct file *file, char __user *user_buf, - size_t count, loff_t *ppos) +static int codec_list_seq_show(struct seq_file *m, void *v) { - char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); - ssize_t len, ret = 0; struct snd_soc_codec *codec; - if (!buf) - return -ENOMEM; - mutex_lock(&client_mutex); - list_for_each_entry(codec, &codec_list, list) { - len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", - codec->component.name); - if (len >= 0) - ret += len; - if (ret > PAGE_SIZE) { - ret = PAGE_SIZE; - break; - } - } + list_for_each_entry(codec, &codec_list, list) + seq_printf(m, "%s\n", codec->component.name); mutex_unlock(&client_mutex); - if (ret >= 0) - ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); - - kfree(buf); + return 0; +} - return ret; +static int codec_list_seq_open(struct inode *inode, struct file *file) +{ + return single_open(file, codec_list_seq_show, NULL); } static const struct file_operations codec_list_fops = { - .read = codec_list_read_file, - .llseek = default_llseek,/* read accesses f_pos */ + .open = codec_list_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, }; -static ssize_t dai_list_read_file(struct file *file, char __user *user_buf, - size_t count, loff_t *ppos) +static int dai_list_seq_show(struct seq_file *m, void *v) { - char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); - ssize_t len, ret = 0; struct snd_soc_component *component; struct snd_soc_dai *dai; - if (!buf) - return -ENOMEM; - mutex_lock(&client_mutex); - list_for_each_entry(component, &component_list, list) { - list_for_each_entry(dai, &component->dai_list, list) { - len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", - dai->name); - if (len >= 0) - ret += len; - if (ret > PAGE_SIZE) { - ret = PAGE_SIZE; - break; - } - } - } + list_for_each_entry(component, &component_list, list) + list_for_each_entry(dai, &component->dai_list, list) + seq_printf(m, "%s\n", dai->name); mutex_unlock(&client_mutex); - ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); - - kfree(buf); + return 0; +} - return ret; +static int dai_list_seq_open(struct inode *inode, struct file *file) +{ + return single_open(file, dai_list_seq_show, NULL); } static const struct file_operations dai_list_fops = { - .read = dai_list_read_file, - .llseek = default_llseek,/* read accesses f_pos */ + .open = dai_list_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, }; -static ssize_t platform_list_read_file(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) +static int platform_list_seq_show(struct seq_file *m, void *v) { - char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); - ssize_t len, ret = 0; struct snd_soc_platform *platform; - if (!buf) - return -ENOMEM; - mutex_lock(&client_mutex); - list_for_each_entry(platform, &platform_list, list) { - len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", - platform->component.name); - if (len >= 0) - ret += len; - if (ret > PAGE_SIZE) { - ret = PAGE_SIZE; - break; - } - } + list_for_each_entry(platform, &platform_list, list) + seq_printf(m, "%s\n", platform->component.name); mutex_unlock(&client_mutex); - ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); - - kfree(buf); + return 0; +} - return ret; +static int platform_list_seq_open(struct inode *inode, struct file *file) +{ + return single_open(file, platform_list_seq_show, NULL); } static const struct file_operations platform_list_fops = { - .read = platform_list_read_file, - .llseek = default_llseek,/* read accesses f_pos */ + .open = platform_list_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, }; static void soc_init_card_debugfs(struct snd_soc_card *card) @@ -491,7 +455,6 @@ static void soc_cleanup_card_debugfs(struct snd_soc_card *card) debugfs_remove_recursive(card->debugfs_card_root); } - static void snd_soc_debugfs_init(void) { snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL); -- 2.15.1

3 8

[alsa-devel] [PATCH] ASoC: samsung: Add the DT binding files entry to MAINTAINERS
by Sylwester Nawrocki 08 Feb '18

08 Feb '18

This patch adds missing DT binding files to the Samsung ASoC drivers entry. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5046003ea162..da2df3194d72 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11921,6 +11921,7 @@ M: Sylwester Nawrocki <s.nawrocki(a)samsung.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/samsung/ +F: Documentation/devicetree/bindings/sound/samsung* SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER M: Krzysztof Kozlowski <krzk(a)kernel.org> -- 2.14.2

3 2

[alsa-devel] [PATCH v8 0/7] TDA1997x HDMI video reciver
by Tim Harvey 08 Feb '18

08 Feb '18

This is a v4l2 subdev driver supporting the TDA1997x HDMI video receiver. I've tested this on a Gateworks GW54xx/GW551x with an IMX6Q/IMX6DL which uses the TDA19971 with 16bits connected to the IMX6 CSI and single-lane I2S audio providing 2-channel audio. For this configuration I've tested both 16bit YUV422 and 8bit BT656 parallel video bus modes. While the driver should support the TDA1993 I do not have one for testing. Further potential development efforts include: - CEC support - HDCP support - TDA19972 support (2 inputs) Media graphs can be found at http://dev.gateworks.com/docs/linux/media History: v8: - support full range of input modes based on timings_cap - add patch to fix clearing pad for VIDIOC_DV_TIMIGINGS - fix available formats for tda19971 bt656 bus width >12 - fix set_format (compliance) - fixed get/set edid (compliance) - add init_cfg to setup default pad config (compliance) - added missing pad checks to get_dv_timings_cap/enum_dv_timings (compliance) - fix alignment of if statement and whitespace in comment (Hans) - move regs to tda1997x_regs.h to clean up (Hans) - add define and sanity check for num of mbus_codes (Hans) v7: - fix interlaced mode - support no AVI infoframe (ie DVI) (Hans) - add support for multiple output formats (Hans) v6: - tda1997x: fix return on regulator enablei in tda1997x_set_power() (Fabio) - tda1997x: fix colorspace handling (Hans) - bindings: added Robs's ack (Rob) - replace copyright with SPDX tag (Philippe) v5: - added v4l2_hdmi_colorimetry() patch from Hans to series - bindings: added Sakari's ack - tda1997x: uppercase string constants - tda1997x: use v4l2_hdmi_rx_coloriemtry to fill format - tda1997x: fix V4L2_CID_DV_RX_RGB_RANGE - tda1997x: fix interlaced mode format - dts: remove leading 0 from unit address - dts: add newline between property list and child node - dts: added missing audmux in GW551x dts v4: - move include/dt-bindings/media/tda1997x.h to bindings patch - clarify port node details in bindings - fix typos - fix default quant range for VGA - fix quant range handling and conv matrix - add additional standards and capabilities to timings_cap v3: - fix typo in dt bindings - added dt bindings for GW551x - use V4L2_DV_BT_FRAME_WIDTH/HEIGHT macros - fixed missing break - use only hdmi_infoframe_log for infoframe logging - simplify tda1997x_s_stream error handling - add delayed work proc to handle hotplug enable/disable - fix set_edid (disable HPD before writing, enable after) - remove enabling edid by default - initialize timings - take quant range into account in colorspace conversion - remove vendor/product tracking (we provide this in log_status via infoframes) - add v4l_controls - add more detail to log_status - calculate vhref generator timings - timing detection fixes (rounding errors, hswidth errors) - rename configure_input/configure_conv functions v2: - encorporate feedback into dt bindings - change audio dt bindings - implement dv timings enum/cap - remove deprecated g_mbus_config op - fix dv_query_timings - add EDID get/set handling - remove max-pixel-rate support - add audio codec DAI support - added media-ctl and v4l2-compliance details v1: - initial RFC Media device topology: # media-ctl -d /dev/media0 -p Media controller API version 4.13.0 Media device information ------------------------ driver imx-media model imx-media serial bus info hw revision 0x0 driver version 4.13.0 Device topology - entity 1: adv7180 2-0020 (1 pad, 1 link) type V4L2 subdev subtype Unknown flags 20004 device node name /dev/v4l-subdev0 pad0: Source [fmt:UYVY8_2X8/720x480 field:interlaced colorspace:smpte170m] -> "ipu2_csi1_mux":1 [] - entity 3: tda19971 2-0048 (1 pad, 1 link) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev1 pad0: Source [fmt:UYVY8_1X16/640x480 field:none colorspace:srgb] [dv.caps:BT.656/1120 min:640x480@13000000 max:1920x1080@165000000 stds:CEA-861,DMT caps:progressive] [dv.detect:BT.656/1120 640x480p59 (800x525) stds:CEA-861,DMT flags:has-cea861-vic] [dv.current:BT.656/1120 1920x1080p60 (2200x1125) stds:CEA-861,DMT flags:can-reduce-fps,CE-video,has-cea861-vic] -> "ipu1_csi0_mux":1 [] - entity 5: ipu1_vdic (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev2 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_csi0":1 [] <- "ipu1_csi1":1 [] pad1: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] pad2: Source [fmt:AYUV8_1X32/640x480@1/60 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] - entity 9: ipu2_vdic (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev3 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_csi0":1 [] <- "ipu2_csi1":1 [] pad1: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] pad2: Source [fmt:AYUV8_1X32/640x480@1/60 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] - entity 13: ipu1_ic_prp (3 pads, 5 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev4 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_vdic":2 [] <- "ipu1_csi0":1 [] <- "ipu1_csi1":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpenc":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpvf":0 [] - entity 17: ipu1_ic_prpenc (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev5 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_ic_prp":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpenc capture":0 [] - entity 20: ipu1_ic_prpenc capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video0 pad0: Sink <- "ipu1_ic_prpenc":1 [] - entity 26: ipu1_ic_prpvf (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev6 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_ic_prp":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpvf capture":0 [] - entity 29: ipu1_ic_prpvf capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video1 pad0: Sink <- "ipu1_ic_prpvf":1 [] - entity 35: ipu2_ic_prp (3 pads, 5 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev7 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_vdic":2 [] <- "ipu2_csi0":1 [] <- "ipu2_csi1":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpenc":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpvf":0 [] - entity 39: ipu2_ic_prpenc (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev8 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_ic_prp":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpenc capture":0 [] - entity 42: ipu2_ic_prpenc capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video2 pad0: Sink <- "ipu2_ic_prpenc":1 [] - entity 48: ipu2_ic_prpvf (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev9 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_ic_prp":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpvf capture":0 [] - entity 51: ipu2_ic_prpvf capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video3 pad0: Sink <- "ipu2_ic_prpvf":1 [] - entity 57: ipu1_csi0 (3 pads, 4 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev10 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] <- "ipu1_csi0_mux":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] -> "ipu1_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_csi0 capture":0 [] - entity 61: ipu1_csi0 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video4 pad0: Sink <- "ipu1_csi0":2 [] - entity 67: ipu1_csi1 (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev11 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] -> "ipu1_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_csi1 capture":0 [] - entity 71: ipu1_csi1 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video5 pad0: Sink <- "ipu1_csi1":2 [] - entity 77: ipu2_csi0 (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev12 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] -> "ipu2_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_csi0 capture":0 [] - entity 81: ipu2_csi0 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video6 pad0: Sink <- "ipu2_csi0":2 [] - entity 87: ipu2_csi1 (3 pads, 4 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev13 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] <- "ipu2_csi1_mux":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] -> "ipu2_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_csi1 capture":0 [] - entity 91: ipu2_csi1 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video7 pad0: Sink <- "ipu2_csi1":2 [] - entity 97: ipu1_csi0_mux (3 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev14 pad0: Sink [fmt:unknown/0x0] pad1: Sink [fmt:unknown/0x0] <- "tda19971 2-0048":0 [] pad2: Source [fmt:unknown/0x0] -> "ipu1_csi0":0 [] - entity 101: ipu2_csi1_mux (3 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev15 pad0: Sink [fmt:unknown/0x0] pad1: Sink [fmt:unknown/0x0] <- "adv7180 2-0020":0 [] pad2: Source [fmt:unknown/0x0] -> "ipu2_csi1":0 [] v4l2-compliance test results: - with the following kernel patches: v4l2-subdev: clear reserved fields . v4l2-subdev: without controls return -ENOTTY v4l2-compliance SHA : b2f8f9049056eb6f9e028927dacb2c715a062df8 Media Driver Info: Driver name : imx-media Model : imx-media Serial : Bus info : Media version : 4.15.0 Hardware revision: 0x00000000 (0) Driver version : 4.15.0 Interface Info: ID : 0x0300008f Type : V4L Sub-Device Entity Info: ID : 0x00000003 (3) Name : tda19971 2-0048 Function : Unknown Pad 0x01000004 : Source Link 0x0200006f: to remote pad 0x1000063 of entity 'ipu1_csi0_mux': Data Compliance test for device /dev/v4l-subdev1: Allow for multiple opens: test second /dev/v4l-subdev1 open: OK test for unlimited opens: OK Debug ioctls: test VIDIOC_LOG_STATUS: OK Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK test VIDIOC_DV_TIMINGS_CAP: OK test VIDIOC_G/S_EDID: OK Sub-Device ioctls (Source Pad 0): test Try VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK test Try VIDIOC_SUBDEV_G/S_FMT: OK test Try VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported) test Active VIDIOC_SUBDEV_ENUM_MBUS_CODE/FRAME_SIZE/FRAME_INTERVAL: OK test Active VIDIOC_SUBDEV_G/S_FMT: OK test Active VIDIOC_SUBDEV_G/S_SELECTION/CROP: OK (Not Supported) test VIDIOC_SUBDEV_G/S_FRAME_INTERVAL: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK (Not Supported) test VIDIOC_QUERYCTRL: OK (Not Supported) test VIDIOC_G/S_CTRL: OK (Not Supported) test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported) test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK (Not Supported) test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK (Not Supported) test VIDIOC_TRY_FMT: OK (Not Supported) test VIDIOC_S_FMT: OK (Not Supported) test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK (Not Supported) Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK (Not Supported) test VIDIOC_EXPBUF: OK (Not Supported) Total: 46, Succeeded: 46, Failed: 0, Warnings: 0 Hans Verkuil (1): v4l2-dv-timings: add v4l2_hdmi_colorimetry() Tim Harvey (6): media: v4l-ioctl: fix clearing pad for VIDIOC_DV_TIMIGNS_CAP MAINTAINERS: add entry for NXP TDA1997x driver media: dt-bindings: Add bindings for TDA1997X media: i2c: Add TDA1997x HDMI receiver driver ARM: dts: imx: Add TDA19971 HDMI Receiver to GW54xx ARM: dts: imx: Add TDA19971 HDMI Receiver to GW551x .../devicetree/bindings/media/i2c/tda1997x.txt | 179 ++ MAINTAINERS | 8 + arch/arm/boot/dts/imx6q-gw54xx.dts | 105 + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 29 +- arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 138 + drivers/media/i2c/Kconfig | 9 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/tda1997x.c | 2845 ++++++++++++++++++++ drivers/media/i2c/tda1997x_regs.h | 641 +++++ drivers/media/v4l2-core/v4l2-dv-timings.c | 141 + drivers/media/v4l2-core/v4l2-ioctl.c | 2 +- include/dt-bindings/media/tda1997x.h | 74 + include/media/i2c/tda1997x.h | 42 + include/media/v4l2-dv-timings.h | 21 + 14 files changed, 4231 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/i2c/tda1997x.txt create mode 100644 drivers/media/i2c/tda1997x.c create mode 100644 drivers/media/i2c/tda1997x_regs.h create mode 100644 include/dt-bindings/media/tda1997x.h create mode 100644 include/media/i2c/tda1997x.h -- 2.7.4

4 21

[alsa-devel] [PATCH - JACK PCM plugin] jack: Write only valid values to the internal hw_ptr
by twischer＠de.adit-jv.com 08 Feb '18

08 Feb '18

From: Timo Wischer <twischer(a)de.adit-jv.com> Otherwise the ALSA thread could for example read a hw_ptr > buffer_size Signed-off-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c index 4468ede..3aed332 100644 --- a/jack/pcm_jack.c +++ b/jack/pcm_jack.c @@ -137,6 +137,7 @@ static int snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io) { snd_pcm_jack_t *jack = io->private_data; + snd_pcm_uframes_t hw_ptr; const snd_pcm_channel_area_t *areas; snd_pcm_uframes_t xfer = 0; unsigned int channel; @@ -155,12 +156,13 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io) return 0; } } - + + hw_ptr = jack->hw_ptr; areas = snd_pcm_ioplug_mmap_areas(io); while (xfer < nframes) { snd_pcm_uframes_t frames = nframes - xfer; - snd_pcm_uframes_t offset = jack->hw_ptr; + snd_pcm_uframes_t offset = hw_ptr; snd_pcm_uframes_t cont = io->buffer_size - offset; if (cont < frames) @@ -173,10 +175,11 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io) snd_pcm_area_copy(&areas[channel], offset, &jack->areas[channel], xfer, frames, io->format); } - jack->hw_ptr += frames; - jack->hw_ptr %= io->buffer_size; + hw_ptr += frames; + hw_ptr %= io->buffer_size; xfer += frames; } + jack->hw_ptr = hw_ptr; pcm_poll_unblock_check(io); /* unblock socket for polling if needed */ -- 2.7.4

3 2

[alsa-devel] [GIT PULL] Extra ASoC updates for v4.16
by Mark Brown 07 Feb '18

07 Feb '18

This pull request is for things that arrived in the last week of the v4.15 cycle, I'm sending it directly since Takashi still seems to be on holiday (I'd thought he'd be back this week). There's some random new development in here and also a bunch of bugfixes. The I/O fix mentioned in the tag below is pretty important and would be especially good to have fixed in -rc1, it was reported right at the end of the v4.15 cycle so didn't make Takashi's early pull request and causes a power regression on some of the OMAP platforms. If this request is a problem I can do a smaller one with just that in it. Unfortunately I can't figure out how to generate a sensible git pull request for this since it ended up containing both v4.15-rc9 and my prior pull requests. When I use your tree as the reference git pull goes with your -rc9 tag so the diffstat contains way more stuff than you'll actually get but that seems to be the best alternative. The following changes since commit 0c5b9b5d9adbad4b60491f9ba0d2af38904bb4b9: Linux 4.15-rc9 (2018-01-21 13:51:26 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.16-4 for you to fetch changes up to e0a663f24d532c7ad9ff34cc1aa96bf94c75ef44: Merge remote-tracking branch 'asoc/topic/wm8998' into asoc-next (2018-01-26 15:27:56 +0000) ---------------------------------------------------------------- ASoC: Updates for v4.16 With the merge window having been delayed for another week here's another batch of updates that came in during that week. There's a few important fixes in here, mainly a fix for I/O on a number of devices caused by some of the component rework and a fix for a potential issue if more than one component in a link provides compressed operations. ---------------------------------------------------------------- Charles Keepax (3): ASoC: compress: Correct handling of copy callback ASoC: compress: Remove some extraneous blank lines ASoC: compress: Fixup error messages Fabio Estevam (1): ASoC: sgtl5000: Clarify a bit about the ER1 meaning Harsha Priya (1): ASoC: Intel: kbl: Enable mclk and ssp sclk early Jeffy Chen (1): ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink Kuninori Morimoto (4): ASoC: soc-core: snd_soc_rtdcom_lookup() cares component driver name ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free() ASoC: ak4613: call dummy write for PW_MGMT1/3 when Playback ASoC: soc-pcm: rename .pmdown_time to .use_pmdown_time for Component Ladislav Michl (2): ASoC: sam9g20_wm8731: use dev_*() logging functions ASoC: sam9x5_wm8731: Drop 'ASoC' prefix from error messages Mark Brown (35): Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/.../broonie/sound into asoc-twl-breakage Merge branch 'fix/compress' of https://git.kernel.org/.../broonie/sound into asoc-compress Merge remote-tracking branch 'asoc/fix/core' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus Merge remote-tracking branches 'asoc/fix/compress' and 'asoc/fix/mtk' into asoc-linus Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/intel' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm186x' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next Merge remote-tracking branch 'asoc/topic/twl-breakage' into asoc-next Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ak4613', 'asoc/topic/amd', 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next Merge remote-tracking branches 'asoc/topic/bcm2835', 'asoc/topic/codecs', 'asoc/topic/compress' and 'asoc/topic/cq93vc' into asoc-next Merge remote-tracking branches 'asoc/topic/cs35l32', 'asoc/topic/cs35l34', 'asoc/topic/cs42l52', 'asoc/topic/cs42l56' and 'asoc/topic/cs42l73' into asoc-next Merge remote-tracking branches 'asoc/topic/cs47l24', 'asoc/topic/cx20442', 'asoc/topic/da7213', 'asoc/topic/da7218' and 'asoc/topic/dai-drv' into asoc-next Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs', 'asoc/topic/disconnect', 'asoc/topic/dmic' and 'asoc/topic/ep93xx' into asoc-next Merge remote-tracking branches 'asoc/topic/eukrea-tlv320', 'asoc/topic/fsl', 'asoc/topic/fsl-ssi' and 'asoc/topic/fsl_asrc' into asoc-next Merge remote-tracking branches 'asoc/topic/hdac_hdmi', 'asoc/topic/hisilicon', 'asoc/topic/iio' and 'asoc/topic/max98373' into asoc-next Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/max98927', 'asoc/topic/mc13783', 'asoc/topic/msm8916' and 'asoc/topic/mt8173' into asoc-next Merge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/mxs', 'asoc/topic/mxs-sgtl5000', 'asoc/topic/nau8540' and 'asoc/topic/nau8824' into asoc-next Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/nuc900' into asoc-next Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5514' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/sam9g20_wm8731', 'asoc/topic/sam9x5_wm8731', 'asoc/topic/samsung' and 'asoc/topic/sgtl5000' into asoc-next Merge remote-tracking branches 'asoc/topic/si476x', 'asoc/topic/simple', 'asoc/topic/spdif', 'asoc/topic/st-dfsdm' and 'asoc/topic/stm32' into asoc-next Merge remote-tracking branches 'asoc/topic/sun4i-i2s', 'asoc/topic/sun8i-codec', 'asoc/topic/sunxi', 'asoc/topic/symmetry' and 'asoc/topic/tas5720' into asoc-next Merge remote-tracking branches 'asoc/topic/tas6424', 'asoc/topic/tfa9879', 'asoc/topic/tlv320aic31xx', 'asoc/topic/tlv320aic32x4' and 'asoc/topic/tlv320aic3x' into asoc-next Merge remote-tracking branches 'asoc/topic/tlv320dac33', 'asoc/topic/ts3a227e' and 'asoc/topic/tscs42xx' into asoc-next Merge remote-tracking branches 'asoc/topic/uda1380', 'asoc/topic/uniphier' and 'asoc/topic/utils' into asoc-next Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm0010', 'asoc/topic/wm2000', 'asoc/topic/wm5102' and 'asoc/topic/wm5110' into asoc-next Merge remote-tracking branches 'asoc/topic/wm8350', 'asoc/topic/wm8400', 'asoc/topic/wm8903', 'asoc/topic/wm8994' and 'asoc/topic/wm8997' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8998' into asoc-next Matthias Kaehlcke (1): ASoC: dmic: Fix check of return value from read of 'num-channels' Mylene JOSSERAND (1): ASoC: sun8i-codec: Add ADC support for a33 Ryan Lee (1): ASoC: max98373 Changed SPDX header in C++ comments style Ryder Lee (1): ASoC: mediatek: fix double free in mt2701_afe_pcm_dev_probe() Sriram Periyasamy (2): ASoC: Intel: Skylake: Add ssp clock driver ASoC: Intel: Skylake: Add extended I2S config blob support in Clock driver Tony Lindgren (1): ASoC: Fix twl4030 and 6040 regression by adding back read and write .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 16 + .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 128 + Documentation/devicetree/bindings/sound/dmic.txt | 2 + .../devicetree/bindings/sound/max98373.txt | 40 + .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 266 +- .../bindings/sound/mxs-audio-sgtl5000.txt | 33 +- .../devicetree/bindings/sound/nau8825.txt | 4 +- .../devicetree/bindings/sound/pcm186x.txt | 42 + .../devicetree/bindings/sound/renesas,rsnd.txt | 15 +- .../devicetree/bindings/sound/simple-card.txt | 3 + .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 + .../devicetree/bindings/sound/st,stm32-sai.txt | 12 +- .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + .../devicetree/bindings/sound/tas5720.txt | 4 +- .../devicetree/bindings/sound/tfa9879.txt | 8 +- .../devicetree/bindings/sound/ti,tas6424.txt | 20 + .../devicetree/bindings/sound/tlv320aic31xx.txt | 9 +- .../devicetree/bindings/sound/tlv320aic3x.txt | 10 +- .../devicetree/bindings/sound/tscs42xx.txt | 16 + .../devicetree/bindings/sound/uniphier,evea.txt | 26 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/driver-api/iio/hw-consumer.rst | 51 + Documentation/driver-api/iio/index.rst | 1 + MAINTAINERS | 14 + drivers/acpi/utils.c | 41 +- drivers/gpio/gpio-merrifield.c | 11 +- drivers/iio/adc/Kconfig | 37 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/sd_adc_modulator.c | 68 + drivers/iio/adc/stm32-dfsdm-adc.c | 1205 +++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 302 +++ drivers/iio/adc/stm32-dfsdm.h | 310 +++ drivers/iio/buffer/Kconfig | 10 + drivers/iio/buffer/Makefile | 1 + drivers/iio/buffer/industrialio-buffer-cb.c | 11 + drivers/iio/buffer/industrialio-hw-consumer.c | 247 ++ drivers/iio/inkern.c | 17 +- include/acpi/acpi_bus.h | 3 + include/linux/acpi.h | 6 + include/linux/iio/adc/stm32-dfsdm-adc.h | 18 + include/linux/iio/consumer.h | 37 + include/linux/iio/hw-consumer.h | 21 + include/linux/iio/iio.h | 28 - include/linux/iio/types.h | 28 + include/sound/hdaudio_ext.h | 4 +- include/sound/pcm.h | 8 + include/sound/rt5514.h | 2 + include/sound/rt5645.h | 3 + include/sound/soc-acpi-intel-match.h | 1 + include/sound/soc-acpi.h | 14 +- include/sound/soc-dai.h | 5 +- include/sound/soc.h | 11 +- include/uapi/sound/asound.h | 9 + include/uapi/sound/snd_sst_tokens.h | 17 +- sound/core/pcm_misc.c | 19 +- sound/hda/ext/hdac_ext_bus.c | 2 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/amd/acp-pcm-dma.c | 35 +- sound/soc/atmel/atmel-classd.c | 6 - sound/soc/atmel/sam9g20_wm8731.c | 17 +- sound/soc/atmel/sam9x5_wm8731.c | 12 +- sound/soc/au1x/ac97c.c | 6 +- sound/soc/bcm/bcm2835-i2s.c | 20 +- sound/soc/cirrus/ep93xx-ac97.c | 6 +- sound/soc/codecs/88pm860x-codec.c | 9 +- sound/soc/codecs/Kconfig | 46 +- sound/soc/codecs/Makefile | 13 +- sound/soc/codecs/ak4613.c | 78 + sound/soc/codecs/cq93vc.c | 10 +- sound/soc/codecs/cs35l32.c | 18 +- sound/soc/codecs/cs35l34.c | 19 +- sound/soc/codecs/cs42l52.c | 13 +- sound/soc/codecs/cs42l56.c | 13 +- sound/soc/codecs/cs42l73.c | 15 +- sound/soc/codecs/cs47l24.c | 12 +- sound/soc/codecs/cx20442.c | 46 +- sound/soc/codecs/da7213.c | 7 +- sound/soc/codecs/da7218.c | 9 +- sound/soc/codecs/dmic.c | 24 +- sound/soc/codecs/hdac_hdmi.c | 358 ++- sound/soc/codecs/max98373.c | 976 +++++++ sound/soc/codecs/max98373.h | 213 ++ sound/soc/codecs/max98926.c | 2 +- sound/soc/codecs/max98927.c | 1 - sound/soc/codecs/mc13783.c | 9 +- sound/soc/codecs/msm8916-wcd-analog.c | 8 +- sound/soc/codecs/nau8540.c | 98 +- sound/soc/codecs/nau8540.h | 20 + sound/soc/codecs/nau8824.c | 18 +- sound/soc/codecs/nau8825.c | 101 +- sound/soc/codecs/nau8825.h | 3 +- sound/soc/codecs/pcm186x-i2c.c | 69 + sound/soc/codecs/pcm186x-spi.c | 69 + sound/soc/codecs/pcm186x.c | 719 ++++++ sound/soc/codecs/pcm186x.h | 220 ++ sound/soc/codecs/pcm512x-spi.c | 4 + sound/soc/codecs/rl6231.c | 93 +- sound/soc/codecs/rt5514-spi.c | 1 + sound/soc/codecs/rt5514.c | 85 + sound/soc/codecs/rt5514.h | 5 +- sound/soc/codecs/rt5645.c | 187 +- sound/soc/codecs/rt5645.h | 6 + sound/soc/codecs/sgtl5000.c | 7 +- sound/soc/codecs/si476x.c | 9 +- sound/soc/codecs/sn95031.c | 936 ------- sound/soc/codecs/sn95031.h | 133 - sound/soc/codecs/spdif_receiver.c | 5 +- sound/soc/codecs/spdif_transmitter.c | 5 +- sound/soc/codecs/tas5720.c | 61 +- sound/soc/codecs/tas5720.h | 31 + sound/soc/codecs/tas6424.c | 707 +++++ sound/soc/codecs/tas6424.h | 144 ++ sound/soc/codecs/tfa9879.c | 1 + sound/soc/codecs/tlv320aic31xx.c | 310 +-- sound/soc/codecs/tlv320aic31xx.h | 335 +-- sound/soc/codecs/tlv320aic32x4.c | 182 +- sound/soc/codecs/tlv320aic32x4.h | 308 ++- sound/soc/codecs/tlv320aic3x.c | 15 +- sound/soc/codecs/tlv320dac33.c | 32 +- sound/soc/codecs/ts3a227e.c | 2 +- sound/soc/codecs/tscs42xx.c | 1456 +++++++++++ sound/soc/codecs/tscs42xx.h | 2693 ++++++++++++++++++++ sound/soc/codecs/twl4030.c | 9 +- sound/soc/codecs/twl6040.c | 18 +- sound/soc/codecs/uda1380.c | 42 +- sound/soc/codecs/wm0010.c | 5 +- sound/soc/codecs/wm2000.c | 6 +- sound/soc/codecs/wm2200.c | 9 +- sound/soc/codecs/wm5102.c | 11 +- sound/soc/codecs/wm5110.c | 12 +- sound/soc/codecs/wm8350.c | 10 +- sound/soc/codecs/wm8400.c | 9 +- sound/soc/codecs/wm8903.c | 12 +- sound/soc/codecs/wm8994.c | 10 +- sound/soc/codecs/wm8997.c | 11 +- sound/soc/codecs/wm8998.c | 12 +- sound/soc/davinci/davinci-mcasp.c | 19 + sound/soc/fsl/eukrea-tlv320.c | 1 - sound/soc/fsl/fsl-asoc-card.c | 4 +- sound/soc/fsl/fsl_asrc.h | 2 +- sound/soc/fsl/fsl_dma.c | 4 +- sound/soc/fsl/fsl_ssi.c | 1367 +++++----- sound/soc/fsl/fsl_ssi.h | 427 ++-- sound/soc/fsl/fsl_ssi_dbg.c | 59 +- sound/soc/hisilicon/hi6210-i2s.c | 1 - sound/soc/intel/Kconfig | 118 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 3 + sound/soc/intel/atom/sst/sst_stream.c | 8 +- sound/soc/intel/boards/Kconfig | 196 +- sound/soc/intel/boards/bytcht_da7213.c | 4 +- sound/soc/intel/boards/bytcht_es8316.c | 26 +- sound/soc/intel/boards/bytcr_rt5640.c | 4 +- sound/soc/intel/boards/bytcr_rt5651.c | 50 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 13 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 4 +- sound/soc/intel/boards/haswell.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 97 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- sound/soc/intel/boards/mfld_machine.c | 428 ---- sound/soc/intel/common/sst-dsp.c | 4 +- sound/soc/intel/skylake/Makefile | 5 + sound/soc/intel/skylake/bxt-sst.c | 2 +- sound/soc/intel/skylake/cnl-sst.c | 2 +- sound/soc/intel/skylake/skl-i2s.h | 95 + sound/soc/intel/skylake/skl-messages.c | 23 + sound/soc/intel/skylake/skl-nhlt.c | 175 +- sound/soc/intel/skylake/skl-pcm.c | 14 +- sound/soc/intel/skylake/skl-ssp-clk.c | 429 ++++ sound/soc/intel/skylake/skl-ssp-clk.h | 117 + sound/soc/intel/skylake/skl-sst-dsp.c | 14 +- sound/soc/intel/skylake/skl-sst-dsp.h | 4 + sound/soc/intel/skylake/skl-sst-utils.c | 6 +- sound/soc/intel/skylake/skl-sst.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 45 +- sound/soc/intel/skylake/skl.c | 150 +- sound/soc/intel/skylake/skl.h | 28 + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 552 ++-- sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 15 +- sound/soc/mediatek/mt2701/mt2701-afe-common.h | 87 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 215 +- sound/soc/mediatek/mt2701/mt2701-reg.h | 42 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 - sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 - sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 - sound/soc/mxs/mxs-sgtl5000.c | 25 +- sound/soc/nuc900/nuc900-ac97.c | 11 +- sound/soc/omap/ams-delta.c | 4 +- sound/soc/qcom/apq8016_sbc.c | 10 +- sound/soc/rockchip/rk3399_gru_sound.c | 22 +- sound/soc/rockchip/rockchip_i2s.c | 11 +- sound/soc/samsung/bells.c | 40 +- sound/soc/sh/rcar/core.c | 143 +- sound/soc/sh/rcar/dma.c | 18 - sound/soc/sh/rcar/rsnd.h | 15 +- sound/soc/sh/rcar/ssi.c | 163 +- sound/soc/soc-acpi.c | 73 +- sound/soc/soc-compress.c | 81 +- sound/soc/soc-core.c | 155 +- sound/soc/soc-io.c | 6 + sound/soc/soc-ops.c | 4 +- sound/soc/soc-pcm.c | 7 +- sound/soc/soc-utils.c | 2 +- sound/soc/stm/Kconfig | 12 + sound/soc/stm/Makefile | 3 + sound/soc/stm/stm32_adfsdm.c | 347 +++ sound/soc/stm/stm32_sai.c | 114 +- sound/soc/sunxi/sun4i-codec.c | 29 +- sound/soc/sunxi/sun4i-i2s.c | 57 +- sound/soc/sunxi/sun8i-codec.c | 82 +- sound/soc/uniphier/Kconfig | 19 + sound/soc/uniphier/Makefile | 3 + sound/soc/uniphier/evea.c | 567 +++++ sound/soc/ux500/mop500.c | 4 + sound/soc/ux500/ux500_pcm.c | 5 + 218 files changed, 16235 insertions(+), 5223 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/max98373.txt create mode 100644 Documentation/devicetree/bindings/sound/pcm186x.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,tas6424.txt create mode 100644 Documentation/devicetree/bindings/sound/tscs42xx.txt create mode 100644 Documentation/devicetree/bindings/sound/uniphier,evea.txt create mode 100644 Documentation/driver-api/iio/hw-consumer.rst create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/buffer/industrialio-hw-consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h create mode 100644 include/linux/iio/hw-consumer.h create mode 100644 sound/soc/codecs/max98373.c create mode 100644 sound/soc/codecs/max98373.h create mode 100644 sound/soc/codecs/pcm186x-i2c.c create mode 100644 sound/soc/codecs/pcm186x-spi.c create mode 100644 sound/soc/codecs/pcm186x.c create mode 100644 sound/soc/codecs/pcm186x.h delete mode 100644 sound/soc/codecs/sn95031.c delete mode 100644 sound/soc/codecs/sn95031.h create mode 100644 sound/soc/codecs/tas6424.c create mode 100644 sound/soc/codecs/tas6424.h create mode 100644 sound/soc/codecs/tscs42xx.c create mode 100644 sound/soc/codecs/tscs42xx.h delete mode 100644 sound/soc/intel/boards/mfld_machine.c create mode 100644 sound/soc/intel/skylake/skl-i2s.h create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h create mode 100644 sound/soc/stm/stm32_adfsdm.c create mode 100644 sound/soc/uniphier/Kconfig create mode 100644 sound/soc/uniphier/Makefile create mode 100644 sound/soc/uniphier/evea.c

3 6

[alsa-devel] [RESEND PATCH v2 00/15] ASoC: qcom: Add support to QDSP6 based audio
by srinivas.kandagatla＠linaro.org 07 Feb '18

07 Feb '18

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patchset aims to provide a very basic version of QCOM DSP based audio support which is available in downstream andriod kernels. This patchset only support Digital audio based for HDMI-RX and will add support to other features as we move on. QDSP has both static and dynamic modules. static modules like AFE (Audio FrontEnd), ADM (Audio Device Manager), ASM(Audio Stream Manager) and CORE to provide this audio services. All these services use APR (Asynchronous Packet Router) protocol via smd/glink transport to communicate with Application processor. More details on each module is availble in there respective patch. This patchset is tested on DB820c, with HDMI audio playback on top of mainline, also tested slimbus analog audio using wcd9355 with an additional small patch. Here is block diagram to give a quick overview of the components +---------+ +---------+ +---------+ | q6asm | |q6routing| | q6afe | | fedai | <------> | mixers | <-----> | bedai | +---------+ +---------+ +---------+ ^ ^ ^ | | | | +------------------+----------------+ | | | | | | v v v v v +---------+ +---------+ +---------+ | q6ASM | | q6ADM | | q6AFE | +---------+ +---------+ +---------+ ^ ^ ^ ^ | | | CPU Side | ------+---------------------+-------------------+-------- | | | | |APR(smd/glink) | | | | | +------------------+----------------+ | | | | | | +-----+--+-----------------------------------+--+------- | | | | | QDSP Side | v v v v v v +---------+ +---------+ +---------+ | ASM | <------> | ADM | <-----> | AFE | +---------+ +---------+ +---------+ ^ | +-------------------+ | ---------------------------+-------------------------- | Audio I/O | v v +--------------------------------------------------+ | Audio devices | | CODEC | HDMI-TX | PCM | SLIMBUS | I2S |MI2S |...| | | +--------------------------------------------------+ Changes since RFC: - Converted APR driver to proper bus driver - Added API version info to apr devices - Added q6core driver. - Fixed various issues spotted by Banajit and Kasam. - Added kernel doc to exported symbols. - renamed qdsp6v2 to qdsp6 as api version info can be used from apr device. - removed unnecessary dt bindings for apr devices. Srinivas Kandagatla (15): dt-bindings: soc: qcom: Add bindings for APR bus soc: qcom: add support to APR bus driver ASoC: qcom: qdsp6: Add common qdsp6 helper functions ASoC: qcom: qdsp6: Add support to Q6AFE ASoC: qcom: qdsp6: Add support to Q6ADM ASoC: qcom: qdsp6: Add support to Q6ASM ASoC: qcom: q6asm: Add support to memory map and unmap ASoC: qcom: q6asm: add support to audio stream apis ASoC: qcom: qdsp6: Add support to Q6CORE ASoC: qcom: qdsp6: Add support to q6routing driver ASoC: qcom: qdsp6: Add support to q6afe dai driver ASoC: qcom: qdsp6: Add support to q6asm dai driver dt-bindings: sound: qcom: Add devicetree bindings for apq8096 ASoC: qcom: apq8096: Add db820c machine driver arm64: dts: msm8996: db820c: Add sound card support .../devicetree/bindings/soc/qcom/qcom,apr.txt | 28 + .../devicetree/bindings/sound/qcom,apq8096.txt | 22 + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 5 + arch/arm64/boot/dts/qcom/msm8996.dtsi | 33 + drivers/soc/qcom/Kconfig | 8 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/apr.c | 395 +++++++ include/linux/mod_devicetable.h | 13 + include/linux/soc/qcom/apr.h | 174 +++ sound/soc/qcom/Kconfig | 51 + sound/soc/qcom/Makefile | 5 + sound/soc/qcom/apq8096.c | 124 +++ sound/soc/qcom/qdsp6/Makefile | 7 + sound/soc/qcom/qdsp6/common.h | 225 ++++ sound/soc/qcom/qdsp6/q6adm.c | 602 +++++++++++ sound/soc/qcom/qdsp6/q6adm.h | 24 + sound/soc/qcom/qdsp6/q6afe-dai.c | 241 +++++ sound/soc/qcom/qdsp6/q6afe.c | 503 +++++++++ sound/soc/qcom/qdsp6/q6afe.h | 30 + sound/soc/qcom/qdsp6/q6asm-dai.c | 534 ++++++++++ sound/soc/qcom/qdsp6/q6asm.c | 1119 ++++++++++++++++++++ sound/soc/qcom/qdsp6/q6asm.h | 61 ++ sound/soc/qcom/qdsp6/q6core.c | 227 ++++ sound/soc/qcom/qdsp6/q6routing.c | 386 +++++++ sound/soc/qcom/qdsp6/q6routing.h | 9 + 25 files changed, 4827 insertions(+) create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8096.txt create mode 100644 drivers/soc/qcom/apr.c create mode 100644 include/linux/soc/qcom/apr.h create mode 100644 sound/soc/qcom/apq8096.c create mode 100644 sound/soc/qcom/qdsp6/Makefile create mode 100644 sound/soc/qcom/qdsp6/common.h create mode 100644 sound/soc/qcom/qdsp6/q6adm.c create mode 100644 sound/soc/qcom/qdsp6/q6adm.h create mode 100644 sound/soc/qcom/qdsp6/q6afe-dai.c create mode 100644 sound/soc/qcom/qdsp6/q6afe.c create mode 100644 sound/soc/qcom/qdsp6/q6afe.h create mode 100644 sound/soc/qcom/qdsp6/q6asm-dai.c create mode 100644 sound/soc/qcom/qdsp6/q6asm.c create mode 100644 sound/soc/qcom/qdsp6/q6asm.h create mode 100644 sound/soc/qcom/qdsp6/q6core.c create mode 100644 sound/soc/qcom/qdsp6/q6routing.c create mode 100644 sound/soc/qcom/qdsp6/q6routing.h -- 2.15.0

7 65

Re: [alsa-devel] [PATCH 00/20] Remove references to undefined symbols and fix two potential bugs
by Robert Jarzmik 07 Feb '18

07 Feb '18

Ulf Magnusson <ulfalizer(a)gmail.com> writes: > The symbol AC97_BUS_NEW in sound/ac97/Kconfig selects the globally > undefined symbol AC97. > > It doesn't seem to simply be a misspelling of AC97_BUS, because then > the dependencies of AC97_BUS_COMPAT would be impossible to satisfy. You're correct. I don't know what happened to me when coding this, but you can safely remove this useless select statement. Cheers. -- Robert

1 0

[alsa-devel] [RESEND PATCH v2 0/9] add UniPhier audio system support
by Katsuhiro Suzuki 07 Feb '18

07 Feb '18

Hello Mark, This is the resend of patchset passed 3 weeks. https://lkml.org/lkml/2018/1/19/122 This series adds support for Socionext audio system for UniPhier LD11/LD20 SoCs. This driver supports I2S output for Line-In, Line-Out and S/PDIF output. UniPhier AIO DAI driver provides sound devices such as I2S, S/PDIF. Since the AIO has mixed register map for those I/Os, it is hard to split register areas for each sound devices. --- Changes in v2: - Add comments to aiodma_irq() - Add members to struct uniphier_aio_sub and add methods for compress audio - Expose clocking to userspace - Fix bad name 'srcport' to 'src' - Split DMA, DAI patches from large one - Validate parameters in hw_params() - Add error checks - Fix typo in error messages - Change license comment style to C++ from C Katsuhiro Suzuki (9): ASoC: uniphier: add DT bindings documentation for UniPhier AIO ASoC: uniphier: add support for UniPhier AIO common driver ASoC: uniphier: add support for UniPhier AIO DMA driver ASoC: uniphier: add support for UniPhier AIO CPU DAI driver ASoC: uniphier: add support for UniPhier AIO compress audio ASoC: uniphier: add support for UniPhier LD11/LD20 AIO driver arm64: dts: uniphier: add sound node for UniPhier arm64: dts: uniphier: add speaker out for UniPhier LD11/LD20 boards arm64: dts: uniphier: add compress audio out for UniPhier LD11/LD20 .../devicetree/bindings/sound/uniphier,aio.txt | 36 + .../boot/dts/socionext/uniphier-ld11-global.dts | 120 +++ arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 31 + .../boot/dts/socionext/uniphier-ld20-global.dts | 120 +++ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 35 + sound/soc/uniphier/Kconfig | 22 + sound/soc/uniphier/Makefile | 6 + sound/soc/uniphier/aio-compress.c | 440 ++++++++ sound/soc/uniphier/aio-core.c | 1104 ++++++++++++++++++++ sound/soc/uniphier/aio-cpu.c | 570 ++++++++++ sound/soc/uniphier/aio-dma.c | 318 ++++++ sound/soc/uniphier/aio-ld11.c | 431 ++++++++ sound/soc/uniphier/aio-reg.h | 462 ++++++++ sound/soc/uniphier/aio.h | 355 +++++++ 14 files changed, 4050 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/uniphier,aio.txt create mode 100644 sound/soc/uniphier/aio-compress.c create mode 100644 sound/soc/uniphier/aio-core.c create mode 100644 sound/soc/uniphier/aio-cpu.c create mode 100644 sound/soc/uniphier/aio-dma.c create mode 100644 sound/soc/uniphier/aio-ld11.c create mode 100644 sound/soc/uniphier/aio-reg.h create mode 100644 sound/soc/uniphier/aio.h -- 2.15.0

1 9

Re: [alsa-devel] [PATCH] ALSA: usb-audio: Fix UAC2 get_ctl request with a RANGE attribute
by Takashi Iwai 07 Feb '18

07 Feb '18

On Mon, 29 Jan 2018 06:37:55 +0100, Kirill Marinushkin wrote: > > The layout of the UAC2 Control request and response varies depending on > the request type. With the current implementation, only the Layout 2 > Parameter Block (with the 2-byte sized RANGE attribute) is handled > properly. For the Control requests with the 1-byte sized RANGE attribute > (Bass Control, Mid Control, Tremble Control), the response is parsed > incorrectly. > > This commit: > * fixes the wLength field value in the request > * fixes parsing the range values from the response > > Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0") > Signed-off-by: Kirill Marinushkin <k.marinushkin(a)gmail.com> > Cc: Jaroslav Kysela <perex(a)perex.cz> > Cc: Takashi Iwai <tiwai(a)suse.com> > Cc: Jaejoong Kim <climbbb.kim(a)gmail.com> > Cc: Bhumika Goyal <bhumirks(a)gmail.com> > Cc: Stephen Barber <smbarber(a)chromium.org> > Cc: Julian Scheel <julian(a)jusst.de> > Cc: alsa-devel(a)alsa-project.org > Cc: linux-kernel(a)vger.kernel.org Sorry for the late reply, as I've been (and still) off. Does this bug actually hit on any real devices, or is it only a logical error so far? In the former case, a Cc to stable is mandatory. In anyway, I'll review and merge it properly once after I back to work. thanks, Takashi

1 0

[alsa-devel] Add Thinkpad dock support for ALC298
by Kailang 07 Feb '18

07 Feb '18

Hi Takashi, ThinkPad for ALC298 platform need to support dock device. This patch will enable it. But It need to use SSID for the quirk table. Because IdeaPad also has ALC298 platform. Use verb for the quirk table will confuse it. BR, Kailang

2 1

[alsa-devel] Add headset support for Dell laptop
by Kailang 07 Feb '18

07 Feb '18

Hi Takashi, Attach patch was for support headset mode for Dell laptop. This platform had two Dmic and single Dmic. This update was for single Dmic. This commit was for two Dmic. commit 75ee94b20b46459e3d29f5ac2c3af3cebdeef777 Many thanks. BR, Kailang

2 1

[alsa-devel] [PATCH] ALSA: hda - Fix headset mic detection problem for two Dell machines
by Hui Wang 07 Feb '18

07 Feb '18

One of them has the codec of alc256 and the other one has the codec of alc289. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 2347588..b791efe 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6735,6 +6735,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x14, 0x90170110}, {0x21, 0x02211020}), SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, + {0x12, 0x90a60130}, + {0x14, 0x90170110}, + {0x14, 0x01011020}, + {0x21, 0x0221101f}), + SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, ALC256_STANDARD_PINS), SND_HDA_PIN_QUIRK(0x10ec0256, 0x1043, "ASUS", ALC256_FIXUP_ASUS_MIC, {0x14, 0x90170110}, @@ -6803,6 +6808,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x12, 0x90a60120}, {0x14, 0x90170110}, {0x21, 0x0321101f}), + SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, + {0x12, 0xb7a60130}, + {0x14, 0x90170110}, + {0x21, 0x04211020}), SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1, ALC290_STANDARD_PINS, {0x15, 0x04211040}, -- 2.7.4

2 1

Re: [alsa-devel] [PATCH] alsaloop: fix a typo in the comparison
by Takashi Iwai 07 Feb '18

07 Feb '18

On Mon, 05 Feb 2018 07:47:11 +0100, Kirill Marinushkin wrote: > > Hello maintainers, > > I would like to suggest you a patch which fixes a typo in the alsa-utils > alsaloop. > > Best Regards, > Kirill Marinushkin > > Signed-off-by: Kirill Marinushkin <k.marinushkin(a)gmail.com> > Cc: patch(a)alsa-project.org > Cc: alsa-devel(a)alsa-project.org Sorry for the late reply, as I've been (and still) on vacation. About your patch: The fix itself looks OK, but could you give more explanation about the change? E.g. what does this fix? thanks, Takashi > --- > alsaloop/pcmjob.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c > index 69abf94..7de757b 100644 > --- a/alsaloop/pcmjob.c > +++ b/alsaloop/pcmjob.c > @@ -1479,7 +1479,7 @@ __again: > if (loop->play->access == loop->capt->access && > loop->play->format == loop->capt->format && > loop->play->rate == loop->capt->rate && > - loop->play->channels == loop->play->channels && > + loop->play->channels == loop->capt->channels && > loop->sync != SYNC_TYPE_SAMPLERATE) { > if (verbose > 1) > snd_output_printf(loop->output, "shared buffer!!!\n"); > -- > 2.13.6 >

1 0

[alsa-devel] [alsa-utils] [PATCH] Add support for no-rewind flag in aplay utility
by Sriram Periyasamy 07 Feb '18

07 Feb '18

From: Ramesh Babu <ramesh.babu(a)intel.com> The "no-rewind" flag is introduced in alsa. Application can use this flag to assure kernel driver that rewind won't be exercised. Driver could use this flag to alter it's buffering scheme to optimize power and performance. Signed-off-by: Ramesh Babu <ramesh.babu(a)intel.com> Signed-off-by: Sriram Periyasamy <sriramx.periyasamy(a)intel.com> --- aplay/aplay.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/aplay/aplay.c b/aplay/aplay.c index 6b740c281f8e..b50602a59024 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -108,6 +108,7 @@ static snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK; static int mmap_flag = 0; static int interleaved = 1; static int nonblock = 0; +static int no_rewind = 0; static volatile sig_atomic_t in_aborting = 0; static u_char *audiobuf = NULL; static snd_pcm_uframes_t chunk_size = 0; @@ -229,6 +230,7 @@ _("Usage: %s [OPTION]... [FILE]...\n" "-I, --separate-channels one file for each channel\n" "-i, --interactive allow interactive operation from stdin\n" "-m, --chmap=ch1,ch2,.. Give the channel map to override or follow\n" +"-w, --no-rewind enables no rewind mode\n" " --disable-resample disable automatic rate resample\n" " --disable-channels disable automatic channel conversions\n" " --disable-format disable automatic format conversions\n" @@ -470,7 +472,7 @@ int main(int argc, char *argv[]) { int duration_or_sample = 0; int option_index; - static const char short_options[] = "hnlLD:qt:c:f:r:d:s:MNF:A:R:T:B:vV:IPCi" + static const char short_options[] = "hnlLD:qt:c:f:r:d:s:w:MNF:A:R:T:B:vV:IPCi" #ifdef CONFIG_SUPPORT_CHMAP "m:" #endif @@ -514,6 +516,7 @@ int main(int argc, char *argv[]) {"process-id-file", 1, 0, OPT_PROCESS_ID_FILE}, {"use-strftime", 0, 0, OPT_USE_STRFTIME}, {"interactive", 0, 0, 'i'}, + {"no-rewind", 0, 0, 'w'}, {"dump-hw-params", 0, 0, OPT_DUMP_HWPARAMS}, {"fatal-errors", 0, 0, OPT_FATAL_ERRORS}, #ifdef CONFIG_SUPPORT_CHMAP @@ -753,6 +756,9 @@ int main(int argc, char *argv[]) case 'i': interactive = 1; break; + case 'w': + no_rewind = 1; + break; case OPT_DISABLE_RESAMPLE: open_mode |= SND_PCM_NO_AUTO_RESAMPLE; break; @@ -1396,6 +1402,12 @@ static void set_params(void) &buffer_frames); } assert(err >= 0); + + if (no_rewind) { + err = snd_pcm_hw_params_set_no_rewind(handle, params, 1); + assert(err >= 0); + } + monotonic = snd_pcm_hw_params_is_monotonic(params); can_pause = snd_pcm_hw_params_can_pause(params); err = snd_pcm_hw_params(handle, params); -- 2.7.4

3 4

[alsa-devel] [PATCH v7 0/6] TDA1997x HDMI video receiver
by Tim Harvey 06 Feb '18

06 Feb '18

This is a v4l2 subdev driver supporting the TDA1997x HDMI video receiver. I've tested this on a Gateworks GW54xx/GW551x with an IMX6Q/IMX6DL which uses the TDA19971 with 16bits connected to the IMX6 CSI and single-lane I2S audio providing 2-channel audio. For this configuration I've tested both 16bit YUV422 and 8bit BT656 parallel video bus modes. While the driver should support the TDA1993 I do not have one for testing. Further potential development efforts include: - CEC support - HDCP support - mbus format selection support for bus widths that support multiple formats - TDA19972 support (2 inputs) Media graphs can be found at http://dev.gateworks.com/docs/linux/media History: v7: - fix interlaced mode - support no AVI infoframe (ie DVI) (Hans) - add support for multiple output formats (Hans) v6: - tda1997x: fix return on regulator enablei in tda1997x_set_power() (Fabio) - tda1997x: fix colorspace handling (Hans) - bindings: added Robs's ack (Rob) - replace copyright with SPDX tag (Philippe) v5: - added v4l2_hdmi_colorimetry() patch from Hans to series - bindings: added Sakari's ack - tda1997x: uppercase string constants - tda1997x: use v4l2_hdmi_rx_coloriemtry to fill format - tda1997x: fix V4L2_CID_DV_RX_RGB_RANGE - tda1997x: fix interlaced mode format - dts: remove leading 0 from unit address - dts: add newline between property list and child node - dts: added missing audmux in GW551x dts v4: - move include/dt-bindings/media/tda1997x.h to bindings patch - clarify port node details in bindings - fix typos - fix default quant range for VGA - fix quant range handling and conv matrix - add additional standards and capabilities to timings_cap v3: - fix typo in dt bindings - added dt bindings for GW551x - use V4L2_DV_BT_FRAME_WIDTH/HEIGHT macros - fixed missing break - use only hdmi_infoframe_log for infoframe logging - simplify tda1997x_s_stream error handling - add delayed work proc to handle hotplug enable/disable - fix set_edid (disable HPD before writing, enable after) - remove enabling edid by default - initialize timings - take quant range into account in colorspace conversion - remove vendor/product tracking (we provide this in log_status via infoframes) - add v4l_controls - add more detail to log_status - calculate vhref generator timings - timing detection fixes (rounding errors, hswidth errors) - rename configure_input/configure_conv functions v2: - encorporate feedback into dt bindings - change audio dt bindings - implement dv timings enum/cap - remove deprecated g_mbus_config op - fix dv_query_timings - add EDID get/set handling - remove max-pixel-rate support - add audio codec DAI support - added media-ctl and v4l2-compliance details v1: - initial RFC Media device topology: # media-ctl -d /dev/media0 -p Media controller API version 4.13.0 Media device information ------------------------ driver imx-media model imx-media serial bus info hw revision 0x0 driver version 4.13.0 Device topology - entity 1: adv7180 2-0020 (1 pad, 1 link) type V4L2 subdev subtype Unknown flags 20004 device node name /dev/v4l-subdev0 pad0: Source [fmt:UYVY8_2X8/720x480 field:interlaced colorspace:smpte170m] -> "ipu2_csi1_mux":1 [] - entity 3: tda19971 2-0048 (1 pad, 1 link) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev1 pad0: Source [fmt:UYVY8_1X16/640x480 field:none colorspace:srgb] [dv.caps:BT.656/1120 min:640x480@13000000 max:1920x1080@165000000 stds:CEA-861,DMT caps:progressive] [dv.detect:BT.656/1120 640x480p59 (800x525) stds:CEA-861,DMT flags:has-cea861-vic] [dv.current:BT.656/1120 1920x1080p60 (2200x1125) stds:CEA-861,DMT flags:can-reduce-fps,CE-video,has-cea861-vic] -> "ipu1_csi0_mux":1 [] - entity 5: ipu1_vdic (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev2 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_csi0":1 [] <- "ipu1_csi1":1 [] pad1: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] pad2: Source [fmt:AYUV8_1X32/640x480@1/60 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] - entity 9: ipu2_vdic (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev3 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_csi0":1 [] <- "ipu2_csi1":1 [] pad1: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] pad2: Source [fmt:AYUV8_1X32/640x480@1/60 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] - entity 13: ipu1_ic_prp (3 pads, 5 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev4 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_vdic":2 [] <- "ipu1_csi0":1 [] <- "ipu1_csi1":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpenc":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpvf":0 [] - entity 17: ipu1_ic_prpenc (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev5 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_ic_prp":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpenc capture":0 [] - entity 20: ipu1_ic_prpenc capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video0 pad0: Sink <- "ipu1_ic_prpenc":1 [] - entity 26: ipu1_ic_prpvf (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev6 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_ic_prp":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpvf capture":0 [] - entity 29: ipu1_ic_prpvf capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video1 pad0: Sink <- "ipu1_ic_prpvf":1 [] - entity 35: ipu2_ic_prp (3 pads, 5 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev7 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_vdic":2 [] <- "ipu2_csi0":1 [] <- "ipu2_csi1":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpenc":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpvf":0 [] - entity 39: ipu2_ic_prpenc (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev8 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_ic_prp":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpenc capture":0 [] - entity 42: ipu2_ic_prpenc capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video2 pad0: Sink <- "ipu2_ic_prpenc":1 [] - entity 48: ipu2_ic_prpvf (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev9 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_ic_prp":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpvf capture":0 [] - entity 51: ipu2_ic_prpvf capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video3 pad0: Sink <- "ipu2_ic_prpvf":1 [] - entity 57: ipu1_csi0 (3 pads, 4 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev10 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] <- "ipu1_csi0_mux":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] -> "ipu1_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_csi0 capture":0 [] - entity 61: ipu1_csi0 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video4 pad0: Sink <- "ipu1_csi0":2 [] - entity 67: ipu1_csi1 (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev11 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] -> "ipu1_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_csi1 capture":0 [] - entity 71: ipu1_csi1 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video5 pad0: Sink <- "ipu1_csi1":2 [] - entity 77: ipu2_csi0 (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev12 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] -> "ipu2_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_csi0 capture":0 [] - entity 81: ipu2_csi0 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video6 pad0: Sink <- "ipu2_csi0":2 [] - entity 87: ipu2_csi1 (3 pads, 4 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev13 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] <- "ipu2_csi1_mux":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] -> "ipu2_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_csi1 capture":0 [] - entity 91: ipu2_csi1 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video7 pad0: Sink <- "ipu2_csi1":2 [] - entity 97: ipu1_csi0_mux (3 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev14 pad0: Sink [fmt:unknown/0x0] pad1: Sink [fmt:unknown/0x0] <- "tda19971 2-0048":0 [] pad2: Source [fmt:unknown/0x0] -> "ipu1_csi0":0 [] - entity 101: ipu2_csi1_mux (3 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev15 pad0: Sink [fmt:unknown/0x0] pad1: Sink [fmt:unknown/0x0] <- "adv7180 2-0020":0 [] pad2: Source [fmt:unknown/0x0] -> "ipu2_csi1":0 [] v4l2-compliance test results: (on /dev/video6 as v4l2-compliance doesn't yet support subdevs) Driver Info: Driver name : imx-media-captu Card type : imx-media-capture Bus info : platform:ipu2_csi0 Driver version: 4.13.0 Capabilities : 0x84200001 Video Capture Streaming Extended Pix Format Device Capabilities Device Caps : 0x04200001 Video Capture Streaming Extended Pix Format Compliance test for device /dev/video6 (not using libv4l2): Required ioctls: test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second video open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) fail: v4l2-test-input-output.cpp(418): G_INPUT not supported for a capture device test VIDIOC_G/S/ENUMINPUT: FAIL test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK test VIDIOC_G/S_CTRL: OK fail: v4l2-test-controls.cpp(574): g_ext_ctrls does not support count == 0 test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK (Not Supported) Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK Test input 0: Total: 42, Succeeded: 40, Failed: 2, Warnings: 0 Hans Verkuil (1): v4l2-dv-timings: add v4l2_hdmi_colorimetry() Tim Harvey (5): MAINTAINERS: add entry for NXP TDA1997x driver media: dt-bindings: Add bindings for TDA1997X media: i2c: Add TDA1997x HDMI receiver driver ARM: dts: imx: Add TDA19971 HDMI Receiver to GW54xx ARM: dts: imx: Add TDA19971 HDMI Receiver to GW551x .../devicetree/bindings/media/i2c/tda1997x.txt | 179 + MAINTAINERS | 8 + arch/arm/boot/dts/imx6q-gw54xx.dts | 105 + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 29 +- arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 138 + drivers/media/i2c/Kconfig | 9 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/tda1997x.c | 3476 ++++++++++++++++++++ drivers/media/v4l2-core/v4l2-dv-timings.c | 141 + include/dt-bindings/media/tda1997x.h | 74 + include/media/i2c/tda1997x.h | 41 + include/media/v4l2-dv-timings.h | 21 + 12 files changed, 4219 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/i2c/tda1997x.txt create mode 100644 drivers/media/i2c/tda1997x.c create mode 100644 include/dt-bindings/media/tda1997x.h create mode 100644 include/media/i2c/tda1997x.h -- 2.7.4

2 7

[alsa-devel] Fwd: Adding support for CMEDIA USB2.0 High-Speed True HD Audio
by Jean-Philippe Guillemin 06 Feb '18

06 Feb '18

---------- Forwarded message ---------- From: Jean-Philippe Guillemin <h1p8r10n(a)gmail.com> Date: 2018-02-06 10:57 GMT+01:00 Subject: Re: [alsa-devel] Adding support for CMEDIA USB2.0 High-Speed True HD Audio To: Clemens Ladisch <clemens(a)ladisch.de> 2018-02-06 10:33 GMT+01:00 Clemens Ladisch <clemens(a)ladisch.de>: > (please don't top-post) > > Jean-Philippe Guillemin wrote: > > # aplay -l > > card 0: Audio [USB2.0 High-Speed True HD Audio], device 0: USB Audio > [USB Audio] > > card 0: Audio [USB2.0 High-Speed True HD Audio], device 1: USB Audio > [USB Audio #1] > > card 0: Audio [USB2.0 High-Speed True HD Audio], device 2: USB Audio > [USB Audio #2] > > So "aplay -D plughw:0,2 something.wav" works correctly? > Yes, indeed, I've got sound through the SPDIF output interface > > >> I'm trying to create a mapping in USB-Audio.conf : > >> # If a device does not use the first PCM device for digital data, the > device > >> # number for the iec958 device can be changed here. > >> USB-Audio.pcm.iec958_device { > >> # "NoiseBlaster 3000" 42 > >> "USB Sound Blaster HD" 1 > >> "USB2.0 High-Speed True HD Audio" 2 > >> ... > >> > >> But I never got a match on "USB2.0 High-Speed True HD Audio". > > What exactly happens when you try "aplay -D iec958 something.wav"? > No sound through SPDIF output interface : aplay -D iec958 foo.wav Playing WAVE 'foo.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo > > Regards, > Clemens > _______________________________________________ > Alsa-devel mailing list > Alsa-devel(a)alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >

1 0

[alsa-devel] [PATCH] ASoC: Intel: add nau8824 sound card
by John Hsu 06 Feb '18

06 Feb '18

Create sound card with NAU88L24 codec in Intel Cherryview-based platforms, Cherrytrail and Braswell. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/intel/boards/Kconfig | 11 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/cht_bsw_nau8824.c | 282 ++++++++++++++++++++++ sound/soc/intel/common/soc-acpi-intel-cht-match.c | 9 + 4 files changed, 304 insertions(+) create mode 100644 sound/soc/intel/boards/cht_bsw_nau8824.c diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index fefb1ee..b4f12e6 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -125,6 +125,17 @@ config SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH Say Y or m if you have such a device. This is a recommended option. If unsure select "N". +config SND_SOC_INTEL_CHT_BSW_NAU8824_MACH + tristate "Cherrytrail & Braswell with NAU88L24 codec" + depends on X86_INTEL_LPSS && I2C && ACPI + select SND_SOC_ACPI + select SND_SOC_NAU8824 + help + This adds support for ASoC machine driver for Intel(R) Cherrytrail & Braswell + platforms with NAU88L24 audio codec. + Say Y or m if you have such a device. This is a recommended option. + If unsure select "N". + config SND_SOC_INTEL_BYT_CHT_DA7213_MACH tristate "Baytrail & Cherrytrail with DA7212/7213 codec" depends on X86_INTEL_LPSS && I2C && ACPI diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index 69d2dfa..f2a9ee4 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -11,6 +11,7 @@ snd-soc-sst-bytcr-rt5651-objs := bytcr_rt5651.o snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o snd-soc-sst-cht-bsw-max98090_ti-objs := cht_bsw_max98090_ti.o +snd-soc-sst-cht-bsw-nau8824-objs := cht_bsw_nau8824.o snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o snd-soc-sst-byt-cht-es8316-objs := bytcht_es8316.o snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o @@ -32,6 +33,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH) += snd-soc-sst-bytcr-rt5651.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) += snd-soc-sst-cht-bsw-max98090_ti.o +obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH) += snd-soc-sst-cht-bsw-nau8824.o obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH) += snd-soc-sst-byt-cht-da7213.o obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH) += snd-soc-sst-byt-cht-es8316.o obj-$(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH) += snd-soc-sst-byt-cht-nocodec.o diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c new file mode 100644 index 0000000..08d0b81 --- /dev/null +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -0,0 +1,282 @@ +/* + * cht-bsw-nau8824.c - ASoc Machine driver for Intel Cherryview-based + * platforms Cherrytrail and Braswell, with nau8824 codec. + * + * Copyright (C) 2018 Intel Corp + * Copyright (C) 2018 Nuvoton Technology Corp + * + * Author: Wang, Joseph C <joequant(a)gmail.com> + * Co-author: John Hsu <KCHSU0(a)nuvoton.com> + * This file is based on cht_bsw_rt5672.c and cht-bsw-max98090.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include <linux/input.h> +#include "../atom/sst-atom-controls.h" +#include "../../codecs/nau8824.h" + +struct cht_mc_private { + struct snd_soc_jack jack; +}; + +static struct snd_soc_jack_pin cht_bsw_jack_pins[] = { + { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, + }, + { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, + }, +}; + +static const struct snd_soc_dapm_widget cht_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), + SND_SOC_DAPM_SPK("Ext Spk", NULL), +}; + +static const struct snd_soc_dapm_route cht_audio_map[] = { + {"Ext Spk", NULL, "SPKOUTL"}, + {"Ext Spk", NULL, "SPKOUTR"}, + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"MIC1", NULL, "Int Mic"}, + {"MIC2", NULL, "Int Mic"}, + {"HSMIC1", NULL, "Headset Mic"}, + {"HSMIC2", NULL, "Headset Mic"}, + {"Playback", NULL, "ssp2 Tx"}, + {"ssp2 Tx", NULL, "codec_out0"}, + {"ssp2 Tx", NULL, "codec_out1"}, + {"codec_in0", NULL, "ssp2 Rx" }, + {"codec_in1", NULL, "ssp2 Rx" }, + {"ssp2 Rx", NULL, "Capture"}, +}; + +static const struct snd_kcontrol_new cht_mc_controls[] = { + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("Int Mic"), + SOC_DAPM_PIN_SWITCH("Ext Spk"), +}; + +static int cht_aif1_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + ret = snd_soc_dai_set_sysclk(codec_dai, NAU8824_CLK_FLL_FS, 0, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(codec_dai->dev, "can't set FS clock %d\n", ret); + return ret; + } + ret = snd_soc_dai_set_pll(codec_dai, 0, 0, params_rate(params), + params_rate(params) * 256); + if (ret < 0) { + dev_err(codec_dai->dev, "can't set FLL: %d\n", ret); + return ret; + } + + return 0; +} + +static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) +{ + struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); + struct snd_soc_jack *jack = &ctx->jack; + struct snd_soc_codec *codec = runtime->codec; + struct snd_soc_dai *codec_dai = runtime->codec_dai; + int ret, jack_type; + + /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ + ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xf, 0x1, 4, 24); + if (ret < 0) { + dev_err(runtime->dev, "can't set codec TDM slot %d\n", ret); + return ret; + } + + /* NAU88L24 supports 4 butons headset detection + * KEY_MEDIA + * KEY_VOICECOMMAND + * KEY_VOLUMEUP + * KEY_VOLUMEDOWN + */ + jack_type = SND_JACK_HEADPHONE | SND_JACK_BTN_0 | SND_JACK_BTN_1 | + SND_JACK_BTN_2 | SND_JACK_BTN_3; + ret = snd_soc_card_jack_new(runtime->card, "Headset", jack_type, jack, + cht_bsw_jack_pins, ARRAY_SIZE(cht_bsw_jack_pins)); + if (ret) { + dev_err(runtime->dev, + "Headset Jack creation failed %d\n", ret); + return ret; + } + snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA); + snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); + snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); + + nau8824_enable_jack_detect(codec, jack); + + return ret; +} + +static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + struct snd_mask *fmt = + hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); + + /* The DSP will covert the FE rate to 48k, stereo, 24bits */ + rate->min = rate->max = 48000; + channels->min = channels->max = 2; + + /* set SSP2 to 24-bit */ + snd_mask_none(fmt); + params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); + + return 0; +} + +static int cht_aif1_startup(struct snd_pcm_substream *substream) +{ + return snd_pcm_hw_constraint_single(substream->runtime, + SNDRV_PCM_HW_PARAM_RATE, 48000); +} + +static const struct snd_soc_ops cht_aif1_ops = { + .startup = cht_aif1_startup, +}; + +static const struct snd_soc_ops cht_be_ssp2_ops = { + .hw_params = cht_aif1_hw_params, +}; + +static struct snd_soc_dai_link cht_dailink[] = { + /* Front End DAI links */ + [MERR_DPCM_AUDIO] = { + .name = "Audio Port", + .stream_name = "Audio", + .cpu_dai_name = "media-cpu-dai", + .codec_dai_name = "snd-soc-dummy-dai", + .codec_name = "snd-soc-dummy", + .platform_name = "sst-mfld-platform", + .nonatomic = true, + .dynamic = 1, + .dpcm_playback = 1, + .dpcm_capture = 1, + .ops = &cht_aif1_ops, + }, + [MERR_DPCM_DEEP_BUFFER] = { + .name = "Deep-Buffer Audio Port", + .stream_name = "Deep-Buffer Audio", + .cpu_dai_name = "deepbuffer-cpu-dai", + .codec_dai_name = "snd-soc-dummy-dai", + .codec_name = "snd-soc-dummy", + .platform_name = "sst-mfld-platform", + .nonatomic = true, + .dynamic = 1, + .dpcm_playback = 1, + .ops = &cht_aif1_ops, + }, + [MERR_DPCM_COMPR] = { + .name = "Compressed Port", + .stream_name = "Compress", + .cpu_dai_name = "compress-cpu-dai", + .codec_dai_name = "snd-soc-dummy-dai", + .codec_name = "snd-soc-dummy", + .platform_name = "sst-mfld-platform", + }, + /* Back End DAI links */ + { + /* SSP2 - Codec */ + .name = "SSP2-Codec", + .id = 1, + .cpu_dai_name = "ssp2-port", + .platform_name = "sst-mfld-platform", + .no_pcm = 1, + .codec_dai_name = NAU8824_CODEC_DAI, + .codec_name = "i2c-10508824:00", + .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF + | SND_SOC_DAIFMT_CBS_CFS, + .init = cht_codec_init, + .be_hw_params_fixup = cht_codec_fixup, + .dpcm_playback = 1, + .dpcm_capture = 1, + .ops = &cht_be_ssp2_ops, + }, +}; + +/* SoC card */ +static struct snd_soc_card snd_soc_card_cht = { + .name = "chtnau8824", + .owner = THIS_MODULE, + .dai_link = cht_dailink, + .num_links = ARRAY_SIZE(cht_dailink), + .dapm_widgets = cht_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cht_dapm_widgets), + .dapm_routes = cht_audio_map, + .num_dapm_routes = ARRAY_SIZE(cht_audio_map), + .controls = cht_mc_controls, + .num_controls = ARRAY_SIZE(cht_mc_controls), +}; + +static int snd_cht_mc_probe(struct platform_device *pdev) +{ + struct cht_mc_private *drv; + int ret_val; + + drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_ATOMIC); + if (!drv) + return -ENOMEM; + snd_soc_card_set_drvdata(&snd_soc_card_cht, drv); + + /* register the soc card */ + snd_soc_card_cht.dev = &pdev->dev; + ret_val = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_cht); + if (ret_val) { + dev_err(&pdev->dev, + "snd_soc_register_card failed %d\n", ret_val); + return ret_val; + } + platform_set_drvdata(pdev, &snd_soc_card_cht); + + return ret_val; +} + +static struct platform_driver snd_cht_mc_driver = { + .driver = { + .name = "cht-bsw-nau8824", + }, + .probe = snd_cht_mc_probe, +}; + +module_platform_driver(snd_cht_mc_driver); + +MODULE_DESCRIPTION("ASoC Intel(R) Baytrail CR Machine driver"); +MODULE_AUTHOR("Wang, Joseph C <joequant(a)gmail.com>"); +MODULE_AUTHOR("John Hsu <KCHSU0(a)nuvoton.com>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:cht-bsw-nau8824"); diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c index b50a0d5..ad1eb2d 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c @@ -118,6 +118,15 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { .asoc_plat_name = "sst-mfld-platform", }, { + .id = "10508824", + .drv_name = "cht-bsw-nau8824", + .fw_filename = "intel/fw_sst_22a8.bin", + .board = "cht-bsw", + .sof_fw_filename = "intel/reef-cht.ri", + .sof_tplg_filename = "intel/reef-cht-nau8824.tplg", + .asoc_plat_name = "sst-mfld-platform", + }, + { .id = "DLGS7212", .drv_name = "bytcht_da7213", .fw_filename = "intel/fw_sst_22a8.bin", -- 2.6.4

1 0

[alsa-devel] [PATCH v2] ASoC: dapm: fix debugfs read using path->connected
by KaiChieh Chuang 05 Feb '18

05 Feb '18

This fix a bug in dapm_widget_power_read_file(), where it may sent opposite order of source/sink widget into the p->connected(). for example, static int connected_check(source, sink); {"w_sink", NULL, "w_source", connected_check} the dapm_widget_power_read_file() will query p->connected() in following case p->conneted("w_source", "w_sink") p->conneted("w_sink", "w_source") we should avoid the last case, since it's the wrong order (source/sink) as declared in snd_soc_dapm_route. Signed-off-by: KaiChieh Chuang <kaichieh.chuang(a)mediatek.com> --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index a10b21c..ee6d9d9a 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2026,7 +2026,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file, snd_soc_dapm_for_each_direction(dir) { rdir = SND_SOC_DAPM_DIR_REVERSE(dir); snd_soc_dapm_widget_for_each_path(w, dir, p) { - if (p->connected && !p->connected(w, p->node[rdir])) + if (p->connected && !p->connected(p->source, p->sink)) continue; if (!p->connect) -- 1.7.9.5

2 1

[alsa-devel] [PATCH v2 1/1] ASoC: stm32: add of dependency for stm32 drivers
by Olivier Moysan 05 Feb '18

05 Feb '18

Add of dependency for STM32 ASoC drivers. DFSDM of dependency is already inherited from STM32_DFSDM_ADC dependency. Signed-off-by: olivier moysan <olivier.moysan(a)st.com> --- sound/soc/stm/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig index 3ad881f..48f9ddd 100644 --- a/sound/soc/stm/Kconfig +++ b/sound/soc/stm/Kconfig @@ -2,7 +2,7 @@ menu "STMicroelectronics STM32 SOC audio support" config SND_SOC_STM32_SAI tristate "STM32 SAI interface (Serial Audio Interface) support" - depends on ARCH_STM32 || COMPILE_TEST + depends on (ARCH_STM32 && OF) || COMPILE_TEST depends on SND_SOC select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO @@ -11,7 +11,7 @@ config SND_SOC_STM32_SAI config SND_SOC_STM32_I2S tristate "STM32 I2S interface (SPI/I2S block) support" - depends on ARCH_STM32 || COMPILE_TEST + depends on (ARCH_STM32 && OF) || COMPILE_TEST depends on SND_SOC select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO @@ -20,7 +20,7 @@ config SND_SOC_STM32_I2S config SND_SOC_STM32_SPDIFRX tristate "STM32 S/PDIF receiver (SPDIFRX) support" - depends on ARCH_STM32 || COMPILE_TEST + depends on (ARCH_STM32 && OF) || COMPILE_TEST depends on SND_SOC select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO -- 1.9.1

2 1

[alsa-devel] [PATCH - alsa-lib 1/1] Patch for another bug in snd_pcm_area_silence().
by furrywolf 05 Feb '18

05 Feb '18

Only silence areas 64 bits at a time if it's possible to do so, which is when either the silence values are all zero, or when the format width divides evenly into 64 bits. For formats that are neither of these, let the width-specific code handle the entire silencing. Silencing formats that are not evenly divisible into 64 bits in 64-bit chunks, when the data isn't just zeroes, results in values being written to shifting positions in the sample, giving garbage. Makes Takashi Sakamoto's tester happy for all tests. Yay! (And Thanks!) Signed-off-by: furrywolf <alsa2(a)bushytails.net> diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 1753cda..5f9bd9f 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -2947,7 +2947,7 @@ int snd_pcm_area_silence(const snd_pcm_channel_area_t *dst_area, snd_pcm_uframes dst = snd_pcm_channel_area_addr(dst_area, dst_offset); width = snd_pcm_format_physical_width(format); silence = snd_pcm_format_silence_64(format); - if (dst_area->step == (unsigned int) width) { + if (dst_area->step == (unsigned int) width && (!silence || !(64 % width))) { unsigned int dwords = samples * width / 64; uint64_t *dstp = (uint64_t *)dst; samples -= dwords * 64 / width; -- 1.9.1

4 4

[alsa-devel] [PATCH] ASoC: dapm: fix debugfs read using path->connected
by kaichieh.chuang＠mediatek.com 05 Feb '18

05 Feb '18

From: KaiChieh Chuang <kaichieh.chuang(a)mediatek.com> This fix a bug in dapm_widget_power_read_file(), where it may sent opposite order of source/sink widget into the p->connected(). for example, static int connected_check(source, sink); {"w_sink", NULL, "w_source", connected_check} the dapm_widget_power_read_file() will query p->connected() in following case p->conneted("w_source", "w_sink") p->conneted("w_sink", "w_source") we should avoid the last case, since it's the wrong order (source/sink) as declared in snd_soc_dapm_route. Signed-off-by: KaiChieh Chuang <kaichieh.chuang(a)mediatek.com> --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index a10b21c..ee6d9d9a 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2026,7 +2026,7 @@ static ssize_t dapm_widget_power_read_file(struct file *fi le, snd_soc_dapm_for_each_direction(dir) { rdir = SND_SOC_DAPM_DIR_REVERSE(dir); snd_soc_dapm_widget_for_each_path(w, dir, p) { - if (p->connected && !p->connected(w, p->node[rdir])) + if (p->connected && !p->connected(p->source, p->sink)) continue; if (!p->connect) -- 1.7.9.5 ************* Email Confidentiality Notice ******************** The information contained in this e-mail message (including any attachments) may be confidential, proprietary, privileged, or otherwise exempt from disclosure under applicable laws. It is intended to be conveyed only to the designated recipient(s). Any use, dissemination, distribution, printing, retaining or copying of this e-mail (including its attachments) by unintended recipient(s) is strictly prohibited and may be unlawful. If you are not an intended recipient of this e-mail, or believe that you have received this e-mail in error, please notify the sender immediately (by replying to this e-mail), delete any and all copies of this e-mail (including any attachments) from your system, and do not disclose the content of this e-mail to any other person. Thank you!

3 4

Re: [alsa-devel] [PATCH] alsaloop: fix a typo in the comparison
by Jaroslav Kysela 05 Feb '18

05 Feb '18

Dne 5.2.2018 v 07:47 Kirill Marinushkin napsal(a): > Hello maintainers, > > I would like to suggest you a patch which fixes a typo in the alsa-utils > alsaloop. Applied. Thanks. Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

1 0

[alsa-devel] [PATCH v2 0/2] Add support for AK5558 ADC
by Daniel Baluta 05 Feb '18

05 Feb '18

We support normal mode, TDM mode and pm. Changes since v1: [addressed comments from Andy and Fabio] * fix GPIO polarity from active high to active low for correct documentation * fix license header by using SPDX identifier * remove debug prints at the beginning of functions. * only support auto clock switching (manual switching was dead code anyway) (in the future we could add a DT property to choose between manual and auto) * Use gpiod API * use GENMASK * introduce power_off/power_on One open question is the resume sequence which appears to need power_off/power_on. Just power_on alone isn't enough. With just power_on after resume aplay plays a song for 1 seconds and then the sound stops. Datasheet says, page 55" (1) The PDN pin should be held to “L” for more than 150 ns after AVDD and TVDD are powered up. Daniel Baluta (2): ASoC: codecs: Add support for AK5558 ADC driver ASoC: ak5558: Add bindings for AK5558 ADC Documentation/devicetree/bindings/sound/ak5558.txt | 23 + sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ak5558.c | 626 +++++++++++++++++++++ sound/soc/codecs/ak5558.h | 52 ++ 5 files changed, 709 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt create mode 100644 sound/soc/codecs/ak5558.c create mode 100644 sound/soc/codecs/ak5558.h -- 2.7.4

6 8

Re: [alsa-devel] [PATCH] ASoC: codecs: Add support for AK4458 DAC driver
by Rob Herring 05 Feb '18

05 Feb '18

On Wed, Jan 31, 2018 at 03:20:09PM +0200, Cosmin-Gabriel Samoila 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> > --- > Documentation/devicetree/bindings/sound/ak4458.txt | 23 + Separate patch please. > sound/soc/codecs/Kconfig | 18 + > sound/soc/codecs/Makefile | 6 + > sound/soc/codecs/ak4458-i2c.c | 79 ++ > sound/soc/codecs/ak4458-spi.c | 61 ++ > sound/soc/codecs/ak4458.c | 1132 ++++++++++++++++++++ > sound/soc/codecs/ak4458.h | 127 +++ > 7 files changed, 1446 insertions(+) > create mode 100644 Documentation/devicetree/bindings/sound/ak4458.txt > create mode 100644 sound/soc/codecs/ak4458-i2c.c > create mode 100644 sound/soc/codecs/ak4458-spi.c > create mode 100644 sound/soc/codecs/ak4458.c > create mode 100644 sound/soc/codecs/ak4458.h > > diff --git a/Documentation/devicetree/bindings/sound/ak4458.txt b/Documentation/devicetree/bindings/sound/ak4458.txt > new file mode 100644 > index 0000000..b9e6eb3 > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/ak4458.txt > @@ -0,0 +1,23 @@ > +AK4458 audio DAC > + > +This device supports both I2C and SPI modes. > + > +Required properties: > + > +- compatible : "asahi-kasei,ak4458" > +- reg : The I2C address of the device for I2C, the chip select number for SPI. > +- asahi-kasei,pdn-gpios: A GPIO specifier for the GPIO controlling > + the power down & reset pin. reset-gpios like the Asahi Kasei ADC under review. > +- asahi-kasei,mute-gpios: A GPIO specifier for the GPIO controlling > + the soft mute pin. State the active state. > + > +Example: > + > +&i2c { > + ak4458: ak4458@10 { dac@10 > + compatible = "asahi-kasei,ak4458"; > + reg = <0x10>; > + asahi-kasei,pdn-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH> > + asahi-kasei,mute-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH> > + }; > +};

1 0

[alsa-devel] [PATCH v2 1/3] cplay: add option to specify codec ID
by Katsuhiro Suzuki 02 Feb '18

02 Feb '18

This patch adds a -I command line option to set the codec ID, same as crecord. Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro(a)socionext.com> --- src/utils/cplay.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 78 insertions(+), 8 deletions(-) diff --git a/src/utils/cplay.c b/src/utils/cplay.c index bc95f0d..1eb21ce 100644 --- a/src/utils/cplay.c +++ b/src/utils/cplay.c @@ -74,25 +74,75 @@ #include "tinycompress/tinymp3.h" static int verbose; +static const unsigned int DEFAULT_CODEC_ID = SND_AUDIOCODEC_PCM; + +static const struct { + const char *name; + unsigned int id; +} codec_ids[] = { + { "PCM", SND_AUDIOCODEC_PCM }, + { "MP3", SND_AUDIOCODEC_MP3 }, + { "AMR", SND_AUDIOCODEC_AMR }, + { "AMRWB", SND_AUDIOCODEC_AMRWB }, + { "AMRWBPLUS", SND_AUDIOCODEC_AMRWBPLUS }, + { "AAC", SND_AUDIOCODEC_AAC }, + { "WMA", SND_AUDIOCODEC_WMA }, + { "REAL", SND_AUDIOCODEC_REAL }, + { "VORBIS", SND_AUDIOCODEC_VORBIS }, + { "FLAC", SND_AUDIOCODEC_FLAC }, + { "IEC61937", SND_AUDIOCODEC_IEC61937 }, + { "G723_1", SND_AUDIOCODEC_G723_1 }, + { "G729", SND_AUDIOCODEC_G729 }, +/* BESPOKE isn't defined on older kernels */ +#ifdef SND_AUDIOCODEC_BESPOKE + { "BESPOKE", SND_AUDIOCODEC_BESPOKE }, +#endif +}; +#define CPLAY_NUM_CODEC_IDS (sizeof(codec_ids) / sizeof(codec_ids[0])) + +static const char *codec_name_from_id(unsigned int id) +{ + static char hexname[12]; + int i; + + for (i = 0; i < CPLAY_NUM_CODEC_IDS; ++i) { + if (codec_ids[i].id == id) + return codec_ids[i].name; + } + + snprintf(hexname, sizeof(hexname), "0x%x", id); + return hexname; /* a static is safe because we're single-threaded */ +} static void usage(void) { + int i; + fprintf(stderr, "usage: cplay [OPTIONS] filename\n" "-c\tcard number\n" "-d\tdevice node\n" + "-I\tspecify codec ID (default is mp3)\n" "-b\tbuffer size\n" "-f\tfragments\n\n" "-v\tverbose mode\n" "-h\tPrints this help list\n\n" "Example:\n" "\tcplay -c 1 -d 2 test.mp3\n" - "\tcplay -f 5 test.mp3\n"); + "\tcplay -f 5 test.mp3\n\n" + "Valid codec IDs:\n"); + + for (i = 0; i < CPLAY_NUM_CODEC_IDS; ++i) + fprintf(stderr, "%s%c", codec_ids[i].name, + ((i + 1) % 8) ? ' ' : '\n'); + + fprintf(stderr, "\nor the value in decimal or hex\n"); exit(EXIT_FAILURE); } void play_samples(char *name, unsigned int card, unsigned int device, - unsigned long buffer_size, unsigned int frag); + unsigned long buffer_size, unsigned int frag, + unsigned long codec_id); struct mp3_header { uint16_t sync; @@ -156,15 +206,15 @@ int main(int argc, char **argv) { char *file; unsigned long buffer_size = 0; - int c; + int c, i; unsigned int card = 0, device = 0, frag = 0; - + unsigned int codec_id = SND_AUDIOCODEC_MP3; if (argc < 2) usage(); verbose = 0; - while ((c = getopt(argc, argv, "hvb:f:c:d:")) != -1) { + while ((c = getopt(argc, argv, "hvb:f:c:d:I:")) != -1) { switch (c) { case 'h': usage(); @@ -181,6 +231,25 @@ int main(int argc, char **argv) case 'd': device = strtol(optarg, NULL, 10); break; + case 'I': + if (optarg[0] == '0') { + codec_id = strtol(optarg, NULL, 0); + } else { + for (i = 0; i < CPLAY_NUM_CODEC_IDS; ++i) { + if (strcmp(optarg, + codec_ids[i].name) == 0) { + codec_id = codec_ids[i].id; + break; + } + } + + if (i == CPLAY_NUM_CODEC_IDS) { + fprintf(stderr, "Unrecognised ID: %s\n", + optarg); + usage(); + } + } + break; case 'v': verbose = 1; break; @@ -193,14 +262,15 @@ int main(int argc, char **argv) file = argv[optind]; - play_samples(file, card, device, buffer_size, frag); + play_samples(file, card, device, buffer_size, frag, codec_id); fprintf(stderr, "Finish Playing.... Close Normally\n"); exit(EXIT_SUCCESS); } void play_samples(char *name, unsigned int card, unsigned int device, - unsigned long buffer_size, unsigned int frag) + unsigned long buffer_size, unsigned int frag, + unsigned long codec_id) { struct compr_config config; struct snd_codec codec; @@ -292,7 +362,7 @@ void play_samples(char *name, unsigned int card, unsigned int device, printf("Playing file %s On Card %u device %u, with buffer of %lu bytes\n", name, card, device, buffer_size); printf("Format %u Channels %u, %u Hz, Bit Rate %d\n", - SND_AUDIOCODEC_MP3, channels, rate, bits); + codec.id, codec.ch_in, codec.sample_rate, codec.bit_rate); compress_start(compress); if (verbose) -- 2.15.0

2 3

[alsa-devel] [PATCH] ASoC: codecs: Add support for AK5558 ADC driver
by Daniel Baluta 02 Feb '18

02 Feb '18

AK5558 is a 32-bit, 768 kHZ sampling, differential input ADC for digital audio systems. Datasheet is available at: https://www.akm.com/akm/en/file/datasheet/AK5558VN.pdf Initial patch includes support for normal and TDM modes. 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: Daniel Baluta <daniel.baluta(a)nxp.com> --- Documentation/devicetree/bindings/sound/ak5558.txt | 20 + sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ak5558.c | 754 +++++++++++++++++++++ sound/soc/codecs/ak5558.h | 60 ++ 5 files changed, 842 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt create mode 100644 sound/soc/codecs/ak5558.c create mode 100644 sound/soc/codecs/ak5558.h diff --git a/Documentation/devicetree/bindings/sound/ak5558.txt b/Documentation/devicetree/bindings/sound/ak5558.txt new file mode 100644 index 0000000..c6c71af --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ak5558.txt @@ -0,0 +1,20 @@ +AK5558 8 channel differential 32-bit delta-sigma ADC + +This device supports I2C mode only. + +Required properties: + +- compatible : "asahi-kasei,ak5558" +- reg : The I2C address of the device for I2C. +- asahi-kasei,pdn-gpios: A GPIO specifier for the GPIO controlling + the power down & reset pin. + +Example: + +&i2c { + ak5558: ak5558@10 { + compatible = "asahi-kasei,ak5558"; + reg = <0x10>; + asahi-kasei,pdn-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + }; +}; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index c367d11..84a15d4 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -42,6 +42,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_AK4642 if I2C select SND_SOC_AK4671 if I2C select SND_SOC_AK5386 + select SND_SOC_AK5558 if I2C select SND_SOC_ALC5623 if I2C select SND_SOC_ALC5632 if I2C select SND_SOC_BT_SCO @@ -394,6 +395,11 @@ config SND_SOC_AK4671 config SND_SOC_AK5386 tristate "AKM AK5638 CODEC" +config SND_SOC_AK5558 + tristate "AKM AK5558 CODEC" + depends on I2C + select REGMAP_I2C + config SND_SOC_ALC5623 tristate "Realtek ALC5623 CODEC" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 77c1818..3a3d8b1 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -33,6 +33,7 @@ snd-soc-ak4641-objs := ak4641.o snd-soc-ak4642-objs := ak4642.o snd-soc-ak4671-objs := ak4671.o snd-soc-ak5386-objs := ak5386.o +snd-soc-ak5558-objs := ak5558.o snd-soc-arizona-objs := arizona.o snd-soc-bt-sco-objs := bt-sco.o snd-soc-cq93vc-objs := cq93vc.o @@ -271,6 +272,7 @@ obj-$(CONFIG_SND_SOC_AK4641) += snd-soc-ak4641.o obj-$(CONFIG_SND_SOC_AK4642) += snd-soc-ak4642.o obj-$(CONFIG_SND_SOC_AK4671) += snd-soc-ak4671.o obj-$(CONFIG_SND_SOC_AK5386) += snd-soc-ak5386.o +obj-$(CONFIG_SND_SOC_AK5558) += snd-soc-ak5558.o obj-$(CONFIG_SND_SOC_ALC5623) += snd-soc-alc5623.o obj-$(CONFIG_SND_SOC_ALC5632) += snd-soc-alc5632.o obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o diff --git a/sound/soc/codecs/ak5558.c b/sound/soc/codecs/ak5558.c new file mode 100644 index 0000000..eeaeea9 --- /dev/null +++ b/sound/soc/codecs/ak5558.c @@ -0,0 +1,754 @@ +/* + * ak5558.c -- audio driver for AK5558 ADC + * + * Copyright (C) 2015 Asahi Kasei Microdevices Corporation + * Copyright 2018 NXP + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/i2c.h> +#include <linux/delay.h> +#include <linux/slab.h> +#include <linux/gpio/consumer.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/initval.h> +#include <sound/tlv.h> +#include <linux/of_gpio.h> +#include <linux/regmap.h> +#include <linux/pm_runtime.h> + +#include "ak5558.h" + +#define AK5558_SLAVE_CKS_AUTO + +/* AK5558 Codec Private Data */ +struct ak5558_priv { + struct snd_soc_codec codec; + struct regmap *regmap; + struct i2c_client *i2c; + int fs; /* Sampling Frequency */ + int rclk; /* Master Clock */ + int pdn_gpio; /* Power on / Reset GPIO */ + int slots; + int slot_width; +}; + +/* ak5558 register cache & default register settings */ +static const struct reg_default ak5558_reg[] = { + { 0x0, 0xFF }, /* 0x00 AK5558_00_POWER_MANAGEMENT1 */ + { 0x1, 0x01 }, /* 0x01 AK5558_01_POWER_MANAGEMENT2 */ + { 0x2, 0x01 }, /* 0x02 AK5558_02_CONTROL1 */ + { 0x3, 0x00 }, /* 0x03 AK5558_03_CONTROL2 */ + { 0x4, 0x00 }, /* 0x04 AK5558_04_CONTROL3 */ + { 0x5, 0x00 } /* 0x05 AK5558_05_DSD */ +}; + +static const char * const mono_texts[] = { + "8 Slot", "2 Slot", "4 Slot", "1 Slot", +}; + +static const struct soc_enum ak5558_mono_enum[] = { + SOC_ENUM_SINGLE(AK5558_01_POWER_MANAGEMENT2, 1, + ARRAY_SIZE(mono_texts), mono_texts) +}; + +static const char * const tdm_texts[] = { + "Off", "TDM128", "TDM256", "TDM512", +}; + +static const char * const digfil_texts[] = { + "Sharp Roll-Off", "Show Roll-Off", + "Short Delay Sharp Roll-Off", "Short Delay Show Roll-Off", +}; + +static const struct soc_enum ak5558_adcset_enum[] = { + SOC_ENUM_SINGLE(AK5558_03_CONTROL2, 5, + ARRAY_SIZE(tdm_texts), tdm_texts), + SOC_ENUM_SINGLE(AK5558_04_CONTROL3, 0, + ARRAY_SIZE(digfil_texts), digfil_texts), +}; + +static const char * const dsdon_texts[] = { + "PCM", "DSD", +}; + +static const char * const dsdsel_texts[] = { + "64fs", "128fs", "256fs" +}; + +static const char * const dckb_texts[] = { + "Falling", "Rising", +}; + +static const char * const dcks_texts[] = { + "512fs", "768fs", +}; + +static const struct soc_enum ak5558_dsdset_enum[] = { + SOC_ENUM_SINGLE(AK5558_04_CONTROL3, 7, + ARRAY_SIZE(dsdon_texts), dsdon_texts), + SOC_ENUM_SINGLE(AK5558_05_DSD, 0, + ARRAY_SIZE(dsdsel_texts), dsdsel_texts), + SOC_ENUM_SINGLE(AK5558_05_DSD, 2, ARRAY_SIZE(dckb_texts), dckb_texts), + SOC_ENUM_SINGLE(AK5558_05_DSD, 5, ARRAY_SIZE(dcks_texts), dcks_texts), +}; + +static const struct snd_kcontrol_new ak5558_snd_controls[] = { + SOC_ENUM("AK5558 Monaural Mode", ak5558_mono_enum[0]), + SOC_ENUM("AK5558 TDM mode", ak5558_adcset_enum[0]), + SOC_ENUM("AK5558 Digital Filter", ak5558_adcset_enum[1]), + + SOC_ENUM("AK5558 DSD Mode", ak5558_dsdset_enum[0]), + SOC_ENUM("AK5558 Frequency of DCLK", ak5558_dsdset_enum[1]), + SOC_ENUM("AK5558 Polarity of DCLK", ak5558_dsdset_enum[2]), + SOC_ENUM("AK5558 Master Clock Frequency at DSD Mode", + ak5558_dsdset_enum[3]), + + SOC_SINGLE("AK5558 DSD Phase Modulation", AK5558_05_DSD, 3, 1, 0), +}; + +static const char * const ak5558_channel_select_texts[] = {"Off", "On"}; + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel1_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel1_mux_control = + SOC_DAPM_ENUM("Ch1 Switch", ak5558_channel1_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel2_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel2_mux_control = + SOC_DAPM_ENUM("Ch2 Switch", ak5558_channel2_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel3_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel3_mux_control = + SOC_DAPM_ENUM("Ch3 Switch", ak5558_channel3_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel4_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel4_mux_control = + SOC_DAPM_ENUM("Ch4 Switch", ak5558_channel4_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel5_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel5_mux_control = + SOC_DAPM_ENUM("Ch5 Switch", ak5558_channel5_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel6_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel6_mux_control = + SOC_DAPM_ENUM("Ch6 Switch", ak5558_channel6_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel7_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel7_mux_control = + SOC_DAPM_ENUM("Ch7 Switch", ak5558_channel7_mux_enum); + +static SOC_ENUM_SINGLE_VIRT_DECL(ak5558_channel8_mux_enum, + ak5558_channel_select_texts); + +static const struct snd_kcontrol_new ak5558_channel8_mux_control = + SOC_DAPM_ENUM("Ch8 Switch", ak5558_channel8_mux_enum); + +static const struct snd_soc_dapm_widget ak5558_dapm_widgets[] = { + /* Analog Input */ + SND_SOC_DAPM_INPUT("AIN1"), + SND_SOC_DAPM_INPUT("AIN2"), + SND_SOC_DAPM_INPUT("AIN3"), + SND_SOC_DAPM_INPUT("AIN4"), + SND_SOC_DAPM_INPUT("AIN5"), + SND_SOC_DAPM_INPUT("AIN6"), + SND_SOC_DAPM_INPUT("AIN7"), + SND_SOC_DAPM_INPUT("AIN8"), + + SND_SOC_DAPM_MUX("AK5558 Ch1 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel1_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch2 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel2_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch3 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel3_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch4 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel4_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch5 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel5_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch6 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel6_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch7 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel7_mux_control), + SND_SOC_DAPM_MUX("AK5558 Ch8 Enable", SND_SOC_NOPM, 0, 0, + &ak5558_channel8_mux_control), + + SND_SOC_DAPM_ADC("ADC Ch1", NULL, AK5558_00_POWER_MANAGEMENT1, 0, 0), + SND_SOC_DAPM_ADC("ADC Ch2", NULL, AK5558_00_POWER_MANAGEMENT1, 1, 0), + SND_SOC_DAPM_ADC("ADC Ch3", NULL, AK5558_00_POWER_MANAGEMENT1, 2, 0), + SND_SOC_DAPM_ADC("ADC Ch4", NULL, AK5558_00_POWER_MANAGEMENT1, 3, 0), + SND_SOC_DAPM_ADC("ADC Ch5", NULL, AK5558_00_POWER_MANAGEMENT1, 4, 0), + SND_SOC_DAPM_ADC("ADC Ch6", NULL, AK5558_00_POWER_MANAGEMENT1, 5, 0), + SND_SOC_DAPM_ADC("ADC Ch7", NULL, AK5558_00_POWER_MANAGEMENT1, 6, 0), + SND_SOC_DAPM_ADC("ADC Ch8", NULL, AK5558_00_POWER_MANAGEMENT1, 7, 0), + + SND_SOC_DAPM_AIF_OUT("SDTO", "Capture", 0, SND_SOC_NOPM, 0, 0), +}; + +static const struct snd_soc_dapm_route ak5558_intercon[] = { + {"AK5558 Ch1 Enable", "On", "AIN1"}, + {"ADC Ch1", NULL, "AK5558 Ch1 Enable"}, + {"SDTO", NULL, "ADC Ch1"}, + + {"AK5558 Ch2 Enable", "On", "AIN2"}, + {"ADC Ch2", NULL, "AK5558 Ch2 Enable"}, + {"SDTO", NULL, "ADC Ch2"}, + + {"AK5558 Ch3 Enable", "On", "AIN3"}, + {"ADC Ch3", NULL, "AK5558 Ch3 Enable"}, + {"SDTO", NULL, "ADC Ch3"}, + + {"AK5558 Ch4 Enable", "On", "AIN4"}, + {"ADC Ch4", NULL, "AK5558 Ch4 Enable"}, + {"SDTO", NULL, "ADC Ch4"}, + + {"AK5558 Ch5 Enable", "On", "AIN5"}, + {"ADC Ch5", NULL, "AK5558 Ch5 Enable"}, + {"SDTO", NULL, "ADC Ch5"}, + + {"AK5558 Ch6 Enable", "On", "AIN6"}, + {"ADC Ch6", NULL, "AK5558 Ch6 Enable"}, + {"SDTO", NULL, "ADC Ch6"}, + + {"AK5558 Ch7 Enable", "On", "AIN7"}, + {"ADC Ch7", NULL, "AK5558 Ch7 Enable"}, + {"SDTO", NULL, "ADC Ch7"}, + + {"AK5558 Ch8 Enable", "On", "AIN8"}, + {"ADC Ch8", NULL, "AK5558 Ch8 Enable"}, + {"SDTO", NULL, "ADC Ch8"}, +}; + +static int ak5558_set_mcki(struct snd_soc_codec *codec, int fs, int rclk) +{ + u8 mode; +#ifndef AK5558_SLAVE_CKS_AUTO + int mcki_rate; +#endif + + dev_dbg(codec->dev, "%s fs=%d rclk=%d\n", __func__, fs, rclk); + + mode = snd_soc_read(codec, AK5558_02_CONTROL1); + mode &= ~AK5558_CKS; + +#ifdef AK5558_SLAVE_CKS_AUTO + mode |= AK5558_CKS_AUTO; +#else + if (fs != 0 && rclk != 0) { + if (rclk % fs) + return -EINVAL; + mcki_rate = rclk / fs; + + if (fs > 400000) { + switch (mcki_rate) { + case 32: + mode |= AK5558_CKS_32FS_768KHZ; + break; + case 48: + mode |= AK5558_CKS_48FS_768KHZ; + break; + case 64: + mode |= AK5558_CKS_64FS_768KHZ; + break; + default: + return -EINVAL; + } + } else if (fs > 200000) { + switch (mcki_rate) { + case 64: + mode |= AK5558_CKS_64FS_384KHZ; + break; + case 96: + mode |= AK5558_CKS_96FS_384KHZ; + break; + default: + return -EINVAL; + } + } else if (fs > 108000) { + switch (mcki_rate) { + case 128: + mode |= AK5558_CKS_128FS_192KHZ; + break; + case 192: + mode |= AK5558_CKS_192FS_192KHZ; + break; + default: + return -EINVAL; + } + } else if (fs > 54000) { + switch (mcki_rate) { + case 256: + mode |= AK5558_CKS_256FS_96KHZ; + break; + case 384: + mode |= AK5558_CKS_384FS_96KHZ; + break; + default: + return -EINVAL; + } + } else { + switch (mcki_rate) { + case 256: + mode |= AK5558_CKS_256FS_48KHZ; + break; + case 384: + mode |= AK5558_CKS_384FS_48KHZ; + break; + case 512: + mode |= AK5558_CKS_512FS_48KHZ; + break; + case 768: + mode |= AK5558_CKS_768FS_48KHZ; + break; + case 1024: + if (fs > 32000) + return -EINVAL; + mode |= AK5558_CKS_1024FS_16KHZ; + break; + default: + return -EINVAL; + } + } + } +#endif + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_CKS, mode); + + return 0; +} + +static int ak5558_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 ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + u8 bits; + int pcm_width = max(params_physical_width(params), ak5558->slot_width); + + dev_dbg(dai->dev, "%s(%d)\n", __func__, __LINE__); + + /* set master/slave audio interface */ + bits = snd_soc_read(codec, AK5558_02_CONTROL1); + bits &= ~AK5558_BITS; + + switch (pcm_width) { + case 16: + bits |= AK5558_DIF_24BIT_MODE; + break; + case 32: + bits |= AK5558_DIF_32BIT_MODE; + break; + default: + return -EINVAL; + } + + ak5558->fs = params_rate(params); + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_BITS, bits); + + ak5558_set_mcki(codec, ak5558->fs, ak5558->rclk); + + return 0; +} + +static int ak5558_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, + unsigned int freq, int dir) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + + dev_dbg(dai->dev, "%s(%d)\n", __func__, __LINE__); + + ak5558->rclk = freq; + ak5558_set_mcki(codec, ak5558->fs, ak5558->rclk); + + return 0; +} + +static int ak5558_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) +{ + struct snd_soc_codec *codec = dai->codec; + u8 format; + + dev_dbg(dai->dev, "%s(%d)\n", __func__, __LINE__); + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + break; + case SND_SOC_DAIFMT_CBM_CFM: +#ifdef AK5558_SLAVE_CKS_AUTO + break; +#else + return -EINVAL; +#endif + case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBM_CFS: + default: + dev_err(codec->dev, "Clock mode unsupported"); + return -EINVAL; + } + + /* set master/slave audio interface */ + format = snd_soc_read(codec, AK5558_02_CONTROL1); + format &= ~AK5558_DIF; + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + format |= AK5558_DIF_I2S_MODE; + break; + case SND_SOC_DAIFMT_LEFT_J: + format |= AK5558_DIF_MSB_MODE; + break; + case SND_SOC_DAIFMT_DSP_B: + format |= AK5558_DIF_MSB_MODE; + break; + default: + return -EINVAL; + } + + snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_DIF, format); + + return 0; +} + +static int ak5558_set_dai_mute(struct snd_soc_dai *dai, int mute) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + int ndt; + + if (mute) { + ndt = 0; + if (ak5558->fs != 0) + ndt = 583000 / ak5558->fs; + if (ndt < 5) + ndt = 5; + msleep(ndt); + } + + return 0; +} + +static int ak5558_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + dev_dbg(codec->dev, "%s bias level=%d\n", __func__, (int)level); + + switch (level) { + case SND_SOC_BIAS_ON: + case SND_SOC_BIAS_PREPARE: + case SND_SOC_BIAS_STANDBY: + break; + case SND_SOC_BIAS_OFF: + snd_soc_write(codec, AK5558_00_POWER_MANAGEMENT1, 0x00); + break; + } + return 0; +} + +static int ak5558_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 ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + int tdm_mode = 0; + int reg; + + ak5558->slots = slots; + ak5558->slot_width = slot_width; + + switch (slots * slot_width) { + case 128: + tdm_mode = AK5558_MODE_TDM128; + break; + case 256: + tdm_mode = AK5558_MODE_TDM256; + break; + case 512: + tdm_mode = AK5558_MODE_TDM512; + break; + default: + tdm_mode = AK5558_MODE_NORMAL; + break; + } + + reg = snd_soc_read(codec, AK5558_03_CONTROL2); + reg &= ~AK5558_MODE_BITS; + reg |= tdm_mode; + snd_soc_write(codec, AK5558_03_CONTROL2, reg); + + return 0; +} + +#define AK5558_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ + SNDRV_PCM_FMTBIT_S24_LE |\ + SNDRV_PCM_FMTBIT_S32_LE) + +static const unsigned int ak5558_rates[] = { + 8000, 11025, 16000, 22050, + 32000, 44100, 48000, 88200, + 96000, 176400, 192000, 352800, + 384000, 705600, 768000, 1411200, + 2822400, +}; + +static const struct snd_pcm_hw_constraint_list ak5558_rate_constraints = { + .count = ARRAY_SIZE(ak5558_rates), + .list = ak5558_rates, +}; + +static int ak5558_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + int ret; + + ret = snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &ak5558_rate_constraints); + return ret; +} + +static struct snd_soc_dai_ops ak5558_dai_ops = { + .startup = ak5558_startup, + .hw_params = ak5558_hw_params, + .set_sysclk = ak5558_set_dai_sysclk, + .set_fmt = ak5558_set_dai_fmt, + .digital_mute = ak5558_set_dai_mute, + .set_tdm_slot = ak5558_set_tdm_slot, +}; + +static struct snd_soc_dai_driver ak5558_dai = { + .name = "ak5558-aif", + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 8, + .rates = SNDRV_PCM_RATE_KNOT, + .formats = AK5558_FORMATS, + }, + .ops = &ak5558_dai_ops, +}; + +static int ak5558_init_reg(struct snd_soc_codec *codec) +{ + int ret; + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + + dev_dbg(codec->dev, "%s(%d)\n", __func__, __LINE__); + + usleep_range(10000, 11000); + if (gpio_is_valid(ak5558->pdn_gpio)) { + gpio_set_value_cansleep(ak5558->pdn_gpio, 0); + usleep_range(1000, 2000); + gpio_set_value_cansleep(ak5558->pdn_gpio, 1); + usleep_range(1000, 2000); + } + + ret = snd_soc_write(codec, AK5558_00_POWER_MANAGEMENT1, 0x0); + if (ret < 0) + return ret; + + ret = snd_soc_update_bits(codec, AK5558_02_CONTROL1, AK5558_CKS, + AK5558_CKS_AUTO); + if (ret < 0) + return ret; + + return 0; +} + +static int ak5558_probe(struct snd_soc_codec *codec) +{ + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + int ret = 0; + + dev_dbg(codec->dev, "%s(%d)\n", __func__, __LINE__); + + ret = ak5558_init_reg(codec); + + ak5558->fs = 48000; + ak5558->rclk = 0; + + return ret; +} + +static int ak5558_remove(struct snd_soc_codec *codec) +{ + struct ak5558_priv *ak5558 = snd_soc_codec_get_drvdata(codec); + + ak5558_set_bias_level(codec, SND_SOC_BIAS_OFF); + + if (gpio_is_valid(ak5558->pdn_gpio)) { + gpio_set_value_cansleep(ak5558->pdn_gpio, 0); + usleep_range(1000, 2000); + } + + return 0; +} + +#ifdef CONFIG_PM +static int ak5558_runtime_suspend(struct device *dev) +{ + struct ak5558_priv *ak5558 = dev_get_drvdata(dev); + + regcache_cache_only(ak5558->regmap, true); + + if (gpio_is_valid(ak5558->pdn_gpio)) { + gpio_set_value_cansleep(ak5558->pdn_gpio, 0); + usleep_range(1000, 2000); + } + + return 0; +} + +static int ak5558_runtime_resume(struct device *dev) +{ + struct ak5558_priv *ak5558 = dev_get_drvdata(dev); + + if (gpio_is_valid(ak5558->pdn_gpio)) { + gpio_set_value_cansleep(ak5558->pdn_gpio, 0); + usleep_range(1000, 2000); + gpio_set_value_cansleep(ak5558->pdn_gpio, 1); + usleep_range(1000, 2000); + } + + regcache_cache_only(ak5558->regmap, false); + regcache_mark_dirty(ak5558->regmap); + + return regcache_sync(ak5558->regmap); +} +#endif + +const struct dev_pm_ops ak5558_pm = { + SET_RUNTIME_PM_OPS(ak5558_runtime_suspend, ak5558_runtime_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) +}; + +struct snd_soc_codec_driver soc_codec_dev_ak5558 = { + .probe = ak5558_probe, + .remove = ak5558_remove, + .idle_bias_off = true, + .set_bias_level = ak5558_set_bias_level, + + .component_driver = { + .controls = ak5558_snd_controls, + .num_controls = ARRAY_SIZE(ak5558_snd_controls), + .dapm_widgets = ak5558_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ak5558_dapm_widgets), + .dapm_routes = ak5558_intercon, + .num_dapm_routes = ARRAY_SIZE(ak5558_intercon), + }, +}; + +static const struct regmap_config ak5558_regmap = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = AK5558_05_DSD, + .reg_defaults = ak5558_reg, + .num_reg_defaults = ARRAY_SIZE(ak5558_reg), + .cache_type = REGCACHE_RBTREE, +}; + +static int ak5558_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct device_node *np = i2c->dev.of_node; + struct ak5558_priv *ak5558; + int ret = 0; + + dev_err(&i2c->dev, "%s(%d)\n", __func__, __LINE__); + + ak5558 = devm_kzalloc(&i2c->dev, sizeof(struct ak5558_priv), + GFP_KERNEL); + if (!ak5558) + return -ENOMEM; + + ak5558->regmap = devm_regmap_init_i2c(i2c, &ak5558_regmap); + if (IS_ERR(ak5558->regmap)) + return PTR_ERR(ak5558->regmap); + + i2c_set_clientdata(i2c, ak5558); + ak5558->i2c = i2c; + + ak5558->pdn_gpio = of_get_named_gpio(np, "ak5558,pdn-gpio", 0); + if (gpio_is_valid(ak5558->pdn_gpio)) { + ret = devm_gpio_request_one(&i2c->dev, ak5558->pdn_gpio, + GPIOF_OUT_INIT_LOW, "ak5558,pdn"); + if (ret) { + dev_err(&i2c->dev, "unable to get pdn gpio\n"); + return ret; + } + } + + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_ak5558, + &ak5558_dai, 1); + if (ret) + return ret; + + pm_runtime_enable(&i2c->dev); + + return 0; +} + +static int ak5558_i2c_remove(struct i2c_client *client) +{ + snd_soc_unregister_codec(&client->dev); + pm_runtime_disable(&client->dev); + + return 0; +} + +static const struct of_device_id ak5558_i2c_dt_ids[] = { + { .compatible = "asahi-kasei,ak5558"}, + { } +}; + +static const struct i2c_device_id ak5558_i2c_id[] = { + { "ak5558", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, ak5558_i2c_id); + +static struct i2c_driver ak5558_i2c_driver = { + .driver = { + .name = "ak5558", + .of_match_table = of_match_ptr(ak5558_i2c_dt_ids), + .pm = &ak5558_pm, + }, + .probe = ak5558_i2c_probe, + .remove = ak5558_i2c_remove, + .id_table = ak5558_i2c_id, +}; + +module_i2c_driver(ak5558_i2c_driver); + +MODULE_AUTHOR("Junichi Wakasugi <wakasugi.jb(a)om.asahi-kasei.co.jp>"); +MODULE_AUTHOR("Mihai Serban <mihai.serban(a)nxp.com>"); +MODULE_DESCRIPTION("ASoC AK5558 ADC driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/ak5558.h b/sound/soc/codecs/ak5558.h new file mode 100644 index 0000000..0e40c4a --- /dev/null +++ b/sound/soc/codecs/ak5558.h @@ -0,0 +1,60 @@ +/* + * ak5558.h -- audio driver for AK5558 + * + * Copyright (C) 2016 Asahi Kasei Microdevices Corporation + * Copyright 2018 NXP + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _AK5558_H +#define _AK5558_H + +#define AK5558_00_POWER_MANAGEMENT1 0x00 +#define AK5558_01_POWER_MANAGEMENT2 0x01 +#define AK5558_02_CONTROL1 0x02 +#define AK5558_03_CONTROL2 0x03 +#define AK5558_04_CONTROL3 0x04 +#define AK5558_05_DSD 0x05 + +/* AK5558_02_CONTROL1 fields */ +#define AK5558_DIF 0x02 +#define AK5558_DIF_MSB_MODE (0 << 1) +#define AK5558_DIF_I2S_MODE (1 << 1) + +#define AK5558_BITS 0x04 +#define AK5558_DIF_24BIT_MODE (0 << 2) +#define AK5558_DIF_32BIT_MODE (1 << 2) + +#define AK5558_CKS 0x78 +#define AK5558_CKS_128FS_192KHZ (0 << 3) +#define AK5558_CKS_192FS_192KHZ (1 << 3) +#define AK5558_CKS_256FS_48KHZ (2 << 3) +#define AK5558_CKS_256FS_96KHZ (3 << 3) +#define AK5558_CKS_384FS_96KHZ (4 << 3) +#define AK5558_CKS_384FS_48KHZ (5 << 3) +#define AK5558_CKS_512FS_48KHZ (6 << 3) +#define AK5558_CKS_768FS_48KHZ (7 << 3) +#define AK5558_CKS_64FS_384KHZ (8 << 3) +#define AK5558_CKS_32FS_768KHZ (9 << 3) +#define AK5558_CKS_96FS_384KHZ (10 << 3) +#define AK5558_CKS_48FS_768KHZ (11 << 3) +#define AK5558_CKS_64FS_768KHZ (12 << 3) +#define AK5558_CKS_1024FS_16KHZ (13 << 3) +#define AK5558_CKS_AUTO (15 << 3) + +/* AK5558_03_CONTROL2 fields */ +#define AK5558_MODE_BITS 0x60 +#define AK5558_MODE_NORMAL (0 << 5) +#define AK5558_MODE_TDM128 (1 << 5) +#define AK5558_MODE_TDM256 (2 << 5) +#define AK5558_MODE_TDM512 (3 << 5) + +#endif -- 2.7.4

4 10

[alsa-devel] [GIT PULL]: kbl audio firmware update
by Vinod Koul 01 Feb '18

01 Feb '18

Hi, Please PULL to receive the update for KBL audio DSP firmware. The following changes since commit 2a713be25a44bd6cec90d8affc54b246a2ca9c7b: amdgpu: update uvd firmware for polaris asics (2018-01-19 07:16:32 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/firmware.git kbl for you to fetch changes up to aab8b6fff9417a9938f6393dc09cf6ce90e55565: linux-firmware: intel: Update Kabylake audio firmware (2018-01-30 15:42:45 +0530) ---------------------------------------------------------------- Guneshwor Singh (1): linux-firmware: intel: Update Kabylake audio firmware WHENCE | 4 +++- intel/dsp_fw_kbl.bin | 2 +- intel/dsp_fw_kbl_v3266.bin | Bin 0 -> 243016 bytes 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 intel/dsp_fw_kbl_v3266.bin Thanks -- ~Vinod

2 1

[alsa-devel] [PATCH 1/1] ASoC: stm32: add of dependency for stm32 drivers
by Olivier Moysan 01 Feb '18

01 Feb '18

Add of dependency for STM32 ASoC drivers. DFSDM of dependency is already inherited from STM32_DFSDM_ADC dependency. Signed-off-by: olivier moysan <olivier.moysan(a)st.com> --- sound/soc/stm/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig index 3ad881f..b5375f9 100644 --- a/sound/soc/stm/Kconfig +++ b/sound/soc/stm/Kconfig @@ -3,6 +3,7 @@ menu "STMicroelectronics STM32 SOC audio support" config SND_SOC_STM32_SAI tristate "STM32 SAI interface (Serial Audio Interface) support" depends on ARCH_STM32 || COMPILE_TEST + depends on OF depends on SND_SOC select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO @@ -12,6 +13,7 @@ config SND_SOC_STM32_SAI config SND_SOC_STM32_I2S tristate "STM32 I2S interface (SPI/I2S block) support" depends on ARCH_STM32 || COMPILE_TEST + depends on OF depends on SND_SOC select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO @@ -21,6 +23,7 @@ config SND_SOC_STM32_I2S config SND_SOC_STM32_SPDIFRX tristate "STM32 S/PDIF receiver (SPDIFRX) support" depends on ARCH_STM32 || COMPILE_TEST + depends on OF depends on SND_SOC select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO -- 1.9.1

3 3

[alsa-devel] [PATCH 1/2] cplay: fix size and nmemb of mp3 header of fread
by Katsuhiro Suzuki 01 Feb '18

01 Feb '18

This patch swaps 'size' and 'nmemb' arguments of fread. The fread returns always 1 (because 'nmemb' is 1) so checking the return value is always failure. Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro(a)socionext.com> --- src/utils/cplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/cplay.c b/src/utils/cplay.c index e0603fd..bc95f0d 100644 --- a/src/utils/cplay.c +++ b/src/utils/cplay.c @@ -220,7 +220,7 @@ void play_samples(char *name, unsigned int card, unsigned int device, exit(EXIT_FAILURE); } - read = fread(&header, sizeof(header), 1, file); + read = fread(&header, 1, sizeof(header), file); if (read != sizeof(header)) { fprintf(stderr, "Unable to read header \n"); fclose(file); -- 2.15.0

2 3

[alsa-devel] [PATCH v6 0/6] TDA1997x HDMI video receiver
by Tim Harvey 01 Feb '18

01 Feb '18

This is a v4l2 subdev driver supporting the TDA1997x HDMI video receiver. I've tested this on a Gateworks GW54xx/GW551x with an IMX6Q/IMX6DL which uses the TDA19971 with 16bits connected to the IMX6 CSI and single-lane I2S audio providing 2-channel audio. For this configuration I've tested both 16bit YUV422 and 8bit BT656 parallel video bus modes. While the driver should support the TDA1993 I do not have one for testing. Further potential development efforts include: - CEC support - HDCP support - mbus format selection support for bus widths that support multiple formats - TDA19972 support (2 inputs) Media graphs can be found at http://dev.gateworks.com/docs/linux/media History: v6: - tda1997x: fix return on regulator enablei in tda1997x_set_power() (Fabio) - tda1997x: fix colorspace handling (Hans) - bindings: added Robs's ack (Rob) - replace copyright with SPDX tag (Philippe) v5: - added v4l2_hdmi_colorimetry() patch from Hans to series - bindings: added Sakari's ack - tda1997x: uppercase string constants - tda1997x: use v4l2_hdmi_rx_coloriemtry to fill format - tda1997x: fix V4L2_CID_DV_RX_RGB_RANGE - tda1997x: fix interlaced mode format - dts: remove leading 0 from unit address - dts: add newline between property list and child node - dts: added missing audmux in GW551x dts v4: - move include/dt-bindings/media/tda1997x.h to bindings patch - clarify port node details in bindings - fix typos - fix default quant range for VGA - fix quant range handling and conv matrix - add additional standards and capabilities to timings_cap v3: - fix typo in dt bindings - added dt bindings for GW551x - use V4L2_DV_BT_FRAME_WIDTH/HEIGHT macros - fixed missing break - use only hdmi_infoframe_log for infoframe logging - simplify tda1997x_s_stream error handling - add delayed work proc to handle hotplug enable/disable - fix set_edid (disable HPD before writing, enable after) - remove enabling edid by default - initialize timings - take quant range into account in colorspace conversion - remove vendor/product tracking (we provide this in log_status via infoframes) - add v4l_controls - add more detail to log_status - calculate vhref generator timings - timing detection fixes (rounding errors, hswidth errors) - rename configure_input/configure_conv functions v2: - encorporate feedback into dt bindings - change audio dt bindings - implement dv timings enum/cap - remove deprecated g_mbus_config op - fix dv_query_timings - add EDID get/set handling - remove max-pixel-rate support - add audio codec DAI support - added media-ctl and v4l2-compliance details v1: - initial RFC Media device topology: # media-ctl -d /dev/media0 -p Media controller API version 4.13.0 Media device information ------------------------ driver imx-media model imx-media serial bus info hw revision 0x0 driver version 4.13.0 Device topology - entity 1: adv7180 2-0020 (1 pad, 1 link) type V4L2 subdev subtype Unknown flags 20004 device node name /dev/v4l-subdev0 pad0: Source [fmt:UYVY8_2X8/720x480 field:interlaced colorspace:smpte170m] -> "ipu2_csi1_mux":1 [] - entity 3: tda19971 2-0048 (1 pad, 1 link) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev1 pad0: Source [fmt:UYVY8_1X16/640x480 field:none colorspace:srgb] [dv.caps:BT.656/1120 min:640x480@13000000 max:1920x1080@165000000 stds:CEA-861,DMT caps:progressive] [dv.detect:BT.656/1120 640x480p59 (800x525) stds:CEA-861,DMT flags:has-cea861-vic] [dv.current:BT.656/1120 1920x1080p60 (2200x1125) stds:CEA-861,DMT flags:can-reduce-fps,CE-video,has-cea861-vic] -> "ipu1_csi0_mux":1 [] - entity 5: ipu1_vdic (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev2 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_csi0":1 [] <- "ipu1_csi1":1 [] pad1: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] pad2: Source [fmt:AYUV8_1X32/640x480@1/60 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] - entity 9: ipu2_vdic (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev3 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_csi0":1 [] <- "ipu2_csi1":1 [] pad1: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] pad2: Source [fmt:AYUV8_1X32/640x480@1/60 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] - entity 13: ipu1_ic_prp (3 pads, 5 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev4 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_vdic":2 [] <- "ipu1_csi0":1 [] <- "ipu1_csi1":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpenc":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpvf":0 [] - entity 17: ipu1_ic_prpenc (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev5 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_ic_prp":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpenc capture":0 [] - entity 20: ipu1_ic_prpenc capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video0 pad0: Sink <- "ipu1_ic_prpenc":1 [] - entity 26: ipu1_ic_prpvf (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev6 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu1_ic_prp":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prpvf capture":0 [] - entity 29: ipu1_ic_prpvf capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video1 pad0: Sink <- "ipu1_ic_prpvf":1 [] - entity 35: ipu2_ic_prp (3 pads, 5 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev7 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_vdic":2 [] <- "ipu2_csi0":1 [] <- "ipu2_csi1":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpenc":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpvf":0 [] - entity 39: ipu2_ic_prpenc (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev8 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_ic_prp":1 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpenc capture":0 [] - entity 42: ipu2_ic_prpenc capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video2 pad0: Sink <- "ipu2_ic_prpenc":1 [] - entity 48: ipu2_ic_prpvf (2 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev9 pad0: Sink [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] <- "ipu2_ic_prp":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prpvf capture":0 [] - entity 51: ipu2_ic_prpvf capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video3 pad0: Sink <- "ipu2_ic_prpvf":1 [] - entity 57: ipu1_csi0 (3 pads, 4 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev10 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] <- "ipu1_csi0_mux":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] -> "ipu1_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_csi0 capture":0 [] - entity 61: ipu1_csi0 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video4 pad0: Sink <- "ipu1_csi0":2 [] - entity 67: ipu1_csi1 (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev11 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_ic_prp":0 [] -> "ipu1_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu1_csi1 capture":0 [] - entity 71: ipu1_csi1 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video5 pad0: Sink <- "ipu1_csi1":2 [] - entity 77: ipu2_csi0 (3 pads, 3 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev12 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] -> "ipu2_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_csi0 capture":0 [] - entity 81: ipu2_csi0 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video6 pad0: Sink <- "ipu2_csi0":2 [] - entity 87: ipu2_csi1 (3 pads, 4 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev13 pad0: Sink [fmt:UYVY8_2X8/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range crop.bounds:(0,0)/640x480 crop:(0,0)/640x480 compose.bounds:(0,0)/640x480 compose:(0,0)/640x480] <- "ipu2_csi1_mux":2 [] pad1: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_ic_prp":0 [] -> "ipu2_vdic":0 [] pad2: Source [fmt:AYUV8_1X32/640x480@1/30 field:none colorspace:smpte170m xfer:709 ycbcr:601 quantization:lim-range] -> "ipu2_csi1 capture":0 [] - entity 91: ipu2_csi1 capture (1 pad, 1 link) type Node subtype V4L flags 0 device node name /dev/video7 pad0: Sink <- "ipu2_csi1":2 [] - entity 97: ipu1_csi0_mux (3 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev14 pad0: Sink [fmt:unknown/0x0] pad1: Sink [fmt:unknown/0x0] <- "tda19971 2-0048":0 [] pad2: Source [fmt:unknown/0x0] -> "ipu1_csi0":0 [] - entity 101: ipu2_csi1_mux (3 pads, 2 links) type V4L2 subdev subtype Unknown flags 0 device node name /dev/v4l-subdev15 pad0: Sink [fmt:unknown/0x0] pad1: Sink [fmt:unknown/0x0] <- "adv7180 2-0020":0 [] pad2: Source [fmt:unknown/0x0] -> "ipu2_csi1":0 [] v4l2-compliance test results: (on /dev/video6 as v4l2-compliance doesn't yet support subdevs) Driver Info: Driver name : imx-media-captu Card type : imx-media-capture Bus info : platform:ipu2_csi0 Driver version: 4.13.0 Capabilities : 0x84200001 Video Capture Streaming Extended Pix Format Device Capabilities Device Caps : 0x04200001 Video Capture Streaming Extended Pix Format Compliance test for device /dev/video6 (not using libv4l2): Required ioctls: test VIDIOC_QUERYCAP: OK Allow for multiple opens: test second video open: OK test VIDIOC_QUERYCAP: OK test VIDIOC_G/S_PRIORITY: OK Debug ioctls: test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported) Input ioctls: test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported) fail: v4l2-test-input-output.cpp(418): G_INPUT not supported for a capture device test VIDIOC_G/S/ENUMINPUT: FAIL test VIDIOC_G/S_AUDIO: OK (Not Supported) Inputs: 0 Audio Inputs: 0 Tuners: 0 Output ioctls: test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported) Outputs: 0 Audio Outputs: 0 Modulators: 0 Input/Output configuration ioctls: test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported) Control ioctls: test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK test VIDIOC_G/S_CTRL: OK fail: v4l2-test-controls.cpp(574): g_ext_ctrls does not support count == 0 test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 0 Private Controls: 0 Format ioctls: test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK test VIDIOC_TRY_FMT: OK test VIDIOC_S_FMT: OK test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK (Not Supported) test Composing: OK (Not Supported) test Scaling: OK (Not Supported) Codec ioctls: test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported) test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported) Buffer ioctls: test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK Test input 0: Total: 42, Succeeded: 40, Failed: 2, Warnings: 0 Hans Verkuil (1): v4l2-dv-timings: add v4l2_hdmi_colorimetry() Tim Harvey (5): MAINTAINERS: add entry for NXP TDA1997x driver media: dt-bindings: Add bindings for TDA1997X media: i2c: Add TDA1997x HDMI receiver driver ARM: dts: imx: Add TDA19971 HDMI Receiver to GW54xx ARM: dts: imx: Add TDA19971 HDMI Receiver to GW551x .../devicetree/bindings/media/i2c/tda1997x.txt | 179 + MAINTAINERS | 8 + arch/arm/boot/dts/imx6q-gw54xx.dts | 105 + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 29 +- arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 138 + drivers/media/i2c/Kconfig | 9 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/tda1997x.c | 3476 ++++++++++++++++++++ drivers/media/v4l2-core/v4l2-dv-timings.c | 141 + include/dt-bindings/media/tda1997x.h | 74 + include/media/i2c/tda1997x.h | 41 + include/media/v4l2-dv-timings.h | 21 + 12 files changed, 4219 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/i2c/tda1997x.txt create mode 100644 drivers/media/i2c/tda1997x.c create mode 100644 include/dt-bindings/media/tda1997x.h create mode 100644 include/media/i2c/tda1997x.h -- 2.7.4

2 14

[alsa-devel] [PATCH - alsa-lib 1/1] Patch for two bugs in snd_pcm_area_silence().
by alsa2＠bushytails.net 01 Feb '18

01 Feb '18

From: furrywolf <alsa2(a)bushytails.net> First, after silencing the buffer 64 bits at a time, any remaining samples need to be silenced by the following width-specific code. However, instead of silencing the end of the buffer, the code instead re-silences the start of the buffer, leaving the end unsilenced. To fix this, update the pointer used by the width-specific code to point to the end of the area just silenced, instead of leaving it pointing to the start of the buffer. Second, the code for 24 bit samples can only silence a single sample, as there's no loop for multiple samples as with other formats. To fix this, add a loop similar to the ones used for every other width. The symptoms of these bugs are random data at the end of every supposedly silenced buffer with certain format/buffer size combinations, resulting in pops and noise. Signed-off-by: furrywolf <alsa2(a)bushytails.net> diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 69d7d66..1753cda 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -2955,6 +2955,7 @@ int snd_pcm_area_silence(const snd_pcm_channel_area_t *dst_area, snd_pcm_uframes *dstp++ = silence; if (samples == 0) return 0; + dst = (char *)dstp; } dst_step = dst_area->step / 8; switch (width) { @@ -2996,16 +2997,20 @@ int snd_pcm_area_silence(const snd_pcm_channel_area_t *dst_area, snd_pcm_uframes } break; } - case 24: + case 24: { + while (samples-- > 0) { #ifdef SNDRV_LITTLE_ENDIAN - *(dst + 0) = silence >> 0; - *(dst + 1) = silence >> 8; - *(dst + 2) = silence >> 16; + *(dst + 0) = silence >> 0; + *(dst + 1) = silence >> 8; + *(dst + 2) = silence >> 16; #else - *(dst + 2) = silence >> 0; - *(dst + 1) = silence >> 8; - *(dst + 0) = silence >> 16; + *(dst + 2) = silence >> 0; + *(dst + 1) = silence >> 8; + *(dst + 0) = silence >> 16; #endif + dst += dst_step; + } + } break; case 32: { uint32_t sil = silence; -- 1.7.10.4

2 2

Re: [alsa-devel] [PATCH] sound/tlv320dac33: Add device tree support
by Ladislav Michl 31 Jan '18

31 Jan '18

On Tue, Jan 30, 2018 at 10:11:02AM +0100, Filip Matijević wrote: > Hi, > > On 01/30/2018 09:53 AM, Pavel Machek wrote: > > On Tue 2018-01-30 09:34:46, Ladislav Michl wrote: > >> On Tue, Jan 30, 2018 at 12:33:01AM +0100, Pavel Machek wrote: > >>> On Tue 2018-01-30 00:20:31, Ladislav Michl wrote: > >>>> On Tue, Jan 30, 2018 at 12:05:39AM +0100, Pavel Machek wrote: > >>>>> > >>>>> This adds device tree support to tlv320dac33.c. > >>>>> > >>>>> Signed-off-by: Pavel Machek <pavel(a)ucw.cz> > >>>>> > >>>>> diff --git a/Documentation/devicetree/bindings/sound/tlv320dac33.txt b/Documentation/devicetree/bindings/sound/tlv320dac33.txt > >>>>> new file mode 100644 > >>>>> index 0000000..6cbd311 > >>>>> --- /dev/null > >>>>> +++ b/Documentation/devicetree/bindings/sound/tlv320dac33.txt > >>>>> @@ -0,0 +1,32 @@ > >>>>> +Texas Instruments - tlv320dac33 Codec module > >>>>> + > >>>>> +The tlv320dac33 serial control bus communicates through I2C protocols. > >>>>> + > >>>>> +Required properties: > >>>>> + > >>>>> +- compatible - "ti,tlv320dac33" > >>>>> +- reg - I2C slave address > >>>>> + > >>>>> +Optional properties: > >>>>> + > >>>>> +- power-gpios - gpio pin to power the device, active high > >>>> > >>>> While driver used gpio in platform data, isn't it more likely > >>>> regulator which powers device? > >>> > >>> power-gpios = <&gpio2 28 0>; /* gpio_60 */ > >>> > >>> Looks like GPIO to me -- example is from Nokia N9. So this appears to > >>> be correct. > >> > >> Device datasheet doesn't list any pin which looks like "power-gpio" > >> http://www.ti.com/lit/ds/symlink/tlv320dac32.pdf > >> Unfortunately I do not know much about N9, but was able to find Nokia 5610 > >> scheme to get clue how could be tlv320dac33 hardwired (see page 2): > >> http://mastermobile.spb.ru/service/nokia_5610_rm-242_service_schematics.pdf > >> Here AVDD is powered by LP3985 voltage regulator which is enabled using > >> VEN pin which might be connected to gpio. Or there could be completely > >> different voltage regulator with different controls. And since Linux > >> already has voltage regulator class, lets not limit ourselves to gpio > >> pins. > > > > Well, notice I'm converting existing driver to device tree. And that > > one already has GPIO dependency. It is possible that more work needs > > to be done there, but that should not be a reason to delay this. Feel > > free to help. Adding DT properties that need to be maintained for compatibility reasons is a bad idea and very good reason to delay merging unfinished stuff. And meanwhile it turned out it is not power-gpio :) > According to N9 schematics > http://www.s-manuals.com/manuals/phone/nokia/nokia_n9_rm-696_service_schema… > it's in fact GPIO pin that is connected to reset line (labeled > CODEC_RST). So calling it "power" might be misleading, but the driver > code is quite clear as it labels that GPIO as "tlv320dac33 reset" Thanks a lot! So now it is clear that gpio is connected to codec's nRESET pin, therefore "reset-gpios" property seems reasonable here. ladis

3 5

[alsa-devel] [alsa-lib] [PATCH] pcm: add set and get methods for no-rewind flag
by Sriram Periyasamy 31 Jan '18

31 Jan '18

From: Ramesh Babu <ramesh.babu(a)intel.com> Add functions to set/get no-rewind flag Signed-off-by: Ramesh Babu <ramesh.babu(a)intel.com> Signed-off-by: Sriram Periyasamy <sriramx.periyasamy(a)intel.com> --- include/pcm.h | 2 ++ include/sound/asound.h | 1 + src/pcm/pcm.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/pcm/pcm_local.h | 1 + 4 files changed, 44 insertions(+) diff --git a/include/pcm.h b/include/pcm.h index 2619c8cd8bd4..8c0b19c106b0 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -805,6 +805,8 @@ int snd_pcm_hw_params_set_export_buffer(snd_pcm_t *pcm, snd_pcm_hw_params_t *par int snd_pcm_hw_params_get_export_buffer(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); int snd_pcm_hw_params_set_period_wakeup(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val); int snd_pcm_hw_params_get_period_wakeup(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); +int snd_pcm_hw_params_set_no_rewind(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val); +int snd_pcm_hw_params_get_no_rewind(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val); int snd_pcm_hw_params_get_period_time(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); int snd_pcm_hw_params_get_period_time_min(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir); diff --git a/include/sound/asound.h b/include/sound/asound.h index 6041cab27a23..35fd50ec5395 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -375,6 +375,7 @@ typedef int snd_pcm_hw_param_t; #define SNDRV_PCM_HW_PARAMS_NORESAMPLE (1<<0) /* avoid rate resampling */ #define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER (1<<1) /* export buffer */ #define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP (1<<2) /* disable period wakeups */ +#define SNDRV_PCM_HW_PARAMS_NO_REWINDS (1<<3) /* disable rewinds */ struct snd_interval { unsigned int min, max; diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 69d7d66500ea..c7041be47be6 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -4763,6 +4763,46 @@ int snd_pcm_hw_params_get_period_wakeup(snd_pcm_t *pcm, snd_pcm_hw_params_t *par } /** + * \brief Configure no-rewind flag through configuration space + * \param pcm PCM handle + * \param params Configuration space + * \param val 0 = disable (default), 1 = enable (default) no-rewind flag + * \return Zero on success, otherwise a negative error code. + * + * This function can be called to inform driver about application uses rewind or not + * + * Based on no-rewind flag, underlying driver could take decision on buffering scheme. + */ + +/* TODO: Invert the logic with function name set_rewind */ +int snd_pcm_hw_params_set_no_rewind(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val) +{ + assert(pcm && params); + + if (val) { + params->flags |= SND_PCM_HW_PARAMS_NO_REWINDS; + } else + params->flags &= ~SND_PCM_HW_PARAMS_NO_REWINDS; + params->rmask = ~0; + + return snd_pcm_hw_refine(pcm, params); +} + +/** + * \brief Extract no-rewind flag from a configuration space + * \param pcm PCM handle + * \param params Configuration space + * \param val 0 = disabled, 1 = enabled no-rewind flag + * \return Zero on success, otherwise a negative error code. + */ +int snd_pcm_hw_params_get_no_rewind(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val) +{ + assert(pcm && params && val); + *val = params->flags & SND_PCM_HW_PARAMS_NO_REWINDS ? 0 : 1; + return 0; +} + +/** * \brief Extract period time from a configuration space * \param params Configuration space * \param val Returned approximate period duration in us diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h index 3d95e1749169..91479cabff88 100644 --- a/src/pcm/pcm_local.h +++ b/src/pcm/pcm_local.h @@ -103,6 +103,7 @@ #define SND_PCM_HW_PARAMS_NORESAMPLE SNDRV_PCM_HW_PARAMS_NORESAMPLE #define SND_PCM_HW_PARAMS_EXPORT_BUFFER SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER #define SND_PCM_HW_PARAMS_NO_PERIOD_WAKEUP SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP +#define SND_PCM_HW_PARAMS_NO_REWINDS SNDRV_PCM_HW_PARAMS_NO_REWINDS #define SND_PCM_INFO_MONOTONIC 0x80000000 -- 2.7.4

3 2

[alsa-devel] [PATCH] iio: adc: STM32_DFSDM_ADC should depend on HAS_DMA
by Geert Uytterhoeven 30 Jan '18

30 Jan '18

If NO_DMA=y: ERROR: "bad_dma_ops" [drivers/iio/adc/stm32-dfsdm-adc.ko] undefined! Add a dependency on HAS_DMA to fix this. Fixes: e2e6771c64625165 ("IIO: ADC: add STM32 DFSDM sigma delta ADC support") Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> --- drivers/iio/adc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 39e3b345a6c84033..d976c64107c8e9fd 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -683,6 +683,7 @@ config STM32_DFSDM_CORE config STM32_DFSDM_ADC tristate "STMicroelectronics STM32 dfsdm adc" depends on (ARCH_STM32 && OF) || COMPILE_TEST + depends on HAS_DMA select STM32_DFSDM_CORE select REGMAP_MMIO select IIO_BUFFER_HW_CONSUMER -- 2.7.4

2 3

[alsa-devel] [PATCH 1/2] ASoC: rt5514: Fix rt5514_spi_burst_read() buffer passing
by Geert Uytterhoeven 30 Jan '18

30 Jan '18

rt5514_dsp_voice_wake_up_put() passes "(u8 *)&buf" to rt5514_spi_burst_read(), where the cast is needed to silence a compiler warning: sound/soc/codecs/rt5514.c: In function ‘rt5514_dsp_voice_wake_up_put’: sound/soc/codecs/rt5514.c:357: warning: passing argument 2 of ‘rt5514_spi_burst_read’ from incompatible pointer type However, as the variable is declared as an array ("u8 buf[8]"), the function should just pass "buf" instead. Fixes: fc9cab05837639ce ("ASoC: rt5514: The DSP clock can be calibrated by the other clock source") Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> --- sound/soc/codecs/rt5514.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index 198df016802f826d..19f01558fbca677f 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -354,8 +354,7 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol, msleep(20); #if IS_ENABLED(CONFIG_SND_SOC_RT5514_SPI) rt5514_spi_burst_read(RT5514_PLL3_CALIB_CTRL6 | - RT5514_DSP_MAPPING, - (u8 *)&buf, sizeof(buf)); + RT5514_DSP_MAPPING, buf, sizeof(buf)); #else dev_err(codec->dev, "There is no SPI driver for" " loading the firmware\n"); -- 2.7.4

1 1

[alsa-devel] [PATCH 0/3] Add SPIB Support for Intel Skylake platforms
by Sriram Periyasamy 30 Jan '18

30 Jan '18

Skylake audio controller supports SPIB (Software Position in buffer) capability, which can be used to inform position of application pointer to host DMA controller. When SPIB mode is enabled, driver could write the application pointer position in SPIB register. Host DMA will make sure it won't read/write beyond bytes specified in SPIB register. SPIB mode will be useful in low power use cases, where DSP could pre-fetch large buffers to avoid frequent wakes caused due to interrupts. To support SPIB in the driver, save the spib values in stream context which can be restored during resume from S3. Add new hw_params flag to explicitly tell driver that rewinds will never be used. Pierre-Louis Bossart (1): ALSA: core: let low-level driver or userspace disable rewinds Ramesh Babu (2): ALSA: hda: ext: add spib to stream context ASoC: Intel: Skylake: Add support for spib mode include/sound/hdaudio_ext.h | 1 + include/sound/pcm.h | 1 + include/uapi/sound/asound.h | 1 + sound/core/pcm_native.c | 8 ++++++++ sound/hda/ext/hdac_ext_stream.c | 2 ++ sound/soc/intel/skylake/skl-pcm.c | 43 ++++++++++++++++++++++++++++++++++++++- 6 files changed, 55 insertions(+), 1 deletion(-) -- 2.7.4

4 6

[alsa-devel] ASoC Compress FE open causing warning
by b_lkasam＠codeaurora.org 30 Jan '18

30 Jan '18

Hi ALSA team, This is wrt soc_compr_open_fe() call result in warning in API triggered from it snd_soc_runtime_activate(fe, stream).. Due to lock taken is &fe->card->mutex, but expected to take &fe->pcm_mutex. Below line results in warning since pcm_mutex lock is not taken.. void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream) { ... lockdep_assert_held(&rtd->pcm_mutex); } Warning seen as below -> <4>[ 263.555973] [3: writer: 8681] WARNING: CPU: 3 PID: 8681 at /home/min47.lee/ext-drive/j8plus-oos/android/kernel/sound/soc/soc-pcm.c:71 snd_soc_runtime_activate+0x11c/0x130() <6>[ 263.572125] [3: writer: 8681] Modules linked in: <6>[ 263.572176] [3: writer: 8681] CPU: 3 PID: 8681 Comm: writer Tainted: G W 3.18.71-g9888952 #3 <6>[ 263.572253] [3: writer: 8681] Hardware name: Samsung J8-Plus LTE EUR OPEN Rev01 (DT) <0>[ 263.572317] [3: writer: 8681] Call trace: <6>[ 263.576842] [3: writer: 8681] [<ffffffc00008aae4>] dump_backtrace+0x0/0x15c <6>[ 263.576904] [3: writer: 8681] [<ffffffc00008ac54>] show_stack+0x14/0x1c <6>[ 263.576966] [3: writer: 8681] [<ffffffc0011a1cb0>] dump_stack+0x80/0xa4 <6>[ 263.577025] [3: writer: 8681] [<ffffffc0000a6bf0>] warn_slowpath_common+0x88/0xac <6>[ 263.577088] [3: writer: 8681] [<ffffffc0000a6d2c>] warn_slowpath_null+0x18/0x20 <6>[ 263.577152] [3: writer: 8681] [<ffffffc000f0141c>] snd_soc_runtime_activate+0x11c/0x130 <6>[ 263.577221] [3: writer: 8681] [<ffffffc000f05e74>] soc_compr_open_fe+0x204/0x29c <6>[ 263.577289] [3: writer: 8681] [<ffffffc000eddbac>] snd_compr_open+0x170/0x1b4 <6>[ 263.577355] [3: writer: 8681] [<ffffffc000ebfc78>] snd_open+0x13c/0x154 <6>[ 263.577415] [3: writer: 8681] [<ffffffc0001d72e8>] chrdev_open+0x140/0x188 <6>[ 263.577476] [3: writer: 8681] [<ffffffc0001d0758>] do_dentry_open+0x260/0x2d8 <6>[ 263.577545] [3: writer: 8681] [<ffffffc0001d1938>] vfs_open+0x60/0x6c <6>[ 263.577605] [3: writer: 8681] [<ffffffc0001e0ea8>] do_last+0x804/0xb3c <6>[ 263.577665] [3: writer: 8681] [<ffffffc0001e141c>] path_openat+0x23c/0x5f4 <6>[ 263.577732] [3: writer: 8681] [<ffffffc0001e2108>] do_filp_open+0x40/0xa8 <6>[ 263.577796] [3: writer: 8681] [<ffffffc0001d1cf4>] do_sys_open+0x174/0x224 <6>[ 263.577866] [3: writer: 8681] [<ffffffc0002212f4>] compat_SyS_openat+0xc/0x14 With Regards, Laxminath Kasam

3 5

[alsa-devel] [PATCH v8 0/3] ASoC: Intel: Skylake: Add a clk driver to enable ssp clks early
by Sriram Periyasamy 29 Jan '18

29 Jan '18

Clock driver patches have been applied. These remaining patches are rebased on "topic/intel". The first patch enables the mclk and ssp sclk early for eve machine driver and the remaining two patches are effort to add more meaning to the DSP replies for easy debugging. Naveen M (1): ASoC: Intel: eve: Enable mclk and ssp sclk early Subhransu S. Prusty (2): ASoC: Intel: Skylake: Make DSP replies more human readable ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC sound/soc/intel/boards/Kconfig | 1 + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 94 ++++++++++++++++++++++ sound/soc/intel/skylake/skl-sst-ipc.c | 50 +++++++++--- 3 files changed, 134 insertions(+), 11 deletions(-) -- 2.7.4

1 3

[alsa-devel] [GIT PULL] ASoC updates for v4.16
by Mark Brown 29 Jan '18

29 Jan '18

The following changes since commit 700c17ca8968f473631594e8a7c2cc880ba2c891: ASoC: use seq_file to dump the contents of dai_list,platform_list and codec_list (2018-01-18 11:52:23 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.16-4 for you to fetch changes up to e0a663f24d532c7ad9ff34cc1aa96bf94c75ef44: Merge remote-tracking branch 'asoc/topic/wm8998' into asoc-next (2018-01-26 15:27:56 +0000) ---------------------------------------------------------------- ASoC: Updates for v4.16 With the merge window having been delayed for another week here's another batch of updates that came in during that week. There's a few important fixes in here, mainly a fix for I/O on a number of devices caused by some of the component rework and a fix for a potential issue if more than one component in a link provides compressed operations. ---------------------------------------------------------------- Alaa Hleihel (1): net/mlx5: Fix memory leak in bad flow of mlx5_alloc_irq_vectors Alexei Starovoitov (1): bpf: fix 32-bit divide by zero Alexey Dobriyan (1): proc: fix coredump vs read /proc/*/stat race Alexey Kodanev (1): ip6_gre: init dev->mtu and dev->hard_header_len correctly Andi Kleen (3): x86/idt: Mark IDT tables __initconst module: Add retpoline tag to VERMAGIC x86/retpoline: Optimize inline assembler for vmexit_fill_RSB Andrey Ryabinin (1): x86/kasan: Panic if there is not enough memory to boot Arnd Bergmann (5): Input: of_touchscreen - add MODULE_LICENSE arm64: dts: socfpga: add missing interrupt-parent net: cs89x0: add MODULE_LICENSE fm10k: mark PM functions as __maybe_unused phy: work around 'phys' references to usb-nop-xceiv devices Arvind Yadav (1): MIPS: ralink: Fix platform_get_irq's error checking Ben Skeggs (1): drm/nouveau/mmu/mcp77: fix regressions in stolen memory handling Benjamin Beichler (1): mac80211_hwsim: add workqueue to wait for deferred radio deletion on mod unload Benjamin Herrenschmidt (1): powerpc: Don't preempt_disable() in show_cpuinfo() Benoît Thébaudeau (1): mmc: sdhci-esdhc-imx: Fix i.MX53 eSDHCv3 clock Charles Keepax (3): ASoC: compress: Correct handling of copy callback ASoC: compress: Remove some extraneous blank lines ASoC: compress: Fixup error messages Chen-Yu Tsai (1): ARM: dts: sun[47]i: Fix display backend 1 output to TCON0 remote endpoint Christian Borntraeger (1): KVM: s390: wire up bpb feature Christoffer Dall (1): KVM: arm64: Fix GICv4 init when called from vgic_its_create Christoph Hellwig (1): nvme-pci: take sglist coalescing in dma_map_sg into account Christophe Leroy (1): net: fs_enet: do not call phy_stop() in interrupts Colin Ian King (1): bpf: fix spelling mistake: "obusing" -> "abusing" Cong Wang (2): tipc: fix a memory leak in tipc_nl_node_get_link() tun: fix a memory leak for tfile->tx_array Dan Carpenter (1): IB/hfi1: Prevent a NULL dereference Daniel Borkmann (7): bpf: arsh is not supported in 32 bit alu thus reject it bpf, array: fix overflow in max_entries and undefined behavior in index_mask bpf, arm64: fix stack_depth tracking in combination with tail calls net, sched: fix panic when updating miniq {b,q}stats bpf: reject stores into ctx via st and xadd bpf: fix cls_bpf on filter replace bpf: mark dst unknown on inconsistent {s, u}bounds adjustments Dave Airlie (4): Merge branch 'vmwgfx-fixes-4.15' of git://people.freedesktop.org/~thomash/linux into drm-fixes Merge tag 'drm-misc-fixes-2018-01-17' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes Merge tag 'drm-intel-fixes-2018-01-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes David Ahern (1): netlink: extack needs to be reset each time through loop David S. Miller (9): Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge tag 'mlx5-fixes-2018-01-11' of git://git.kernel.org/.../saeed/linux Merge git://git.kernel.org/.../bpf/bpf Merge branch 'ipv4-Make-neigh-lookup-keys-for-loopback-point-to-point-devices-be-INADDR_ANY' Merge tag 'mac80211-for-davem-2018-01-15' of git://git.kernel.org/.../jberg/mac80211 Merge tag 'linux-can-fixes-for-4.15-20180116' of ssh://gitolite.kernel.org/.../mkl/linux-can Merge git://git.kernel.org/.../bpf/bpf Merge tag 'wireless-drivers-for-davem-2018-01-17' of git://git.kernel.org/.../kvalo/wireless-drivers Merge tag 'linux-can-fixes-for-4.15-20180118' of ssh://gitolite.kernel.org/.../mkl/linux-can David Woodhouse (1): x86/retpoline: Fill RSB on context switch for affected CPUs Dennis Yang (1): dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6 Dominik Brodowski (1): nl80211: take RCU read lock when calling ieee80211_bss_get_ie() Eran Ben Elisha (2): {net,ib}/mlx5: Don't disable local loopback multicast traffic when needed net/mlx5: Fix mlx5_get_uars_page to return error code Eric Biggers (2): af_key: fix buffer overread in verify_address_len() af_key: fix buffer overread in parse_exthdrs() Eric Dumazet (3): bpf: fix divides by zero ipv6: ip6_make_skb() needs to clear cork.base.dst flow_dissector: properly cap thoff field Eric W. Biederman (1): x86/mm/pkeys: Fix fill_sig_info_pkey Fabio Estevam (1): ASoC: sgtl5000: Clarify a bit about the ER1 meaning Feras Daoud (2): net/mlx5: Update ptp_clock_event foreach PPS event net/mlx5e: Remove timestamp set from netdevice open flow Florian Westphal (2): xfrm: skip policies marked as dead while rehashing xfrm: don't call xfrm_policy_cache_flush while holding spinlock Gal Pressman (2): net/mlx5e: Keep updating ethtool statistics when the interface is down net/mlx5e: Don't override netdev features field unless in error flow Gregory CLEMENT (1): ARM64: dts: marvell: armada-cp110: Fix clock resources for various node Guenter Roeck (1): bcma: Fix 'allmodconfig' and BCMA builds on MIPS targets Guillaume Nault (1): ppp: unlock all_ppp_mutex before registering device Hannes Reinecke (1): scsi: libsas: Disable asynchronous aborts for SATA devices Harsha Priya (1): ASoC: Intel: kbl: Enable mclk and ssp sclk early Herbert Xu (3): xfrm: Forbid state updates from changing encap type xfrm: Use __skb_queue_tail in xfrm_trans_queue xfrm: Return error on unknown encap_type in init_state Ido Schimmel (1): mlxsw: spectrum_router: Free LPM tree upon failure Ilya Lesokhin (1): net/tls: Only attach to sockets in ESTABLISHED state Jakub Kicinski (1): nfp: use the correct index for link speed table James Hogan (7): MIPS: Fix CPS SMP NS16550 UART defaults MIPS: CM: Drop WARN_ON(vp != 0) MIPS: mm: Fix duplicate "const" on insn_table_MM MIPS: Implement __multi3 for GCC7 MIPS64r6 builds ssb: Disable PCI host for PCI_DRIVERS_GENERIC MIPS: Fix undefined reference to physical_memsize MAINTAINERS: Add James as MIPS co-maintainer Jeffy Chen (1): ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink Jeremy Compostella (1): i2c: core-smbus: prevent stack corruption on read I2C_BLOCK_DATA Jim Westfall (2): net: Allow neigh contructor functions ability to modify the primary_key ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY Joe Thornber (1): dm btree: fix serious bug in btree_split_beneath() Johan Hovold (3): Input: twl4030-vibra - fix sibling-node lookup Input: twl6040-vibra - fix child-node lookup Input: 88pm860x-ts - fix child-node lookup Johannes Berg (5): cfg80211: fully initialize old channel for event mac80211_hwsim: validate number of different channels cfg80211: check dev_set_name() return value netlink: extack: avoid parenthesized string constant warning cfg80211: fix station info handling bugs Jon Hunter (1): drm/nouveau/bar/gk20a: Avoid bar teardown during init Jonas Gorski (1): MIPS: AR7: ensure the port type's FCR value is used Jonathan Liu (3): drm/sun4i: hdmi: Check for unset best_parent in sun4i_tmds_determine_rate drm/sun4i: hdmi: Fix incorrect assignment in sun4i_tmds_determine_rate drm/sun4i: hdmi: Add missing rate halving check in sun4i_tmds_determine_rate Josh Poimboeuf (2): objtool: Fix seg fault with gold linker objtool: Improve error message for bad file argument Josh Snyder (1): delayacct: Account blkio completion on the correct task Kai-Heng Feng (1): r8152: disable RX aggregation on Dell TB16 dock Kan Liang (1): perf/x86/rapl: Fix Haswell and Broadwell server RAPL event Keith Busch (1): nvme-pci: check segement valid for SGL use Kirill A. Shutemov (1): kdump: Write the correct address of mem_section into vmcoreinfo Kuninori Morimoto (4): ASoC: soc-core: snd_soc_rtdcom_lookup() cares component driver name ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free() ASoC: ak4613: call dummy write for PW_MGMT1/3 when Playback ASoC: soc-pcm: rename .pmdown_time to .use_pmdown_time for Component Ladislav Michl (2): ASoC: sam9g20_wm8731: use dev_*() logging functions ASoC: sam9x5_wm8731: Drop 'ASoC' prefix from error messages Laura Abbott (1): x86: Use __nostackprotect for sme_encrypt_kernel Len Brown (3): x86/tsc: Future-proof native_calibrate_tsc() x86/tsc: Fix erroneous TSC rate on Skylake Xeon x86/tsc: Print tsc_khz, when it differs from cpu_khz Leon Romanovsky (1): RDMA/mlx5: Fix out-of-bound access while querying AH Li Jinyue (1): futex: Prevent overflow by strengthen input validation Linus Torvalds (34): Merge tag 'trace-v4.15-rc4-2' of git://git.kernel.org/.../rostedt/linux-trace Merge tag 'sound-4.15' of git://git.kernel.org/.../tiwai/sound Merge git://git.kernel.org/.../davem/net Merge tag 'for-linus' of git://git.kernel.org/.../rdma/rdma Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-pti-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'gpio-v4.15-5' of git://git.kernel.org/.../linusw/linux-gpio Merge tag 'mmc-v4.15-rc2-3' of git://git.kernel.org/.../ulfh/mmc Merge branch 'for-linus' of git://git.kernel.dk/linux-block Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm Merge git://git.kernel.org/.../davem/net Merge branch 'akpm' (patches from Andrew) Merge tag 'drm-fixes-for-v4.15-rc9' of git://people.freedesktop.org/~airlied/linux Merge tag 'powerpc-4.15-8' of git://git.kernel.org/.../powerpc/linux Merge tag 'armsoc-fixes' of git://git.kernel.org/.../arm/arm-soc Merge branch 'for-4.15-fixes' of git://git.kernel.org/.../tj/wq Merge branch 'for-4.15-fixes' of git://git.kernel.org/.../tj/cgroup Merge branch 'for-4.15-fixes' of git://git.kernel.org/.../tj/libata Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/.../wsa/linux Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge tag 'trace-v4.15-rc4-3' of git://git.kernel.org/.../rostedt/linux-trace Merge tag 'for-4.15/dm-fixes-2' of git://git.kernel.org/.../device-mapper/linux-dm Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge tag 'mips_fixes_4.15_2' of git://git.kernel.org/.../jhogan/mips Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge branch 'for-linus' of git://git.kernel.org/.../mattst88/alpha Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-pti-for-linus' of git://git.kernel.org/.../tip/tip Linux 4.15-rc9 Linus Walleij (1): gpio: mmio: Also read bits that are zero Lixin Wang (1): i2c: core: decrease reference count of device node in i2c_unregister_device Lorenzo Colitti (1): net: ipv4: Make "ip route get" match iif lo rules again. Lorenzo Pieralisi (1): alpha/PCI: Fix noname IRQ level detection Maor Gottlieb (1): net/mlx5: Fix error handling in load one Marc Kleine-Budde (2): can: af_can: can_rcv(): replace WARN_ONCE by pr_warn_once can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once Marc Zyngier (1): arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls Marcelo Ricardo Leitner (1): sctp: avoid compiler warning on implicit fallthru Mark Brown (35): Merge branches 'topic/twl4030' and 'topic/twl6040' of https://git.kernel.org/.../broonie/sound into asoc-twl-breakage Merge branch 'fix/compress' of https://git.kernel.org/.../broonie/sound into asoc-compress Merge remote-tracking branch 'asoc/fix/core' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus Merge remote-tracking branches 'asoc/fix/compress' and 'asoc/fix/mtk' into asoc-linus Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/intel' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm186x' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next Merge remote-tracking branch 'asoc/topic/twl-breakage' into asoc-next Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ak4613', 'asoc/topic/amd', 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next Merge remote-tracking branches 'asoc/topic/bcm2835', 'asoc/topic/codecs', 'asoc/topic/compress' and 'asoc/topic/cq93vc' into asoc-next Merge remote-tracking branches 'asoc/topic/cs35l32', 'asoc/topic/cs35l34', 'asoc/topic/cs42l52', 'asoc/topic/cs42l56' and 'asoc/topic/cs42l73' into asoc-next Merge remote-tracking branches 'asoc/topic/cs47l24', 'asoc/topic/cx20442', 'asoc/topic/da7213', 'asoc/topic/da7218' and 'asoc/topic/dai-drv' into asoc-next Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs', 'asoc/topic/disconnect', 'asoc/topic/dmic' and 'asoc/topic/ep93xx' into asoc-next Merge remote-tracking branches 'asoc/topic/eukrea-tlv320', 'asoc/topic/fsl', 'asoc/topic/fsl-ssi' and 'asoc/topic/fsl_asrc' into asoc-next Merge remote-tracking branches 'asoc/topic/hdac_hdmi', 'asoc/topic/hisilicon', 'asoc/topic/iio' and 'asoc/topic/max98373' into asoc-next Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/max98927', 'asoc/topic/mc13783', 'asoc/topic/msm8916' and 'asoc/topic/mt8173' into asoc-next Merge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/mxs', 'asoc/topic/mxs-sgtl5000', 'asoc/topic/nau8540' and 'asoc/topic/nau8824' into asoc-next Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/nuc900' into asoc-next Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5514' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/sam9g20_wm8731', 'asoc/topic/sam9x5_wm8731', 'asoc/topic/samsung' and 'asoc/topic/sgtl5000' into asoc-next Merge remote-tracking branches 'asoc/topic/si476x', 'asoc/topic/simple', 'asoc/topic/spdif', 'asoc/topic/st-dfsdm' and 'asoc/topic/stm32' into asoc-next Merge remote-tracking branches 'asoc/topic/sun4i-i2s', 'asoc/topic/sun8i-codec', 'asoc/topic/sunxi', 'asoc/topic/symmetry' and 'asoc/topic/tas5720' into asoc-next Merge remote-tracking branches 'asoc/topic/tas6424', 'asoc/topic/tfa9879', 'asoc/topic/tlv320aic31xx', 'asoc/topic/tlv320aic32x4' and 'asoc/topic/tlv320aic3x' into asoc-next Merge remote-tracking branches 'asoc/topic/tlv320dac33', 'asoc/topic/ts3a227e' and 'asoc/topic/tscs42xx' into asoc-next Merge remote-tracking branches 'asoc/topic/uda1380', 'asoc/topic/uniphier' and 'asoc/topic/utils' into asoc-next Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm0010', 'asoc/topic/wm2000', 'asoc/topic/wm5102' and 'asoc/topic/wm5110' into asoc-next Merge remote-tracking branches 'asoc/topic/wm8350', 'asoc/topic/wm8400', 'asoc/topic/wm8903', 'asoc/topic/wm8994' and 'asoc/topic/wm8997' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8998' into asoc-next Masami Hiramatsu (3): retpoline: Introduce start/end markers of indirect thunk kprobes/x86: Blacklist indirect thunk functions for kprobes kprobes/x86: Disable optimizing on the function jumps to indirect thunk Mathieu Malaterre (1): ARM: dts: da850-lcdk: Remove leading 0x and 0s from unit address Matt Redfearn (4): MIPS: ath25: Avoid undefined early_serial_setup() without SERIAL_8250_CONSOLE MIPS: RB532: Avoid undefined early_serial_setup() without SERIAL_8250_CONSOLE MIPS: RB532: Avoid undefined mac_pton without GENERIC_NET_UTILS MIPS: BCM47XX Avoid compile error with MIPS allnoconfig Matthew Wilcox (2): sparse doesn't support struct randomization ia64: Rewrite atomic_add and atomic_sub Matthias Kaehlcke (1): ASoC: dmic: Fix check of return value from read of 'num-channels' Maxime Ripard (1): ARM: sunxi_defconfig: Enable CMA Michael Cree (1): alpha: extend memset16 to EV6 optimised routines Michael Ellerman (4): powerpc/xmon: Add RFI flush related fields to paca dump powerpc/xmon: Don't print hashed pointers in paca dump powerpc/64s: Wire up cpu_show_meltdown() powerpc/64s: Allow control of RFI flush via debugfs Michael S. Tsirkin (1): ptr_ring: document usage around __ptr_ring_peek Michal Suchanek (1): powerpc/pseries: include linux/types.h in asm/hvcall.h Mike Maloney (1): ipv6: fix udpv6 sendmsg crash caused by too small MTU Mikulas Patocka (1): dm integrity: don't store cipher request on the stack Milan Broz (1): dm crypt: fix crash by adding missing check for auth key size Minchan Kim (1): mm/memory.c: release locked page in do_swap_page() Mylene JOSSERAND (1): ASoC: sun8i-codec: Add ADC support for a33 Nick Desaulniers (1): Input: synaptics-rmi4 - prevent UAF reported by KASAN Nir Perry (1): Input: ALPS - fix multi-touch decoding on SS4 plus touchpads Olof Johansson (3): Merge tag 'davinci-for-v4.16/dt' of https://git.kernel.org/.../nsekhar/linux-davinci into fixes Merge tag 'mvebu-fixes-4.15-1' of git://git.infradead.org/linux-mvebu into fixes Merge tag 'sunxi-fixes-for-4.15-2' of https://git.kernel.org/.../sunxi/linux into fixes Ondrej Kozina (1): dm crypt: wipe kernel key copy after IV initialization Oscar Salvador (1): mm/page_owner.c: remove drain_all_pages from init_early_allocated_pages Paolo Bonzini (1): x86/cpufeature: Move processor tracing out of scattered features Paul Mackerras (1): KVM: PPC: Book3S: Provide information about hardware/firmware CVE workarounds Peter Zijlstra (1): futex: Avoid violating the 10th rule of futex Punit Agrawal (1): KVM: arm/arm64: Check pagesize when allocating a hugepage at Stage 2 Radim Krčmář (2): Merge tag 'kvm-arm-fixes-for-v4.15-3-v2' of git://git.kernel.org/.../kvmarm/kvmarm Merge tag 'kvm-ppc-cve-4.15-2' of git://git.kernel.org/.../paulus/powerpc Randy Dunlap (1): tracing: Prevent PROFILE_ALL_BRANCHES when FORTIFY_SOURCE=y Rex Chang (1): Net: ethernet: ti: netcp: Fix inbound ping crash if MTU size is greater than 1500 Rob Clark (1): drm/vmwgfx: fix memory corruption with legacy/sou connectors Roland Dreier (1): qed: Fix potential use-after-free in qed_spq_post() Roman Gushchin (1): cgroup: make cgroup.threads delegatable Russell King (8): ARM: net: bpf: avoid 'bx' instruction on non-Thumb capable CPUs ARM: net: bpf: fix tail call jumps ARM: net: bpf: fix stack alignment ARM: net: bpf: move stack documentation ARM: net: bpf: correct stack layout documentation ARM: net: bpf: fix register saving ARM: net: bpf: fix LDX instructions ARM: net: bpf: clarify tail_call index Ryan Lee (1): ASoC: max98373 Changed SPDX header in C++ comments style Ryder Lee (1): ASoC: mediatek: fix double free in mt2701_afe_pcm_dev_probe() Sabrina Dubroca (4): xfrm: fix rcu usage in xfrm_get_type_offload tls: fix sw_ctx leak tls: return -EBUSY if crypto_info is already set tls: reset crypto_info when do_tls_setsockopt_tx fails Saeed Mahameed (1): net/mlx5: Fix get vector affinity helper function Sagi Grimberg (1): iser-target: Fix possible use-after-free in connection establishment error Sergei Shtylyov (1): sh_eth: fix dumping ARSTR Sergey Senozhatsky (1): workqueue: avoid hard lockups in show_workqueue_state() Sriram Periyasamy (2): ASoC: Intel: Skylake: Add ssp clock driver ASoC: Intel: Skylake: Add extended I2S config blob support in Clock driver Steffen Klassert (3): esp: Fix GRO when the headers not fully in the linear part of the skb. af_key: Fix memory leak in key_notify_policy. xfrm: Fix a race in the xdst pcpu cache. Stephane Grosjean (1): can: peak: fix potential bug in packet fragmentation Stephen Hemminger (1): 9p: add missing module license for xen transport Steven Rostedt (VMware) (3): ring-buffer: Bring back context level recursive checks ring-buffer: Fix duplicate results in mapping context to bits in recursive lock tracing: Fix converting enum's from the map in trace_event_eval_update() Takashi Iwai (4): ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant ALSA: hda - Apply the existing quirk to iMac 14,1 ALSA: pcm: Remove yet superfluous WARN_ON() ALSA: seq: Make ioctls race-free Tariq Toukan (2): net/mlx5e: Add error print in ETS init net/mlx5e: Check support before TC swap in ETS init Thierry Reding (1): drm/nouveau/drm/nouveau: Pass the proper arguments to nvif_object_map_handle() Thomas Falcon (3): ibmvnic: Fix pending MAC address changes ibmvnic: Fix IP offload control buffer ibmvnic: Fix IPv6 packet descriptors Thomas Gleixner (5): timers: Unconditionally check deferrable base x86/intel_rdt/cqm: Prevent use after free x86/apic/vector: Fix off by one in error path irq/matrix: Spread interrupts on allocation x86/mce: Make machine check speculation protected Thomas Petazzoni (1): ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7 Tianyu Lan (1): KVM/x86: Fix wrong macro references of X86_CR0_PG_BIT and X86_CR4_PAE_BIT in kvm_valid_sregs() Tom Lendacky (7): x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros x86/mm: Clean up register saving in the __enc_copy() assembly code x86/mm: Use a struct to reduce parameters for SME PGD mapping x86/mm: Centralize PMD flags in sme_encrypt_kernel() x86/mm: Prepare sme_encrypt_kernel() for PAGE aligned encryption x86/mm: Encrypt the initrd earlier for BSP microcode update x86/mm: Rework wbinvd, hlt operation in stop_this_cpu() Tony Lindgren (1): ASoC: Fix twl4030 and 6040 regression by adding back read and write Ville Syrjälä (4): Revert "x86/apic: Remove init_bsp_APIC()" drm/i915: Add .get_hw_state() method for planes drm/i915: Redo plane sanitation during readout drm/i915: Fix deadlock in i830_disable_pipe() Wei Wang (1): ipv6: don't let tb6_root node share routes with other node Wei Yongjun (1): dm crypt: fix error return code in crypt_ctr() Will Deacon (1): scripts/decodecode: fix decoding for AArch64 (arm64) instructions William Tu (1): Revert "openvswitch: Add erspan tunnel support." Woody Suwalski (1): drm/vmwgfx: Fix a boot time warning Wright Feng (1): brcmfmac: fix CLM load error for legacy chips when user helper is enabled Xi Kangjie (1): scripts/gdb/linux/tasks.py: fix get_thread_info Xin Long (4): sctp: reinit stream if stream outcnt has been change by sinit in sendmsg sctp: return error if the asoc has been peeled off in sctp_wait_for_sndbuf sctp: do not allow the v4 socket to bind a v4mapped v6 address netlink: reset extack earlier in netlink_rcv_skb Xinyu Lin (1): libata: apply MAX_SEC_1024 to all LITEON EP1 series devices Yuiko Oshino (1): lan78xx: Fix failure in USB Full Speed r.hering(a)avm.de (1): net/tls: Fix inverted error codes to avoid endless loop zhenwei.pi (1): x86/pti: Document fix wrong index 王振杰 (1): Input: synaptics - Lenovo Thinkpad T460p devices should use RMI .mailmap | 1 + .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 16 + Documentation/ABI/testing/sysfs-devices-system-cpu | 16 + Documentation/admin-guide/kernel-parameters.rst | 1 + Documentation/admin-guide/kernel-parameters.txt | 62 +- Documentation/admin-guide/thunderbolt.rst | 2 +- Documentation/arm64/silicon-errata.txt | 1 + Documentation/cgroup-v2.txt | 7 + Documentation/core-api/genericirq.rst | 16 +- Documentation/devicetree/bindings/arm/ccn.txt | 2 +- .../devicetree/bindings/arm/omap/crossbar.txt | 2 +- .../bindings/arm/tegra/nvidia,tegra20-mc.txt | 2 +- .../devicetree/bindings/clock/axi-clkgen.txt | 2 +- .../bindings/clock/brcm,bcm2835-aux-clock.txt | 2 +- .../devicetree/bindings/clock/exynos4-clock.txt | 2 +- .../devicetree/bindings/clock/exynos5250-clock.txt | 2 +- .../devicetree/bindings/clock/exynos5410-clock.txt | 2 +- .../devicetree/bindings/clock/exynos5420-clock.txt | 2 +- .../devicetree/bindings/clock/exynos5440-clock.txt | 2 +- .../bindings/clock/ti-keystone-pllctrl.txt | 2 +- .../devicetree/bindings/clock/zx296702-clk.txt | 4 +- .../devicetree/bindings/crypto/fsl-sec4.txt | 4 +- .../bindings/devfreq/event/rockchip-dfi.txt | 2 +- .../devicetree/bindings/display/atmel,lcdc.txt | 4 +- .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 +- Documentation/devicetree/bindings/dma/zxdma.txt | 2 +- Documentation/devicetree/bindings/eeprom/at25.txt | 13 +- .../devicetree/bindings/gpio/gpio-altera.txt | 2 +- .../devicetree/bindings/gpio/gpio-pca953x.txt | 2 +- Documentation/devicetree/bindings/hwmon/jc42.txt | 4 + .../devicetree/bindings/i2c/i2c-jz4780.txt | 2 +- .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 128 + .../devicetree/bindings/iio/pressure/hp03.txt | 2 +- .../bindings/input/touchscreen/bu21013.txt | 2 +- .../bindings/interrupt-controller/arm,gic.txt | 4 +- .../interrupt-controller/img,meta-intc.txt | 2 +- .../bindings/interrupt-controller/img,pdc-intc.txt | 2 +- .../interrupt-controller/st,spear3xx-shirq.txt | 2 +- .../devicetree/bindings/mailbox/altera-mailbox.txt | 6 +- .../bindings/mailbox/brcm,iproc-pdc-mbox.txt | 2 +- .../devicetree/bindings/media/exynos5-gsc.txt | 2 +- .../devicetree/bindings/media/mediatek-vcodec.txt | 2 +- .../devicetree/bindings/media/rcar_vin.txt | 2 +- .../devicetree/bindings/media/samsung-fimc.txt | 2 +- .../devicetree/bindings/media/sh_mobile_ceu.txt | 2 +- .../devicetree/bindings/media/video-interfaces.txt | 10 +- .../bindings/memory-controllers/ti/emif.txt | 2 +- .../bindings/mfd/ti-keystone-devctrl.txt | 2 +- .../devicetree/bindings/misc/brcm,kona-smc.txt | 2 +- .../devicetree/bindings/mmc/brcm,kona-sdhci.txt | 2 +- .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 2 +- .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 4 +- Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 6 +- .../devicetree/bindings/mtd/jedec,spi-nor.txt | 2 - Documentation/devicetree/bindings/mtd/mtk-nand.txt | 2 +- .../devicetree/bindings/net/altera_tse.txt | 4 +- Documentation/devicetree/bindings/net/mdio.txt | 2 +- .../devicetree/bindings/net/socfpga-dwmac.txt | 2 +- Documentation/devicetree/bindings/nios2/nios2.txt | 2 +- .../devicetree/bindings/pci/altera-pcie.txt | 2 +- .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 2 +- .../devicetree/bindings/pci/hisilicon-pcie.txt | 2 +- .../devicetree/bindings/phy/sun4i-usb-phy.txt | 2 +- .../bindings/pinctrl/brcm,cygnus-pinmux.txt | 2 +- .../devicetree/bindings/pinctrl/pinctrl-atlas7.txt | 4 +- .../devicetree/bindings/pinctrl/pinctrl-sirf.txt | 2 +- .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- .../devicetree/bindings/regulator/regulator.txt | 2 +- .../devicetree/bindings/serial/efm32-uart.txt | 2 +- .../bindings/serio/allwinner,sun4i-ps2.txt | 2 +- .../bindings/soc/ti/keystone-navigator-qmss.txt | 2 +- .../devicetree/bindings/sound/adi,axi-i2s.txt | 2 +- .../devicetree/bindings/sound/adi,axi-spdif-tx.txt | 2 +- Documentation/devicetree/bindings/sound/ak4613.txt | 2 +- Documentation/devicetree/bindings/sound/ak4642.txt | 2 +- Documentation/devicetree/bindings/sound/da7218.txt | 2 +- Documentation/devicetree/bindings/sound/da7219.txt | 2 +- Documentation/devicetree/bindings/sound/dmic.txt | 2 + .../devicetree/bindings/sound/max98371.txt | 2 +- .../devicetree/bindings/sound/max98373.txt | 40 + .../devicetree/bindings/sound/max9867.txt | 2 +- .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 266 +- .../bindings/sound/mxs-audio-sgtl5000.txt | 33 +- .../devicetree/bindings/sound/nau8825.txt | 4 +- .../devicetree/bindings/sound/pcm186x.txt | 42 + .../devicetree/bindings/sound/renesas,fsi.txt | 2 +- .../devicetree/bindings/sound/renesas,rsnd.txt | 15 +- .../devicetree/bindings/sound/rockchip-spdif.txt | 2 +- .../devicetree/bindings/sound/simple-card.txt | 3 + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 8 +- .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 + .../devicetree/bindings/sound/st,stm32-sai.txt | 12 +- .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + .../devicetree/bindings/sound/tas5720.txt | 4 +- .../devicetree/bindings/sound/tfa9879.txt | 8 +- .../devicetree/bindings/sound/ti,tas6424.txt | 20 + .../devicetree/bindings/sound/tlv320aic31xx.txt | 9 +- .../devicetree/bindings/sound/tlv320aic3x.txt | 10 +- .../devicetree/bindings/sound/tscs42xx.txt | 16 + .../devicetree/bindings/sound/uniphier,evea.txt | 26 + .../devicetree/bindings/spi/efm32-spi.txt | 2 +- .../devicetree/bindings/spi/fsl-imx-cspi.txt | 18 +- .../devicetree/bindings/thermal/thermal.txt | 12 +- Documentation/devicetree/bindings/ufs/ufs-qcom.txt | 4 +- .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 2 +- .../devicetree/bindings/usb/am33xx-usb.txt | 2 + Documentation/devicetree/bindings/usb/ehci-st.txt | 2 +- Documentation/devicetree/bindings/usb/ohci-st.txt | 2 +- .../devicetree/bindings/vendor-prefixes.txt | 1 + .../bindings/watchdog/ingenic,jz4740-wdt.txt | 2 +- Documentation/driver-api/dmaengine/client.rst | 2 +- Documentation/driver-api/iio/hw-consumer.rst | 51 + Documentation/driver-api/iio/index.rst | 1 + Documentation/driver-api/pci.rst | 3 - Documentation/filesystems/nilfs2.txt | 4 +- Documentation/filesystems/overlayfs.txt | 34 + Documentation/gpu/i915.rst | 5 +- Documentation/kbuild/kconfig-language.txt | 23 +- Documentation/locking/crossrelease.txt | 874 ------- Documentation/media/dvb-drivers/frontends.rst | 30 + Documentation/media/dvb-drivers/index.rst | 1 + Documentation/networking/index.rst | 2 +- Documentation/networking/msg_zerocopy.rst | 4 + Documentation/printk-formats.txt | 31 +- Documentation/scsi/scsi_mid_low_api.txt | 6 +- Documentation/sysctl/vm.txt | 7 - Documentation/usb/gadget-testing.txt | 2 +- Documentation/virtual/kvm/api.txt | 61 +- Documentation/vm/zswap.txt | 22 +- Documentation/x86/pti.txt | 186 ++ Documentation/x86/x86_64/mm.txt | 37 +- MAINTAINERS | 89 +- Makefile | 48 +- arch/alpha/include/uapi/asm/Kbuild | 2 + arch/alpha/kernel/sys_sio.c | 35 +- arch/alpha/lib/ev6-memset.S | 12 +- arch/arc/boot/dts/axc003.dtsi | 8 + arch/arc/boot/dts/axc003_idu.dtsi | 8 + arch/arc/boot/dts/hsdk.dts | 8 + arch/arc/configs/hsdk_defconfig | 5 +- arch/arc/include/asm/uaccess.h | 5 +- arch/arc/include/uapi/asm/Kbuild | 1 + arch/arc/kernel/setup.c | 2 +- arch/arc/kernel/stacktrace.c | 2 +- arch/arc/kernel/traps.c | 14 + arch/arc/kernel/troubleshoot.c | 3 + arch/arc/plat-axs10x/axs10x.c | 18 +- arch/arc/plat-hsdk/platform.c | 42 - arch/arm/boot/dts/am33xx.dtsi | 2 + arch/arm/boot/dts/am4372.dtsi | 6 +- arch/arm/boot/dts/am437x-cm-t43.dts | 4 +- arch/arm/boot/dts/armada-385-db-ap.dts | 1 + arch/arm/boot/dts/armada-385-linksys.dtsi | 1 + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 + arch/arm/boot/dts/armada-388-gp.dts | 2 + arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- arch/arm/boot/dts/at91-tse850-3.dts | 1 + arch/arm/boot/dts/bcm-nsp.dtsi | 4 +- arch/arm/boot/dts/bcm283x.dtsi | 1 + arch/arm/boot/dts/bcm958623hr.dts | 4 - arch/arm/boot/dts/bcm958625hr.dts | 4 - arch/arm/boot/dts/da850-lcdk.dts | 4 +- arch/arm/boot/dts/da850-lego-ev3.dts | 4 +- arch/arm/boot/dts/dm814x.dtsi | 2 + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 + arch/arm/boot/dts/imx53.dtsi | 9 - arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 +- arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 3 +- arch/arm/boot/dts/logicpd-som-lv.dtsi | 17 +- arch/arm/boot/dts/ls1021a-qds.dts | 2 +- arch/arm/boot/dts/ls1021a-twr.dts | 2 +- arch/arm/boot/dts/meson.dtsi | 18 +- arch/arm/boot/dts/nspire.dtsi | 1 + arch/arm/boot/dts/omap3-beagle-xm.dts | 1 + arch/arm/boot/dts/omap3-beagle.dts | 1 + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 + arch/arm/boot/dts/omap3-evm-common.dtsi | 1 + arch/arm/boot/dts/omap3-gta04.dtsi | 1 + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 1 + arch/arm/boot/dts/omap3-igep0030-common.dtsi | 1 + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 1 + arch/arm/boot/dts/omap3-overo-base.dtsi | 1 + arch/arm/boot/dts/omap3-pandora-common.dtsi | 1 + arch/arm/boot/dts/omap3-tao3530.dtsi | 1 + arch/arm/boot/dts/omap3.dtsi | 1 + arch/arm/boot/dts/omap4-droid4-xt894.dts | 1 + arch/arm/boot/dts/omap4-duovero.dtsi | 1 + arch/arm/boot/dts/omap4-panda-common.dtsi | 1 + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 1 + arch/arm/boot/dts/omap4.dtsi | 5 +- arch/arm/boot/dts/omap5-board-common.dtsi | 2 + arch/arm/boot/dts/omap5-cm-t54.dts | 2 + arch/arm/boot/dts/omap5.dtsi | 1 + arch/arm/boot/dts/r8a7790.dtsi | 1 + arch/arm/boot/dts/r8a7792.dtsi | 1 + arch/arm/boot/dts/r8a7793.dtsi | 1 + arch/arm/boot/dts/r8a7794.dtsi | 1 + arch/arm/boot/dts/rk3066a-marsboard.dts | 4 + arch/arm/boot/dts/rk3288.dtsi | 2 +- arch/arm/boot/dts/sun4i-a10.dtsi | 6 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 4 +- arch/arm/boot/dts/sun6i-a31.dtsi | 4 +- arch/arm/boot/dts/sun7i-a20.dtsi | 6 +- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 + arch/arm/boot/dts/tango4-common.dtsi | 1 - arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 6 +- arch/arm/configs/sunxi_defconfig | 2 + arch/arm/include/asm/kvm_arm.h | 3 +- arch/arm/include/asm/kvm_host.h | 5 + arch/arm/include/asm/pgtable-3level.h | 1 - arch/arm/include/uapi/asm/Kbuild | 1 + arch/arm/kernel/entry-header.S | 4 +- arch/arm/kernel/traps.c | 1 - arch/arm/lib/csumpartialcopyuser.S | 4 + arch/arm/mach-davinci/dm365.c | 29 +- arch/arm/mach-meson/platsmp.c | 2 +- arch/arm/mach-omap2/cm_common.c | 6 +- arch/arm/mach-omap2/omap-secure.c | 21 + arch/arm/mach-omap2/omap-secure.h | 4 + arch/arm/mach-omap2/omap_device.c | 10 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 1 + arch/arm/mach-omap2/pm.h | 4 - arch/arm/mach-omap2/pm34xx.c | 13 +- arch/arm/mach-omap2/prcm-common.h | 1 + arch/arm/mach-omap2/prm33xx.c | 12 - arch/arm/mach-omap2/sleep34xx.S | 26 +- arch/arm/net/bpf_jit_32.c | 225 +- arch/arm64/Kconfig | 12 +- arch/arm64/Makefile | 3 - arch/arm64/boot/dts/Makefile | 2 +- .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 1 + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 1 + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 3 +- .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 11 +- .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +- arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 1 + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 +- .../boot/dts/marvell/armada-cp110-master.dtsi | 13 +- .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 9 +- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 - arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 11 - .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 1 - .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 1 - .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 3 +- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 4 +- arch/arm64/include/asm/assembler.h | 10 + arch/arm64/include/asm/cacheflush.h | 2 +- arch/arm64/include/asm/cpufeature.h | 3 + arch/arm64/include/asm/cputype.h | 2 + arch/arm64/include/asm/efi.h | 4 +- arch/arm64/include/asm/kvm_arm.h | 3 +- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/mmu_context.h | 46 +- arch/arm64/include/asm/module.h | 46 +- arch/arm64/include/asm/perf_event.h | 2 + arch/arm64/include/asm/pgtable.h | 42 +- arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 + arch/arm64/kernel/Makefile | 3 - arch/arm64/kernel/cpu-reset.S | 1 + arch/arm64/kernel/cpu_ops.c | 6 +- arch/arm64/kernel/cpufeature.c | 3 +- arch/arm64/kernel/efi-entry.S | 2 + arch/arm64/kernel/fpsimd.c | 57 +- arch/arm64/kernel/ftrace-mod.S | 18 - arch/arm64/kernel/ftrace.c | 14 +- arch/arm64/kernel/head.S | 1 + arch/arm64/kernel/hw_breakpoint.c | 2 +- arch/arm64/kernel/module-plts.c | 50 +- arch/arm64/kernel/module.lds | 1 + arch/arm64/kernel/perf_event.c | 6 - arch/arm64/kernel/process.c | 9 + arch/arm64/kernel/relocate_kernel.S | 1 + arch/arm64/kvm/debug.c | 21 + arch/arm64/kvm/handle_exit.c | 61 +- arch/arm64/kvm/hyp-init.S | 1 + arch/arm64/kvm/hyp/debug-sr.c | 3 + arch/arm64/kvm/hyp/switch.c | 37 +- arch/arm64/mm/context.c | 28 +- arch/arm64/mm/dump.c | 2 +- arch/arm64/mm/fault.c | 5 +- arch/arm64/mm/init.c | 3 +- arch/arm64/mm/pgd.c | 2 +- arch/arm64/net/bpf_jit_comp.c | 20 +- arch/blackfin/include/uapi/asm/Kbuild | 1 + arch/c6x/include/uapi/asm/Kbuild | 1 + arch/cris/include/uapi/asm/Kbuild | 1 + arch/frv/include/uapi/asm/Kbuild | 2 + arch/h8300/include/uapi/asm/Kbuild | 1 + arch/hexagon/include/uapi/asm/Kbuild | 1 + arch/ia64/include/asm/atomic.h | 37 +- arch/ia64/include/uapi/asm/Kbuild | 1 + arch/ia64/kernel/time.c | 2 +- arch/m32r/include/uapi/asm/Kbuild | 1 + arch/m32r/kernel/traps.c | 1 - arch/m68k/configs/stmark2_defconfig | 1 - arch/m68k/include/uapi/asm/Kbuild | 1 + arch/m68k/kernel/vmlinux-nommu.lds | 2 + arch/m68k/kernel/vmlinux-std.lds | 2 + arch/m68k/kernel/vmlinux-sun3.lds | 2 + arch/metag/include/uapi/asm/Kbuild | 1 + arch/microblaze/include/asm/mmu_context_mm.h | 1 + arch/microblaze/include/uapi/asm/Kbuild | 1 + arch/mips/Kconfig | 12 +- arch/mips/Kconfig.debug | 14 +- arch/mips/ar7/platform.c | 2 +- arch/mips/ath25/devices.c | 2 + arch/mips/include/asm/Kbuild | 1 - arch/mips/include/asm/pgtable.h | 2 +- arch/mips/include/asm/serial.h | 22 + arch/mips/include/uapi/asm/Kbuild | 1 + arch/mips/kernel/cps-vec.S | 2 + arch/mips/kernel/mips-cm.c | 1 - arch/mips/kernel/process.c | 12 + arch/mips/kernel/ptrace.c | 147 +- arch/mips/kvm/mips.c | 7 +- arch/mips/lib/Makefile | 3 +- arch/mips/lib/libgcc.h | 17 + arch/mips/lib/multi3.c | 54 + arch/mips/mm/uasm-micromips.c | 2 +- arch/mips/ralink/timer.c | 4 +- arch/mips/rb532/Makefile | 4 +- arch/mips/rb532/devices.c | 4 + arch/mn10300/include/uapi/asm/Kbuild | 1 + arch/nios2/include/uapi/asm/Kbuild | 1 + arch/openrisc/include/uapi/asm/Kbuild | 1 + arch/parisc/boot/compressed/misc.c | 4 +- arch/parisc/include/asm/ldcw.h | 2 + arch/parisc/include/asm/thread_info.h | 5 + arch/parisc/include/uapi/asm/Kbuild | 1 + arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/entry.S | 25 +- arch/parisc/kernel/hpmc.S | 1 + arch/parisc/kernel/pacache.S | 9 +- arch/parisc/kernel/process.c | 39 + arch/parisc/kernel/unwind.c | 1 - arch/parisc/lib/delay.c | 2 - arch/parisc/mm/init.c | 10 +- arch/powerpc/Kconfig | 1 + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 - arch/powerpc/include/asm/exception-64e.h | 6 + arch/powerpc/include/asm/exception-64s.h | 57 +- arch/powerpc/include/asm/feature-fixups.h | 13 + arch/powerpc/include/asm/hvcall.h | 18 + arch/powerpc/include/asm/kvm_ppc.h | 1 + arch/powerpc/include/asm/machdep.h | 1 + arch/powerpc/include/asm/mmu_context.h | 5 +- arch/powerpc/include/asm/paca.h | 10 + arch/powerpc/include/asm/plpar_wrappers.h | 14 + arch/powerpc/include/asm/setup.h | 14 + arch/powerpc/include/uapi/asm/Kbuild | 1 + arch/powerpc/include/uapi/asm/kvm.h | 25 + arch/powerpc/kernel/asm-offsets.c | 5 + arch/powerpc/kernel/cpu_setup_power.S | 2 + arch/powerpc/kernel/entry_64.S | 44 +- arch/powerpc/kernel/exceptions-64s.S | 137 +- arch/powerpc/kernel/fadump.c | 22 - arch/powerpc/kernel/misc_64.S | 2 + arch/powerpc/kernel/process.c | 14 +- arch/powerpc/kernel/setup-common.c | 38 +- arch/powerpc/kernel/setup_64.c | 139 + arch/powerpc/kernel/vmlinux.lds.S | 9 + arch/powerpc/kvm/book3s_64_mmu.c | 1 + arch/powerpc/kvm/book3s_64_mmu_hv.c | 127 +- arch/powerpc/kvm/book3s_hv.c | 3 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 9 +- arch/powerpc/kvm/book3s_pr.c | 2 + arch/powerpc/kvm/book3s_rmhandlers.S | 7 +- arch/powerpc/kvm/book3s_segment.S | 4 +- arch/powerpc/kvm/book3s_xive.c | 7 +- arch/powerpc/kvm/powerpc.c | 138 +- arch/powerpc/lib/feature-fixups.c | 41 + arch/powerpc/mm/fault.c | 7 +- arch/powerpc/mm/hash_native_64.c | 15 +- arch/powerpc/net/bpf_jit_comp64.c | 6 +- arch/powerpc/perf/core-book3s.c | 12 +- arch/powerpc/perf/imc-pmu.c | 17 +- arch/powerpc/platforms/powernv/setup.c | 49 + arch/powerpc/platforms/ps3/setup.c | 15 + arch/powerpc/platforms/pseries/dlpar.c | 21 +- arch/powerpc/platforms/pseries/pseries.h | 2 + arch/powerpc/platforms/pseries/ras.c | 3 +- arch/powerpc/platforms/pseries/setup.c | 36 + arch/powerpc/sysdev/fsl_msi.c | 4 +- arch/powerpc/xmon/xmon.c | 36 +- arch/riscv/configs/defconfig | 75 + arch/riscv/include/asm/Kbuild | 1 + arch/riscv/include/asm/asm.h | 12 +- arch/riscv/include/asm/atomic.h | 103 +- arch/riscv/include/asm/barrier.h | 36 +- arch/riscv/include/asm/bitops.h | 2 +- arch/riscv/include/asm/bug.h | 6 +- arch/riscv/include/asm/cacheflush.h | 30 +- arch/riscv/include/asm/csr.h | 8 +- arch/riscv/include/asm/io.h | 20 +- arch/riscv/include/asm/irqflags.h | 10 +- arch/riscv/include/asm/mmu.h | 4 + arch/riscv/include/asm/mmu_context.h | 45 + arch/riscv/include/asm/pgtable.h | 62 +- arch/riscv/include/asm/ptrace.h | 2 +- arch/riscv/include/asm/spinlock.h | 11 +- arch/riscv/include/asm/timex.h | 3 +- arch/riscv/include/asm/tlbflush.h | 9 +- arch/riscv/include/asm/uaccess.h | 12 - arch/riscv/include/asm/unistd.h | 1 + arch/riscv/include/asm/vdso.h | 4 + arch/riscv/include/uapi/asm/Kbuild | 1 + arch/riscv/include/uapi/asm/syscalls.h | 26 + arch/riscv/kernel/entry.S | 8 +- arch/riscv/kernel/head.S | 3 - arch/riscv/kernel/process.c | 4 +- arch/riscv/kernel/riscv_ksyms.c | 3 + arch/riscv/kernel/setup.c | 16 +- arch/riscv/kernel/smp.c | 55 + arch/riscv/kernel/sys_riscv.c | 33 +- arch/riscv/kernel/syscall_table.c | 1 + arch/riscv/kernel/vdso/Makefile | 7 +- arch/riscv/kernel/vdso/clock_getres.S | 26 + arch/riscv/kernel/vdso/clock_gettime.S | 26 + arch/riscv/kernel/vdso/flush_icache.S | 30 + arch/riscv/kernel/vdso/getcpu.S | 26 + arch/riscv/kernel/vdso/gettimeofday.S | 26 + arch/riscv/kernel/vdso/vdso.lds.S | 7 +- arch/riscv/lib/delay.c | 1 + arch/riscv/mm/Makefile | 1 + arch/riscv/mm/cacheflush.c | 23 + arch/riscv/mm/fault.c | 2 +- arch/riscv/mm/ioremap.c | 2 +- arch/s390/Kbuild | 1 + arch/s390/Makefile | 5 +- arch/s390/appldata/Makefile | 1 + arch/s390/appldata/appldata_base.c | 1 + arch/s390/appldata/appldata_mem.c | 1 + arch/s390/appldata/appldata_net_sum.c | 1 + arch/s390/appldata/appldata_os.c | 1 + arch/s390/boot/compressed/vmlinux.scr | 1 + arch/s390/boot/install.sh | 5 +- arch/s390/crypto/aes_s390.c | 7 +- arch/s390/crypto/arch_random.c | 6 +- arch/s390/crypto/crc32-vx.c | 1 + arch/s390/crypto/des_s390.c | 7 +- arch/s390/crypto/ghash_s390.c | 1 + arch/s390/crypto/paes_s390.c | 6 +- arch/s390/crypto/prng.c | 1 + arch/s390/crypto/sha.h | 7 +- arch/s390/crypto/sha1_s390.c | 7 +- arch/s390/crypto/sha256_s390.c | 7 +- arch/s390/crypto/sha512_s390.c | 7 +- arch/s390/crypto/sha_common.c | 7 +- arch/s390/hypfs/Makefile | 1 + arch/s390/hypfs/inode.c | 2 +- arch/s390/include/asm/Kbuild | 1 + arch/s390/include/asm/alternative.h | 1 + arch/s390/include/asm/ap.h | 5 +- arch/s390/include/asm/bugs.h | 1 + arch/s390/include/asm/cpu_mf.h | 5 +- arch/s390/include/asm/elf.h | 15 +- arch/s390/include/asm/kprobes.h | 15 +- arch/s390/include/asm/kvm_host.h | 8 +- arch/s390/include/asm/kvm_para.h | 7 +- arch/s390/include/asm/livepatch.h | 8 +- arch/s390/include/asm/mmu_context.h | 2 +- arch/s390/include/asm/perf_event.h | 1 + arch/s390/include/asm/pgtable.h | 2 +- arch/s390/include/asm/ptrace.h | 11 +- arch/s390/include/asm/segment.h | 1 + arch/s390/include/asm/switch_to.h | 27 +- arch/s390/include/asm/syscall.h | 5 +- arch/s390/include/asm/sysinfo.h | 5 +- arch/s390/include/asm/topology.h | 1 + arch/s390/include/asm/vga.h | 1 + arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/bpf_perf_event.h | 9 + arch/s390/include/uapi/asm/kvm.h | 9 +- arch/s390/include/uapi/asm/kvm_para.h | 4 - arch/s390/include/uapi/asm/kvm_perf.h | 4 - arch/s390/include/uapi/asm/perf_regs.h | 1 + arch/s390/include/uapi/asm/ptrace.h | 125 +- arch/s390/include/uapi/asm/sthyi.h | 1 + arch/s390/include/uapi/asm/virtio-ccw.h | 6 +- arch/s390/include/uapi/asm/vmcp.h | 1 + arch/s390/include/uapi/asm/zcrypt.h | 14 - arch/s390/kernel/alternative.c | 1 + arch/s390/kernel/compat_linux.c | 1 + arch/s390/kernel/debug.c | 2 +- arch/s390/kernel/dis.c | 10 +- arch/s390/kernel/dumpstack.c | 1 + arch/s390/kernel/entry.S | 15 +- arch/s390/kernel/ipl.c | 1 + arch/s390/kernel/kprobes.c | 15 +- arch/s390/kernel/lgr.c | 1 + arch/s390/kernel/module.c | 15 +- arch/s390/kernel/nmi.c | 1 + arch/s390/kernel/perf_cpum_cf.c | 5 +- arch/s390/kernel/perf_cpum_sf.c | 5 +- arch/s390/kernel/perf_event.c | 5 +- arch/s390/kernel/perf_regs.c | 1 + arch/s390/kernel/ptrace.c | 8 + arch/s390/kernel/setup.c | 1 + arch/s390/kernel/smp.c | 1 + arch/s390/kernel/stacktrace.c | 1 + arch/s390/kernel/sthyi.c | 5 +- arch/s390/kernel/syscalls.S | 6 +- arch/s390/kernel/time.c | 1 + arch/s390/kernel/topology.c | 1 + arch/s390/kernel/vdso.c | 5 +- arch/s390/kernel/vdso32/clock_getres.S | 5 +- arch/s390/kernel/vdso32/clock_gettime.S | 5 +- arch/s390/kernel/vdso32/gettimeofday.S | 5 +- arch/s390/kernel/vdso64/clock_getres.S | 5 +- arch/s390/kernel/vdso64/clock_gettime.S | 5 +- arch/s390/kernel/vdso64/gettimeofday.S | 5 +- arch/s390/kernel/vdso64/note.S | 1 + arch/s390/kernel/vtime.c | 1 + arch/s390/kvm/Makefile | 5 +- arch/s390/kvm/diag.c | 5 +- arch/s390/kvm/gaccess.h | 5 +- arch/s390/kvm/guestdbg.c | 5 +- arch/s390/kvm/intercept.c | 5 +- arch/s390/kvm/interrupt.c | 5 +- arch/s390/kvm/irq.h | 5 +- arch/s390/kvm/kvm-s390.c | 39 +- arch/s390/kvm/kvm-s390.h | 5 +- arch/s390/kvm/priv.c | 18 +- arch/s390/kvm/sigp.c | 5 +- arch/s390/kvm/vsie.c | 15 +- arch/s390/lib/uaccess.c | 2 +- arch/s390/mm/cmm.c | 1 + arch/s390/mm/gmap.c | 1 + arch/s390/mm/mmap.c | 16 +- arch/s390/mm/pgalloc.c | 2 - arch/s390/mm/pgtable.c | 1 + arch/s390/net/Makefile | 1 + arch/s390/net/bpf_jit_comp.c | 11 +- arch/s390/numa/Makefile | 1 + arch/s390/pci/Makefile | 1 + arch/s390/pci/pci.c | 1 + arch/s390/pci/pci_debug.c | 1 + arch/s390/pci/pci_dma.c | 22 +- arch/s390/pci/pci_insn.c | 4 + arch/s390/tools/gen_opcode_table.c | 1 + arch/score/include/uapi/asm/Kbuild | 1 + arch/sh/boards/mach-se/770x/setup.c | 24 +- arch/sh/include/mach-se/mach/se.h | 1 + arch/sh/include/uapi/asm/Kbuild | 1 + arch/sparc/include/asm/pgtable_64.h | 2 +- arch/sparc/include/uapi/asm/Kbuild | 1 + arch/sparc/lib/Makefile | 2 +- arch/sparc/lib/hweight.S | 4 +- arch/sparc/mm/fault_32.c | 2 +- arch/sparc/mm/fault_64.c | 2 +- arch/sparc/net/bpf_jit_comp_64.c | 6 +- arch/tile/include/asm/pgtable.h | 1 - arch/tile/include/uapi/asm/Kbuild | 1 + arch/um/include/asm/Kbuild | 1 + arch/um/include/asm/mmu_context.h | 3 +- arch/um/kernel/trap.c | 2 +- arch/unicore32/include/asm/mmu_context.h | 5 +- arch/unicore32/include/uapi/asm/Kbuild | 1 + arch/unicore32/kernel/traps.c | 1 - arch/x86/Kconfig | 18 +- arch/x86/Kconfig.debug | 1 + arch/x86/Makefile | 8 + arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/compressed/head_64.S | 16 +- arch/x86/boot/compressed/misc.c | 16 + arch/x86/boot/compressed/pagetable.c | 3 + arch/x86/boot/compressed/pgtable_64.c | 28 + arch/x86/boot/genimage.sh | 32 +- arch/x86/crypto/aesni-intel_asm.S | 5 +- arch/x86/crypto/camellia-aesni-avx-asm_64.S | 3 +- arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 3 +- arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 3 +- arch/x86/crypto/salsa20_glue.c | 7 - arch/x86/entry/calling.h | 147 ++ arch/x86/entry/entry_32.S | 30 +- arch/x86/entry/entry_64.S | 260 +- arch/x86/entry/entry_64_compat.S | 32 +- arch/x86/entry/vdso/vclock_gettime.c | 2 +- arch/x86/entry/vsyscall/vsyscall_64.c | 38 +- arch/x86/events/intel/bts.c | 18 + arch/x86/events/intel/core.c | 5 +- arch/x86/events/intel/ds.c | 146 +- arch/x86/events/intel/rapl.c | 4 +- arch/x86/events/perf_event.h | 23 +- arch/x86/include/asm/alternative.h | 4 +- arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/asm-prototypes.h | 25 + arch/x86/include/asm/asm.h | 2 + arch/x86/include/asm/cpu_entry_area.h | 81 + arch/x86/include/asm/cpufeature.h | 2 + arch/x86/include/asm/cpufeatures.h | 12 +- arch/x86/include/asm/desc.h | 14 +- arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/espfix.h | 7 +- arch/x86/include/asm/fixmap.h | 7 +- arch/x86/include/asm/hypervisor.h | 25 +- arch/x86/include/asm/intel_ds.h | 36 + arch/x86/include/asm/invpcid.h | 53 + arch/x86/include/asm/irqdomain.h | 2 +- arch/x86/include/asm/irqflags.h | 3 + arch/x86/include/asm/kdebug.h | 1 + arch/x86/include/asm/kmemcheck.h | 1 - arch/x86/include/asm/kvm_emulate.h | 2 - arch/x86/include/asm/kvm_host.h | 19 +- arch/x86/include/asm/mem_encrypt.h | 4 +- arch/x86/include/asm/mmu.h | 4 +- arch/x86/include/asm/mmu_context.h | 113 +- arch/x86/include/asm/mshyperv.h | 18 +- arch/x86/include/asm/msr-index.h | 3 + arch/x86/include/asm/nospec-branch.h | 222 ++ arch/x86/include/asm/paravirt.h | 9 + arch/x86/include/asm/pci_x86.h | 1 + arch/x86/include/asm/pgalloc.h | 11 + arch/x86/include/asm/pgtable.h | 38 +- arch/x86/include/asm/pgtable_32_types.h | 15 +- arch/x86/include/asm/pgtable_64.h | 92 + arch/x86/include/asm/pgtable_64_types.h | 59 +- arch/x86/include/asm/processor-flags.h | 5 + arch/x86/include/asm/processor.h | 82 +- arch/x86/include/asm/pti.h | 14 + arch/x86/include/asm/segment.h | 12 + arch/x86/include/asm/stacktrace.h | 3 + arch/x86/include/asm/suspend_32.h | 8 +- arch/x86/include/asm/suspend_64.h | 19 +- arch/x86/include/asm/switch_to.h | 13 +- arch/x86/include/asm/thread_info.h | 2 +- arch/x86/include/asm/tlbflush.h | 347 ++- arch/x86/include/asm/trace/irq_vectors.h | 16 +- arch/x86/include/asm/traps.h | 2 +- arch/x86/include/asm/unwind.h | 20 +- arch/x86/include/asm/vsyscall.h | 1 + arch/x86/include/asm/xen/hypercall.h | 5 +- arch/x86/include/uapi/asm/Kbuild | 1 + arch/x86/include/uapi/asm/processor-flags.h | 7 +- arch/x86/kernel/alternative.c | 7 +- arch/x86/kernel/apic/apic.c | 51 + arch/x86/kernel/apic/apic_flat_64.c | 2 +- arch/x86/kernel/apic/apic_noop.c | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/msi.c | 8 +- arch/x86/kernel/apic/probe_32.c | 2 +- arch/x86/kernel/apic/vector.c | 31 +- arch/x86/kernel/apic/x2apic_cluster.c | 2 +- arch/x86/kernel/asm-offsets.c | 10 + arch/x86/kernel/asm-offsets_32.c | 9 +- arch/x86/kernel/asm-offsets_64.c | 4 + arch/x86/kernel/cpu/amd.c | 35 +- arch/x86/kernel/cpu/bugs.c | 221 ++ arch/x86/kernel/cpu/common.c | 106 +- arch/x86/kernel/cpu/intel_rdt.c | 8 +- arch/x86/kernel/cpu/mcheck/mce.c | 5 + arch/x86/kernel/cpu/microcode/amd.c | 4 + arch/x86/kernel/cpu/microcode/intel.c | 26 +- arch/x86/kernel/cpu/scattered.c | 1 - arch/x86/kernel/doublefault.c | 36 +- arch/x86/kernel/dumpstack.c | 98 +- arch/x86/kernel/dumpstack_32.c | 6 + arch/x86/kernel/dumpstack_64.c | 12 + arch/x86/kernel/ftrace_32.S | 6 +- arch/x86/kernel/ftrace_64.S | 8 +- arch/x86/kernel/head64.c | 4 +- arch/x86/kernel/head_64.S | 30 +- arch/x86/kernel/idt.c | 12 +- arch/x86/kernel/ioport.c | 2 +- arch/x86/kernel/irq.c | 12 - arch/x86/kernel/irq_32.c | 9 +- arch/x86/kernel/irq_64.c | 4 +- arch/x86/kernel/irqinit.c | 3 + arch/x86/kernel/kprobes/opt.c | 23 +- arch/x86/kernel/ldt.c | 198 +- arch/x86/kernel/machine_kexec_32.c | 4 +- arch/x86/kernel/paravirt_patch_64.c | 2 - arch/x86/kernel/process.c | 46 +- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 14 +- arch/x86/kernel/setup.c | 15 +- arch/x86/kernel/smpboot.c | 21 +- arch/x86/kernel/stacktrace.c | 8 +- arch/x86/kernel/tboot.c | 11 + arch/x86/kernel/tls.c | 11 +- arch/x86/kernel/traps.c | 77 +- arch/x86/kernel/tsc.c | 9 +- arch/x86/kernel/unwind_orc.c | 88 +- arch/x86/kernel/vmlinux.lds.S | 23 + arch/x86/kvm/cpuid.h | 2 +- arch/x86/kvm/emulate.c | 93 +- arch/x86/kvm/ioapic.c | 34 +- arch/x86/kvm/lapic.c | 12 +- arch/x86/kvm/mmu.c | 27 +- arch/x86/kvm/svm.c | 25 + arch/x86/kvm/vmx.c | 106 +- arch/x86/kvm/x86.c | 139 +- arch/x86/lib/Makefile | 1 + arch/x86/lib/checksum_32.S | 7 +- arch/x86/lib/delay.c | 4 +- arch/x86/lib/retpoline.S | 49 + arch/x86/lib/x86-opcode-map.txt | 13 +- arch/x86/mm/Makefile | 9 +- arch/x86/mm/cpu_entry_area.c | 166 ++ arch/x86/mm/debug_pagetables.c | 80 +- arch/x86/mm/dump_pagetables.c | 141 +- arch/x86/mm/extable.c | 6 +- arch/x86/mm/fault.c | 11 +- arch/x86/mm/init.c | 82 +- arch/x86/mm/init_32.c | 6 + arch/x86/mm/ioremap.c | 4 +- arch/x86/mm/kasan_init_64.c | 47 +- arch/x86/mm/kaslr.c | 32 +- arch/x86/mm/kmemcheck/error.c | 1 - arch/x86/mm/kmemcheck/error.h | 1 - arch/x86/mm/kmemcheck/opcode.c | 1 - arch/x86/mm/kmemcheck/opcode.h | 1 - arch/x86/mm/kmemcheck/pte.c | 1 - arch/x86/mm/kmemcheck/pte.h | 1 - arch/x86/mm/kmemcheck/selftest.c | 1 - arch/x86/mm/kmemcheck/selftest.h | 1 - arch/x86/mm/kmemcheck/shadow.h | 1 - arch/x86/mm/kmmio.c | 12 +- arch/x86/mm/mem_encrypt.c | 360 ++- arch/x86/mm/mem_encrypt_boot.S | 80 +- arch/x86/mm/pgtable.c | 5 +- arch/x86/mm/pgtable_32.c | 1 + arch/x86/mm/pti.c | 368 +++ arch/x86/mm/tlb.c | 64 +- arch/x86/pci/broadcom_bus.c | 2 +- arch/x86/pci/common.c | 5 + arch/x86/pci/fixup.c | 46 +- arch/x86/platform/efi/efi_64.c | 7 +- arch/x86/platform/efi/quirks.c | 13 +- .../platform/intel-mid/device_libs/platform_bt.c | 2 +- arch/x86/platform/uv/tlb_uv.c | 2 +- arch/x86/platform/uv/uv_irq.c | 2 +- arch/x86/platform/uv/uv_nmi.c | 4 +- arch/x86/power/cpu.c | 112 +- arch/x86/xen/apic.c | 2 +- arch/x86/xen/enlighten.c | 81 + arch/x86/xen/enlighten_pv.c | 42 +- arch/x86/xen/mmu_pv.c | 22 +- arch/x86/xen/setup.c | 6 +- arch/x86/xen/xen-asm_64.S | 14 + arch/x86/xen/xen-ops.h | 2 +- arch/xtensa/include/uapi/asm/Kbuild | 1 + block/bio.c | 4 +- block/blk-core.c | 9 +- block/blk-map.c | 38 +- block/blk-mq.c | 2 + block/blk-sysfs.c | 5 +- block/blk-throttle.c | 8 +- block/blk-wbt.c | 7 +- block/blk.h | 2 + block/bounce.c | 6 +- block/genhd.c | 9 +- block/kyber-iosched.c | 37 +- crypto/af_alg.c | 44 +- crypto/algapi.c | 12 + crypto/algif_aead.c | 66 +- crypto/algif_skcipher.c | 31 +- crypto/asymmetric_keys/pkcs7_parser.c | 4 +- crypto/asymmetric_keys/pkcs7_trust.c | 2 +- crypto/asymmetric_keys/pkcs7_verify.c | 9 +- crypto/asymmetric_keys/public_key.c | 7 +- crypto/asymmetric_keys/x509_cert_parser.c | 2 + crypto/asymmetric_keys/x509_public_key.c | 8 +- crypto/chacha20poly1305.c | 6 +- crypto/hmac.c | 6 +- crypto/mcryptd.c | 23 +- crypto/pcrypt.c | 19 +- crypto/rsa_helper.c | 2 +- crypto/salsa20_generic.c | 7 - crypto/shash.c | 5 +- crypto/skcipher.c | 11 +- drivers/Makefile | 1 + drivers/acpi/apei/erst.c | 2 +- drivers/acpi/cppc_acpi.c | 25 +- drivers/acpi/device_pm.c | 2 +- drivers/acpi/device_sysfs.c | 4 + drivers/acpi/ec.c | 69 +- drivers/acpi/internal.h | 1 + drivers/acpi/nfit/core.c | 9 +- drivers/acpi/scan.c | 21 + drivers/acpi/utils.c | 41 +- drivers/android/binder.c | 84 +- drivers/ata/ahci_mtk.c | 6 +- drivers/ata/ahci_qoriq.c | 12 + drivers/ata/libata-core.c | 13 +- drivers/ata/pata_pdc2027x.c | 16 +- drivers/atm/ambassador.c | 2 +- drivers/atm/fore200e.c | 4 +- drivers/atm/lanai.c | 8 +- drivers/atm/suni.c | 2 +- drivers/auxdisplay/Kconfig | 1 + drivers/base/Kconfig | 28 +- drivers/base/cacheinfo.c | 13 + drivers/base/cpu.c | 48 + drivers/base/isa.c | 10 +- drivers/base/power/main.c | 15 + drivers/base/power/runtime.c | 3 +- drivers/bcma/Kconfig | 2 +- drivers/block/loop.c | 10 +- drivers/block/null_blk.c | 9 +- drivers/block/rbd.c | 18 +- drivers/bus/arm-cci.c | 7 +- drivers/bus/arm-ccn.c | 25 +- drivers/bus/sunxi-rsb.c | 1 + drivers/char/ipmi/ipmi_si_intf.c | 44 +- drivers/char/ipmi/ipmi_si_parisc.c | 2 + drivers/char/ipmi/ipmi_si_pci.c | 7 +- drivers/clk/clk.c | 8 +- drivers/clk/sunxi/clk-sun9i-mmc.c | 12 + drivers/cpufreq/Kconfig | 2 + drivers/cpufreq/cpufreq_governor.c | 19 +- drivers/cpufreq/imx6q-cpufreq.c | 11 +- drivers/cpufreq/mediatek-cpufreq.c | 4 + drivers/crypto/chelsio/Kconfig | 1 + drivers/crypto/inside-secure/safexcel.c | 1 + drivers/crypto/inside-secure/safexcel_cipher.c | 85 +- drivers/crypto/inside-secure/safexcel_hash.c | 89 +- drivers/crypto/n2_core.c | 3 + drivers/dax/device.c | 12 + drivers/dma/at_hdmac.c | 4 +- drivers/dma/dma-jz4740.c | 4 +- drivers/dma/dmatest.c | 55 +- drivers/dma/fsl-edma.c | 28 +- drivers/dma/ioat/init.c | 2 +- drivers/firmware/arm_scpi.c | 216 +- drivers/firmware/efi/capsule-loader.c | 45 +- drivers/firmware/efi/efi.c | 5 +- drivers/firmware/efi/esrt.c | 17 +- drivers/firmware/efi/runtime-map.c | 10 +- drivers/firmware/google/vpd.c | 48 +- drivers/firmware/qemu_fw_cfg.c | 3 +- drivers/gpio/gpio-74x164.c | 4 +- drivers/gpio/gpio-bcm-kona.c | 3 +- drivers/gpio/gpio-brcmstb.c | 4 +- drivers/gpio/gpio-davinci.c | 2 +- drivers/gpio/gpio-merrifield.c | 11 +- drivers/gpio/gpio-mmio.c | 30 +- drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpio/gpio-reg.c | 4 +- drivers/gpio/gpio-tegra.c | 4 +- drivers/gpio/gpio-xgene-sb.c | 2 +- drivers/gpio/gpiolib-acpi.c | 2 +- drivers/gpio/gpiolib-devprop.c | 17 +- drivers/gpio/gpiolib-of.c | 3 +- drivers/gpio/gpiolib.c | 62 +- drivers/gpio/gpiolib.h | 3 +- drivers/gpu/drm/amd/acp/Makefile | 21 + drivers/gpu/drm/amd/amdgpu/Makefile | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 47 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 +- drivers/gpu/drm/amd/amdgpu/cik.c | 111 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 16 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/Makefile | 22 +- drivers/gpu/drm/amd/amdkfd/kfd_module.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 4 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 18 + drivers/gpu/drm/amd/display/Makefile | 21 + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 21 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 44 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 51 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 1 + drivers/gpu/drm/amd/display/dc/Makefile | 21 + drivers/gpu/drm/amd/display/dc/basics/Makefile | 21 + .../gpu/drm/amd/display/dc/basics/log_helpers.c | 5 + drivers/gpu/drm/amd/display/dc/bios/Makefile | 21 + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 4 +- drivers/gpu/drm/amd/display/dc/calcs/Makefile | 21 + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 9 + drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +- drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 22 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 104 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 106 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 56 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 9 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 22 + drivers/gpu/drm/amd/display/dc/dce/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 10 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 3 + drivers/gpu/drm/amd/display/dc/dce100/Makefile | 21 + .../drm/amd/display/dc/dce100/dce100_resource.c | 2 +- .../drm/amd/display/dc/dce100/dce100_resource.h | 23 + drivers/gpu/drm/amd/display/dc/dce110/Makefile | 21 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 58 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 14 +- .../display/dc/dce110/dce110_timing_generator.c | 8 +- .../display/dc/dce110/dce110_timing_generator_v.c | 23 + drivers/gpu/drm/amd/display/dc/dce112/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dce120/Makefile | 23 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 9 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 2 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 6 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 6 +- .../amd/display/dc/dcn10/dcn10_timing_generator.c | 3 - drivers/gpu/drm/amd/display/dc/dml/Makefile | 21 + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 21 + drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 21 + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 +- .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 22 + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 22 + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 7 - drivers/gpu/drm/amd/display/dc/irq/Makefile | 21 + drivers/gpu/drm/amd/display/dc/virtual/Makefile | 21 + .../gpu/drm/amd/display/modules/freesync/Makefile | 21 + drivers/gpu/drm/amd/lib/Makefile | 21 + drivers/gpu/drm/amd/powerplay/Makefile | 22 +- drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 22 +- .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 24 +- drivers/gpu/drm/amd/powerplay/inc/smu72.h | 24 +- drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h | 24 +- drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 22 +- drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 24 +- drivers/gpu/drm/arm/hdlcd_crtc.c | 3 +- drivers/gpu/drm/arm/hdlcd_drv.c | 9 +- drivers/gpu/drm/arm/malidp_crtc.c | 16 +- drivers/gpu/drm/arm/malidp_drv.c | 34 +- drivers/gpu/drm/arm/malidp_hw.c | 46 +- drivers/gpu/drm/arm/malidp_hw.h | 65 +- drivers/gpu/drm/arm/malidp_planes.c | 21 +- drivers/gpu/drm/armada/armada_crtc.c | 47 +- drivers/gpu/drm/armada/armada_crtc.h | 2 + drivers/gpu/drm/armada/armada_overlay.c | 38 +- drivers/gpu/drm/bridge/adv7511/adv7511.h | 13 +- drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 32 +- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 + drivers/gpu/drm/bridge/lvds-encoder.c | 48 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 25 + drivers/gpu/drm/bridge/tc358767.c | 73 +- drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_connector.c | 65 +- drivers/gpu/drm/drm_crtc_internal.h | 1 + drivers/gpu/drm/drm_edid.c | 64 +- drivers/gpu/drm/drm_fb_helper.c | 4 + drivers/gpu/drm/drm_lease.c | 26 +- drivers/gpu/drm/drm_mm.c | 8 +- drivers/gpu/drm/drm_mode_config.c | 5 + drivers/gpu/drm/drm_plane.c | 43 +- drivers/gpu/drm/drm_syncobj.c | 77 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 46 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 - drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 + drivers/gpu/drm/i915/gvt/cfg_space.c | 21 + drivers/gpu/drm/i915/gvt/cmd_parser.c | 6 +- drivers/gpu/drm/i915/gvt/display.c | 3 + drivers/gpu/drm/i915/gvt/execlist.c | 6 + drivers/gpu/drm/i915/gvt/gtt.c | 11 +- drivers/gpu/drm/i915/gvt/handlers.c | 92 +- drivers/gpu/drm/i915/gvt/mmio.h | 2 + drivers/gpu/drm/i915/gvt/scheduler.c | 55 +- drivers/gpu/drm/i915/gvt/scheduler.h | 3 + drivers/gpu/drm/i915/i915_drv.c | 3 + drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_gem.c | 42 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 6 +- drivers/gpu/drm/i915/i915_gemfs.c | 3 +- drivers/gpu/drm/i915/i915_reg.h | 7 +- drivers/gpu/drm/i915/i915_sw_fence.c | 3 +- drivers/gpu/drm/i915/intel_breadcrumbs.c | 23 +- drivers/gpu/drm/i915/intel_cdclk.c | 35 +- drivers/gpu/drm/i915/intel_ddi.c | 5 + drivers/gpu/drm/i915/intel_display.c | 373 +-- drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_engine_cs.c | 5 + drivers/gpu/drm/i915/intel_fbdev.c | 10 +- drivers/gpu/drm/i915/intel_hdmi.c | 3 +- drivers/gpu/drm/i915/intel_i2c.c | 4 +- drivers/gpu/drm/i915/intel_lpe_audio.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 3 + drivers/gpu/drm/i915/intel_pm.c | 13 - drivers/gpu/drm/i915/intel_psr.c | 16 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 + drivers/gpu/drm/i915/intel_sprite.c | 83 + drivers/gpu/drm/i915/intel_uncore.c | 13 + drivers/gpu/drm/i915/intel_uncore.h | 1 + drivers/gpu/drm/imx/imx-drm-core.c | 11 +- drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 1 + drivers/gpu/drm/nouveau/nouveau_bo.c | 9 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 11 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 6 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 39 +- drivers/gpu/drm/nouveau/nouveau_vmm.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 6 +- .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 3 +- drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c | 1 - drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c | 9 +- drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 2 + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mcp77.c | 41 + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 10 + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmmcp77.c | 45 + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 16 +- drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 7 + drivers/gpu/drm/omapdrm/displays/Kconfig | 1 + drivers/gpu/drm/omapdrm/dss/dpi.c | 4 +- drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 48 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 23 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 3 +- drivers/gpu/drm/radeon/cik.c | 24 - drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 3 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 20 + drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 9 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- drivers/gpu/drm/tegra/sor.c | 3 + drivers/gpu/drm/ttm/ttm_page_alloc.c | 139 +- drivers/gpu/drm/vc4/vc4_bo.c | 3 +- drivers/gpu/drm/vc4/vc4_gem.c | 4 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +- drivers/gpu/drm/vc4/vc4_irq.c | 4 + drivers/gpu/drm/vc4/vc4_v3d.c | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 41 +- drivers/hid/hid-core.c | 2 +- drivers/hid/hid-cp2112.c | 15 +- drivers/hid/hid-holtekff.c | 8 +- drivers/hv/channel.c | 10 +- drivers/hv/channel_mgmt.c | 7 +- drivers/hv/vmbus_drv.c | 2 + drivers/hwmon/hwmon.c | 21 +- drivers/hwmon/jc42.c | 21 + drivers/hwmon/pmbus/pmbus_core.c | 21 +- drivers/hwtracing/stm/ftrace.c | 6 +- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/busses/i2c-i801.c | 3 + drivers/i2c/busses/i2c-piix4.c | 2 +- drivers/i2c/busses/i2c-stm32.h | 3 +- drivers/i2c/busses/i2c-stm32f4.c | 3 +- drivers/i2c/busses/i2c-stm32f7.c | 3 +- drivers/i2c/i2c-boardinfo.c | 2 + drivers/i2c/i2c-core-base.c | 6 +- drivers/i2c/i2c-core-smbus.c | 13 +- drivers/iio/adc/Kconfig | 37 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/cpcap-adc.c | 2 +- drivers/iio/adc/meson_saradc.c | 52 +- drivers/iio/adc/sd_adc_modulator.c | 68 + drivers/iio/adc/stm32-dfsdm-adc.c | 1205 +++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 302 +++ drivers/iio/adc/stm32-dfsdm.h | 310 +++ drivers/iio/buffer/Kconfig | 10 + drivers/iio/buffer/Makefile | 1 + drivers/iio/buffer/industrialio-buffer-cb.c | 11 + drivers/iio/buffer/industrialio-hw-consumer.c | 247 ++ drivers/iio/health/max30102.c | 2 +- drivers/iio/industrialio-core.c | 4 +- drivers/iio/inkern.c | 17 +- drivers/iio/proximity/sx9500.c | 9 + drivers/infiniband/Kconfig | 2 +- drivers/infiniband/core/cma.c | 3 +- drivers/infiniband/core/core_priv.h | 2 +- drivers/infiniband/core/device.c | 22 +- drivers/infiniband/core/iwcm.c | 2 +- drivers/infiniband/core/nldev.c | 56 +- drivers/infiniband/core/security.c | 60 +- drivers/infiniband/core/umem.c | 2 +- drivers/infiniband/core/uverbs_cmd.c | 10 +- drivers/infiniband/core/verbs.c | 3 +- drivers/infiniband/hw/cxgb4/cq.c | 16 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 - drivers/infiniband/hw/cxgb4/qp.c | 94 +- drivers/infiniband/hw/cxgb4/t4.h | 6 + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- drivers/infiniband/hw/hfi1/hfi.h | 1 - drivers/infiniband/hw/hfi1/pcie.c | 30 +- drivers/infiniband/hw/hfi1/rc.c | 2 +- drivers/infiniband/hw/hns/hns_roce_alloc.c | 23 - drivers/infiniband/hw/hns/hns_roce_device.h | 4 +- drivers/infiniband/hw/hns/hns_roce_hem.c | 25 +- drivers/infiniband/hw/hns/hns_roce_hem.h | 1 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 22 +- drivers/infiniband/hw/i40iw/i40iw_cm.c | 31 +- drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 43 +- drivers/infiniband/hw/i40iw/i40iw_d.h | 6 +- drivers/infiniband/hw/mlx4/mr.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 26 +- drivers/infiniband/hw/mlx5/cmd.c | 11 - drivers/infiniband/hw/mlx5/cmd.h | 2 - drivers/infiniband/hw/mlx5/main.c | 54 +- drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 + drivers/infiniband/hw/mlx5/mr.c | 1 + drivers/infiniband/hw/mlx5/qp.c | 7 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 6 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 7 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 17 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 14 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 7 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 25 +- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 5 +- drivers/infiniband/ulp/isert/ib_isert.c | 1 + drivers/infiniband/ulp/srpt/ib_srpt.c | 5 +- drivers/input/joystick/analog.c | 2 +- drivers/input/misc/ims-pcu.c | 2 +- drivers/input/misc/twl4030-vibra.c | 6 +- drivers/input/misc/twl6040-vibra.c | 3 +- drivers/input/misc/xen-kbdfront.c | 2 - drivers/input/mouse/alps.c | 23 +- drivers/input/mouse/alps.h | 10 +- drivers/input/mouse/elantech.c | 2 +- drivers/input/mouse/synaptics.c | 1 + drivers/input/rmi4/rmi_driver.c | 4 +- drivers/input/touchscreen/88pm860x-ts.c | 16 +- drivers/input/touchscreen/elants_i2c.c | 10 +- drivers/input/touchscreen/hideep.c | 3 +- drivers/input/touchscreen/of_touchscreen.c | 4 + drivers/iommu/amd_iommu.c | 2 +- drivers/iommu/arm-smmu-v3.c | 17 +- drivers/iommu/intel-iommu.c | 8 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 4 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 6 +- drivers/leds/led-core.c | 1 + drivers/md/bcache/alloc.c | 2 +- drivers/md/bcache/btree.c | 5 +- drivers/md/bcache/extents.c | 2 +- drivers/md/bcache/journal.c | 7 +- drivers/md/bcache/request.c | 13 +- drivers/md/dm-bufio.c | 8 +- drivers/md/dm-cache-target.c | 12 +- drivers/md/dm-crypt.c | 20 +- drivers/md/dm-integrity.c | 49 +- drivers/md/dm-mpath.c | 67 +- drivers/md/dm-snap.c | 48 +- drivers/md/dm-table.c | 5 +- drivers/md/dm-thin-metadata.c | 6 +- drivers/md/dm-thin.c | 22 +- drivers/md/md.c | 4 +- drivers/md/persistent-data/dm-btree.c | 19 +- drivers/md/raid1.c | 4 + drivers/md/raid10.c | 4 + drivers/md/raid5-cache.c | 22 +- drivers/md/raid5.c | 2 +- drivers/media/common/siano/smscoreapi.c | 66 +- drivers/media/dvb-core/dvb_ca_en50221.c | 68 +- drivers/media/dvb-core/dvb_frontend.c | 13 +- drivers/media/dvb-core/dvb_net.c | 15 +- drivers/media/dvb-frontends/af9013.h | 24 +- drivers/media/dvb-frontends/ascot2e.h | 9 + drivers/media/dvb-frontends/cxd2820r.h | 24 +- drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h | 12 +- drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 878 +++---- drivers/media/dvb-frontends/drx39xyj/drxj.c | 248 +- drivers/media/dvb-frontends/drx39xyj/drxj.h | 220 +- drivers/media/dvb-frontends/drxk.h | 13 +- drivers/media/dvb-frontends/drxk_hard.c | 32 +- drivers/media/dvb-frontends/dvb-pll.h | 13 +- drivers/media/dvb-frontends/helene.h | 30 +- drivers/media/dvb-frontends/horus3a.h | 9 + drivers/media/dvb-frontends/ix2505v.c | 6 +- drivers/media/dvb-frontends/ix2505v.h | 28 +- drivers/media/dvb-frontends/l64781.c | 2 +- drivers/media/dvb-frontends/m88ds3103.h | 155 +- drivers/media/dvb-frontends/mb86a20s.h | 17 +- drivers/media/dvb-frontends/mn88472.h | 16 +- drivers/media/dvb-frontends/rtl2830.h | 1 - drivers/media/dvb-frontends/rtl2832.h | 1 - drivers/media/dvb-frontends/rtl2832_sdr.h | 6 +- drivers/media/dvb-frontends/sp887x.c | 6 +- drivers/media/dvb-frontends/stb6000.h | 11 +- drivers/media/dvb-frontends/stv0299.c | 2 +- drivers/media/dvb-frontends/tda10071.h | 1 - drivers/media/dvb-frontends/tda826x.h | 11 +- drivers/media/dvb-frontends/tua6100.c | 2 +- drivers/media/dvb-frontends/tua6100.h | 2 +- drivers/media/dvb-frontends/zd1301_demod.h | 13 +- drivers/media/dvb-frontends/zl10036.c | 8 +- drivers/media/dvb-frontends/zl10036.h | 16 +- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/et8ek8/Kconfig | 1 + drivers/media/i2c/imx274.c | 5 +- drivers/media/i2c/lm3560.c | 1 + drivers/media/i2c/m5mols/m5mols_capture.c | 5 + drivers/media/i2c/m5mols/m5mols_controls.c | 1 + drivers/media/i2c/m5mols/m5mols_core.c | 20 +- drivers/media/i2c/ov5647.c | 4 +- drivers/media/i2c/s5k6a3.c | 3 + drivers/media/i2c/s5k6aa.c | 5 + drivers/media/i2c/tvp514x.c | 12 +- drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 8 +- drivers/media/pci/solo6x10/solo6x10-enc.c | 2 +- drivers/media/pci/sta2x11/sta2x11_vip.c | 11 + drivers/media/pci/tw68/tw68-risc.c | 33 +- drivers/media/platform/davinci/vpif.c | 3 +- drivers/media/platform/davinci/vpif_capture.c | 27 +- drivers/media/platform/davinci/vpif_display.c | 16 +- drivers/media/platform/exynos4-is/fimc-capture.c | 3 + drivers/media/platform/exynos4-is/media-dev.c | 11 +- drivers/media/platform/exynos4-is/mipi-csis.c | 2 +- .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 1 + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 1 - .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 4 +- .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 2 +- drivers/media/platform/mtk-vpu/mtk_vpu.c | 3 +- drivers/media/platform/pxa_camera.c | 9 +- drivers/media/platform/rcar_fdp1.c | 2 +- drivers/media/platform/rcar_jpu.c | 4 +- drivers/media/platform/s3c-camif/camif-core.c | 1 + drivers/media/platform/sh_veu.c | 2 +- drivers/media/platform/soc_camera/soc_scale_crop.c | 21 +- drivers/media/platform/sti/hva/hva-h264.c | 18 +- drivers/media/platform/ti-vpe/vpe.c | 2 +- drivers/media/platform/vim2m.c | 2 +- drivers/media/platform/vsp1/vsp1_dl.c | 1 + drivers/media/radio/radio-si476x.c | 18 +- drivers/media/radio/radio-wl1273.c | 2 +- drivers/media/rc/img-ir/img-ir-hw.c | 2 +- drivers/media/rc/imon.c | 40 +- drivers/media/rc/ir-jvc-decoder.c | 2 +- drivers/media/rc/ir-lirc-codec.c | 4 +- drivers/media/rc/ir-nec-decoder.c | 3 +- drivers/media/rc/ir-sanyo-decoder.c | 2 +- drivers/media/rc/ir-sharp-decoder.c | 2 +- drivers/media/rc/ir-xmp-decoder.c | 2 +- drivers/media/rc/rc-ir-raw.c | 2 +- drivers/media/rc/rc-main.c | 78 +- drivers/media/rc/sir_ir.c | 40 +- drivers/media/rc/st_rc.c | 6 +- drivers/media/rc/streamzap.c | 6 +- drivers/media/tuners/mt2063.c | 6 +- drivers/media/usb/dvb-usb/cinergyT2-fe.c | 2 +- drivers/media/usb/dvb-usb/dib0700_devices.c | 8 +- drivers/media/usb/dvb-usb/dibusb-common.c | 16 +- drivers/media/usb/dvb-usb/friio-fe.c | 2 +- drivers/media/usb/dvb-usb/friio.c | 2 +- drivers/media/usb/gspca/ov519.c | 2 +- drivers/media/usb/pwc/pwc-dec23.c | 7 +- drivers/media/usb/siano/smsusb.c | 4 +- drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 6 +- drivers/media/usb/usbtv/usbtv-core.c | 1 + drivers/media/v4l2-core/tuner-core.c | 4 +- drivers/media/v4l2-core/v4l2-async.c | 3 +- drivers/media/v4l2-core/v4l2-dv-timings.c | 10 +- drivers/media/v4l2-core/v4l2-fwnode.c | 10 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 2 + drivers/media/v4l2-core/videobuf-core.c | 2 +- drivers/media/v4l2-core/videobuf-dma-sg.c | 5 +- drivers/media/v4l2-core/videobuf2-core.c | 56 +- drivers/media/v4l2-core/videobuf2-memops.c | 2 +- drivers/media/v4l2-core/videobuf2-v4l2.c | 10 +- drivers/mfd/arizona-irq.c | 4 +- drivers/mfd/cros_ec_spi.c | 53 +- drivers/mfd/rtsx_pcr.c | 3 + drivers/mfd/twl4030-audio.c | 9 +- drivers/mfd/twl6040.c | 12 +- drivers/misc/cxl/pci.c | 12 +- drivers/misc/eeprom/at24.c | 41 +- drivers/misc/pti.c | 2 +- drivers/mmc/core/block.c | 67 +- drivers/mmc/core/bus.c | 3 + drivers/mmc/core/card.h | 2 + drivers/mmc/core/debugfs.c | 1 + drivers/mmc/core/mmc.c | 6 +- drivers/mmc/core/quirks.h | 8 + drivers/mmc/core/sd.c | 2 +- drivers/mmc/host/renesas_sdhi_core.c | 3 + drivers/mmc/host/s3cmci.c | 6 +- drivers/mmc/host/sdhci-esdhc-imx.c | 14 + drivers/mmc/host/sdhci-msm.c | 14 + drivers/mmc/host/sdhci.c | 28 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/mtdsuper.c | 6 +- drivers/mtd/nand/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/gpio.c | 6 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 6 +- drivers/mtd/nand/pxa3xx_nand.c | 1 + drivers/mux/core.c | 4 +- drivers/net/bonding/bond_netlink.c | 2 +- drivers/net/can/flexcan.c | 11 +- drivers/net/can/peak_canfd/peak_canfd.c | 9 +- drivers/net/can/peak_canfd/peak_pciefd_main.c | 5 +- drivers/net/can/sja1000/peak_pci.c | 5 +- drivers/net/can/ti_hecc.c | 3 + drivers/net/can/usb/ems_usb.c | 3 + drivers/net/can/usb/esd_usb2.c | 2 + drivers/net/can/usb/gs_usb.c | 2 +- drivers/net/can/usb/kvaser_usb.c | 13 +- drivers/net/can/usb/mcba_usb.c | 4 +- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 21 +- drivers/net/can/usb/usb_8dev.c | 2 + drivers/net/can/vxcan.c | 2 +- drivers/net/dsa/b53/b53_common.c | 9 +- drivers/net/dsa/bcm_sf2.c | 1 - drivers/net/dsa/bcm_sf2_cfp.c | 4 +- drivers/net/dsa/mv88e6xxx/chip.c | 34 +- drivers/net/dsa/mv88e6xxx/port.c | 1 + drivers/net/ethernet/3com/3c59x.c | 90 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 45 +- drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 5 +- .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 16 +- drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 29 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 82 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 +- .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 5 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 17 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 29 +- .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 6 + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 80 +- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 6 +- drivers/net/ethernet/aquantia/atlantic/ver.h | 6 +- drivers/net/ethernet/arc/emac.h | 2 + drivers/net/ethernet/arc/emac_main.c | 164 +- drivers/net/ethernet/arc/emac_rockchip.c | 13 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 14 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 57 +- drivers/net/ethernet/broadcom/tg3.c | 21 +- drivers/net/ethernet/broadcom/tg3.h | 7 +- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 3 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 - drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 17 +- drivers/net/ethernet/cirrus/cs89x0.c | 4 + drivers/net/ethernet/freescale/fec_main.c | 13 +- .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 16 +- drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 1 + drivers/net/ethernet/freescale/gianfar.c | 11 +- drivers/net/ethernet/freescale/gianfar_ptp.c | 3 +- drivers/net/ethernet/ibm/ibmvnic.c | 37 +- drivers/net/ethernet/intel/e1000/e1000.h | 3 +- drivers/net/ethernet/intel/e1000/e1000_hw.c | 6 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 27 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 +- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 +- drivers/net/ethernet/intel/e1000e/netdev.c | 9 +- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 38 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 26 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 26 +- drivers/net/ethernet/marvell/mvmdio.c | 3 +- drivers/net/ethernet/marvell/mvneta.c | 8 +- drivers/net/ethernet/marvell/mvpp2.c | 50 +- drivers/net/ethernet/marvell/skge.c | 1 - drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +- drivers/net/ethernet/mellanox/mlx4/en_port.c | 57 +- drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 2 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 1 - drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 11 +- drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 26 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 111 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 27 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 20 +- drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.c | 6 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 16 +- drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 56 + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 103 +- drivers/net/ethernet/mellanox/mlx5/core/qp.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/rl.c | 22 +- drivers/net/ethernet/mellanox/mlx5/core/uar.c | 14 +- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 22 +- drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 64 +- drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 1 + drivers/net/ethernet/mellanox/mlxsw/pci.c | 7 +- drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 1 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 29 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 + .../net/ethernet/mellanox/mlxsw/spectrum_qdisc.c | 7 +- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 146 +- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 6 + drivers/net/ethernet/netronome/nfp/bpf/main.c | 55 +- drivers/net/ethernet/netronome/nfp/bpf/main.h | 8 + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +- drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 15 +- drivers/net/ethernet/nvidia/forcedeth.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_spq.c | 8 +- drivers/net/ethernet/qualcomm/emac/emac-phy.c | 7 +- drivers/net/ethernet/qualcomm/emac/emac.c | 6 +- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 1 + .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 8 +- drivers/net/ethernet/renesas/ravb_main.c | 27 +- drivers/net/ethernet/renesas/sh_eth.c | 76 +- drivers/net/ethernet/sfc/tx.c | 5 +- drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 5 +- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 3 +- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/ethernet/via/via-rhine.c | 4 +- drivers/net/ethernet/xilinx/Kconfig | 1 + drivers/net/geneve.c | 14 + drivers/net/hippi/rrunner.c | 2 +- drivers/net/ipvlan/ipvlan_core.c | 1 + drivers/net/macvlan.c | 7 +- drivers/net/phy/at803x.c | 4 - drivers/net/phy/marvell.c | 18 +- drivers/net/phy/marvell10g.c | 5 +- drivers/net/phy/mdio-sun4i.c | 6 +- drivers/net/phy/mdio-xgene.c | 21 +- drivers/net/phy/mdio_bus.c | 1 + drivers/net/phy/meson-gxl.c | 74 +- drivers/net/phy/micrel.c | 7 +- drivers/net/phy/phy.c | 9 +- drivers/net/phy/phy_device.c | 10 +- drivers/net/phy/phylink.c | 8 +- drivers/net/phy/sfp-bus.c | 6 +- drivers/net/phy/sfp.c | 41 +- drivers/net/ppp/ppp_generic.c | 5 +- drivers/net/tap.c | 14 +- drivers/net/thunderbolt.c | 57 +- drivers/net/tun.c | 39 +- drivers/net/usb/lan78xx.c | 1 + drivers/net/usb/qmi_wwan.c | 5 + drivers/net/usb/r8152.c | 13 + drivers/net/usb/usbnet.c | 5 +- drivers/net/virtio_net.c | 2 +- drivers/net/vxlan.c | 23 +- drivers/net/wan/lmc/lmc_main.c | 13 +- drivers/net/wireless/ath/ath9k/channel.c | 2 +- drivers/net/wireless/ath/wcn36xx/main.c | 23 +- drivers/net/wireless/ath/wcn36xx/pmc.c | 6 +- .../wireless/broadcom/brcm80211/brcmfmac/common.c | 9 +- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +- drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 4 + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 2 - drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 18 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 53 +- .../net/wireless/intel/iwlwifi/mvm/time-event.c | 24 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 13 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 10 +- .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 6 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 11 +- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 8 +- drivers/net/wireless/mac80211_hwsim.c | 20 +- drivers/net/wireless/st/cw1200/sta.c | 4 +- drivers/net/wireless/ti/wl1251/main.c | 2 +- drivers/net/wireless/ti/wlcore/cmd.c | 5 +- drivers/net/xen-netback/interface.c | 2 +- drivers/net/xen-netfront.c | 19 + drivers/nvdimm/btt.c | 201 +- drivers/nvdimm/btt.h | 47 +- drivers/nvdimm/pfn_devs.c | 20 +- drivers/nvme/host/core.c | 37 +- drivers/nvme/host/fabrics.c | 1 + drivers/nvme/host/fabrics.h | 30 + drivers/nvme/host/fc.c | 22 +- drivers/nvme/host/multipath.c | 2 +- drivers/nvme/host/nvme.h | 14 +- drivers/nvme/host/pci.c | 83 +- drivers/nvme/host/rdma.c | 280 +- drivers/nvme/target/fc.c | 9 +- drivers/nvme/target/fcloop.c | 2 +- drivers/nvme/target/loop.c | 25 +- drivers/nvmem/meson-mx-efuse.c | 4 +- drivers/of/dynamic.c | 4 +- drivers/of/of_mdio.c | 12 +- drivers/of/overlay.c | 84 +- drivers/of/unittest.c | 1 - drivers/parisc/dino.c | 10 +- drivers/parisc/eisa_eeprom.c | 2 +- drivers/parisc/lba_pci.c | 33 + drivers/pci/host/pci-hyperv.c | 8 +- drivers/pci/host/pcie-rcar.c | 8 +- drivers/pci/pci-driver.c | 9 +- drivers/phy/motorola/phy-cpcap-usb.c | 2 +- drivers/phy/phy-core.c | 4 + drivers/phy/renesas/Kconfig | 2 + drivers/phy/rockchip/phy-rockchip-typec.c | 2 + drivers/phy/tegra/xusb.c | 58 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 16 + drivers/pinctrl/intel/pinctrl-denverton.c | 2 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 13 +- drivers/pinctrl/pinctrl-gemini.c | 2 +- drivers/pinctrl/pinctrl-single.c | 5 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 6 +- drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 6 +- drivers/platform/x86/asus-wireless.c | 1 + drivers/platform/x86/dell-laptop.c | 17 + drivers/platform/x86/dell-wmi.c | 2 + drivers/platform/x86/wmi.c | 2 +- drivers/s390/Makefile | 1 + drivers/s390/block/Kconfig | 1 + drivers/s390/block/dasd.c | 11 +- drivers/s390/block/dasd_3990_erp.c | 10 + drivers/s390/block/dasd_devmap.c | 1 + drivers/s390/block/dasd_diag.c | 1 + drivers/s390/block/dasd_eckd.c | 17 +- drivers/s390/block/dasd_fba.c | 1 + drivers/s390/block/dasd_int.h | 2 +- drivers/s390/block/dcssblk.c | 1 + drivers/s390/block/scm_blk.c | 1 + drivers/s390/block/xpram.c | 1 + drivers/s390/char/Kconfig | 1 + drivers/s390/char/Makefile | 2 + drivers/s390/char/defkeymap.map | 1 + drivers/s390/char/fs3270.c | 1 + drivers/s390/char/hmcdrv_mod.c | 1 + drivers/s390/char/monreader.c | 1 + drivers/s390/char/monwriter.c | 1 + drivers/s390/char/raw3270.c | 1 + drivers/s390/char/sclp_async.c | 1 + drivers/s390/char/tape_34xx.c | 1 + drivers/s390/char/tape_3590.c | 1 + drivers/s390/char/tape_class.c | 1 + drivers/s390/char/tape_core.c | 1 + drivers/s390/char/tty3270.c | 1 + drivers/s390/char/vmlogrdr.c | 1 + drivers/s390/char/vmur.c | 1 + drivers/s390/char/zcore.c | 2 +- drivers/s390/cio/blacklist.h | 1 + drivers/s390/cio/ccwgroup.c | 1 + drivers/s390/cio/chp.c | 1 + drivers/s390/cio/chsc.c | 1 + drivers/s390/cio/chsc_sch.c | 1 + drivers/s390/cio/cio.c | 1 + drivers/s390/cio/cmf.c | 15 +- drivers/s390/cio/css.c | 3 +- drivers/s390/cio/device.c | 3 +- drivers/s390/cio/device_fsm.c | 1 + drivers/s390/cio/device_ops.c | 3 +- drivers/s390/cio/eadm_sch.c | 1 + drivers/s390/cio/isc.c | 1 + drivers/s390/cio/qdio_main.c | 8 +- drivers/s390/cio/qdio_setup.c | 1 + drivers/s390/cio/scm.c | 1 + drivers/s390/cio/vfio_ccw_drv.c | 1 + drivers/s390/crypto/ap_bus.c | 15 +- drivers/s390/crypto/ap_bus.h | 15 +- drivers/s390/crypto/pkey_api.c | 6 +- drivers/s390/crypto/zcrypt_api.c | 19 +- drivers/s390/crypto/zcrypt_api.h | 15 +- drivers/s390/crypto/zcrypt_card.c | 11 +- drivers/s390/crypto/zcrypt_cca_key.h | 15 +- drivers/s390/crypto/zcrypt_cex2a.c | 15 +- drivers/s390/crypto/zcrypt_cex2a.h | 15 +- drivers/s390/crypto/zcrypt_cex4.c | 1 + drivers/s390/crypto/zcrypt_error.h | 15 +- drivers/s390/crypto/zcrypt_msgtype50.c | 15 +- drivers/s390/crypto/zcrypt_msgtype50.h | 15 +- drivers/s390/crypto/zcrypt_msgtype6.c | 15 +- drivers/s390/crypto/zcrypt_msgtype6.h | 15 +- drivers/s390/crypto/zcrypt_pcixcc.c | 15 +- drivers/s390/crypto/zcrypt_pcixcc.h | 15 +- drivers/s390/crypto/zcrypt_queue.c | 11 +- drivers/s390/net/Kconfig | 1 + drivers/s390/net/ctcm_main.c | 1 + drivers/s390/net/fsm.c | 1 + drivers/s390/net/lcs.c | 15 +- drivers/s390/net/netiucv.c | 16 +- drivers/s390/net/qeth_core.h | 9 +- drivers/s390/net/qeth_core_main.c | 47 +- drivers/s390/net/qeth_core_sys.c | 1 + drivers/s390/net/qeth_l2_main.c | 5 +- drivers/s390/net/qeth_l3.h | 2 +- drivers/s390/net/qeth_l3_main.c | 44 +- drivers/s390/net/qeth_l3_sys.c | 75 +- drivers/s390/net/smsgiucv.c | 15 +- drivers/s390/net/smsgiucv_app.c | 1 + drivers/s390/scsi/Makefile | 1 + drivers/s390/scsi/zfcp_aux.c | 1 + drivers/s390/virtio/Makefile | 5 +- drivers/s390/virtio/virtio_ccw.c | 5 +- drivers/scsi/aacraid/aacraid.h | 2 + drivers/scsi/aacraid/commsup.c | 43 +- drivers/scsi/aacraid/linit.c | 5 +- drivers/scsi/aacraid/rx.c | 15 +- drivers/scsi/aacraid/src.c | 20 +- drivers/scsi/bfa/bfad_bsg.c | 6 +- drivers/scsi/bfa/bfad_im.c | 6 +- drivers/scsi/bfa/bfad_im.h | 10 + drivers/scsi/libfc/fc_lport.c | 4 + drivers/scsi/libsas/sas_expander.c | 10 +- drivers/scsi/libsas/sas_scsi_host.c | 17 +- drivers/scsi/lpfc/lpfc_mem.c | 2 +- drivers/scsi/osd/osd_initiator.c | 4 +- drivers/scsi/scsi_debugfs.c | 6 +- drivers/scsi/scsi_devinfo.c | 33 +- drivers/scsi/scsi_lib.c | 12 +- drivers/scsi/scsi_scan.c | 13 +- drivers/scsi/scsi_sysfs.c | 10 +- drivers/scsi/scsi_transport_spi.c | 12 +- drivers/scsi/sd.c | 4 +- drivers/scsi/storvsc_drv.c | 3 +- drivers/scsi/ufs/ufshcd.c | 7 +- drivers/soc/amlogic/meson-gx-socinfo.c | 4 +- drivers/spi/spi-armada-3700.c | 8 + drivers/spi/spi-atmel.c | 2 +- drivers/spi/spi-rspi.c | 4 +- drivers/spi/spi-sun4i.c | 2 +- drivers/spi/spi-xilinx.c | 11 + drivers/ssb/Kconfig | 2 +- drivers/staging/android/ashmem.c | 2 + drivers/staging/android/ion/Kconfig | 2 +- drivers/staging/android/ion/ion.c | 4 +- drivers/staging/android/ion/ion_cma_heap.c | 15 +- drivers/staging/ccree/ssi_hash.c | 11 +- drivers/staging/comedi/drivers/ni_atmio.c | 5 + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 23 +- drivers/staging/lustre/lnet/lnet/lib-socket.c | 8 +- drivers/staging/lustre/lustre/llite/file.c | 2 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 14 +- .../staging/media/atomisp/include/linux/atomisp.h | 34 +- .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 2 +- .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 2 +- .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.h | 16 +- .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 2 +- .../atomisp2/css2400/base/circbuf/src/circbuf.c | 26 +- .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 34 +- .../camera/pipe/interface/ia_css_pipe_util.h | 2 +- .../css2400/camera/util/interface/ia_css_util.h | 18 +- .../css_2401_csi2p_system/host/csi_rx_private.h | 2 +- .../css_2401_csi2p_system/host/ibuf_ctrl_private.h | 4 +- .../css2400/css_2401_csi2p_system/host/isys_irq.c | 2 +- .../css_2401_csi2p_system/host/isys_irq_private.h | 4 +- .../host/isys_stream2mmio_private.h | 4 +- .../css_2401_csi2p_system/host/pixelgen_private.h | 2 +- .../css_2401_csi2p_system/isys_dma_global.h | 4 +- .../css_2401_csi2p_system/pixelgen_global.h | 2 +- .../css2400/css_2401_csi2p_system/system_global.h | 8 +- .../atomisp/pci/atomisp2/css2400/css_api_version.h | 2 +- .../css2400/hive_isp_css_common/host/gp_timer.c | 2 +- .../hive_isp_css_include/host/csi_rx_public.h | 4 +- .../hive_isp_css_include/host/ibuf_ctrl_public.h | 4 +- .../css2400/hive_isp_css_include/host/isp_op1w.h | 98 +- .../css2400/hive_isp_css_include/host/isp_op2w.h | 78 +- .../host/isys_stream2mmio_public.h | 4 +- .../hive_isp_css_include/host/pixelgen_public.h | 4 +- .../hive_isp_css_include/host/ref_vector_func.h | 144 +- .../css2400/hive_isp_css_include/math_support.h | 2 +- .../css2400/hive_isp_css_include/string_support.h | 8 +- .../css2400/hive_isp_css_shared/host/tag.c | 4 +- .../media/atomisp/pci/atomisp2/css2400/ia_css.h | 2 +- .../media/atomisp/pci/atomisp2/css2400/ia_css_3a.h | 38 +- .../pci/atomisp2/css2400/ia_css_acc_types.h | 216 +- .../atomisp/pci/atomisp2/css2400/ia_css_buffer.h | 32 +- .../atomisp/pci/atomisp2/css2400/ia_css_control.h | 22 +- .../pci/atomisp2/css2400/ia_css_device_access.h | 2 +- .../atomisp/pci/atomisp2/css2400/ia_css_dvs.h | 52 +- .../atomisp/pci/atomisp2/css2400/ia_css_env.h | 40 +- .../atomisp/pci/atomisp2/css2400/ia_css_err.h | 18 +- .../pci/atomisp2/css2400/ia_css_event_public.h | 68 +- .../atomisp/pci/atomisp2/css2400/ia_css_firmware.h | 14 +- .../atomisp/pci/atomisp2/css2400/ia_css_frac.h | 10 +- .../pci/atomisp2/css2400/ia_css_frame_format.h | 62 +- .../pci/atomisp2/css2400/ia_css_frame_public.h | 120 +- .../pci/atomisp2/css2400/ia_css_input_port.h | 32 +- .../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 112 +- .../atomisp/pci/atomisp2/css2400/ia_css_metadata.h | 24 +- .../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 10 +- .../atomisp/pci/atomisp2/css2400/ia_css_mmu.h | 4 +- .../atomisp/pci/atomisp2/css2400/ia_css_morph.h | 6 +- .../pci/atomisp2/css2400/ia_css_pipe_public.h | 128 +- .../atomisp/pci/atomisp2/css2400/ia_css_prbs.h | 12 +- .../pci/atomisp2/css2400/ia_css_properties.h | 6 +- .../atomisp/pci/atomisp2/css2400/ia_css_shading.h | 6 +- .../atomisp/pci/atomisp2/css2400/ia_css_stream.h | 4 +- .../pci/atomisp2/css2400/ia_css_stream_format.h | 90 +- .../pci/atomisp2/css2400/ia_css_stream_public.h | 148 +- .../atomisp/pci/atomisp2/css2400/ia_css_timer.h | 30 +- .../atomisp/pci/atomisp2/css2400/ia_css_tpg.h | 8 +- .../atomisp/pci/atomisp2/css2400/ia_css_types.h | 258 +- .../atomisp/pci/atomisp2/css2400/ia_css_version.h | 6 +- .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h | 6 +- .../isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 6 +- .../isp/kernels/anr/anr_2/ia_css_anr2_types.h | 4 +- .../isp/kernels/anr/anr_2/ia_css_anr_param.h | 2 +- .../bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h | 2 +- .../css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h | 4 +- .../css2400/isp/kernels/bnlm/ia_css_bnlm_types.h | 36 +- .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 34 +- .../isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 20 +- .../conversion_1.0/ia_css_conversion_types.h | 8 +- .../isp/kernels/crop/crop_1.0/ia_css_crop_param.h | 2 +- .../isp/kernels/crop/crop_1.0/ia_css_crop_types.h | 2 +- .../isp/kernels/csc/csc_1.0/ia_css_csc_types.h | 8 +- .../isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 12 +- .../isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 10 +- .../isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 38 +- .../isp/kernels/de/de_1.0/ia_css_de_types.h | 10 +- .../css2400/isp/kernels/de/de_2/ia_css_de2_types.h | 10 +- .../isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 8 +- .../css2400/isp/kernels/dpc2/ia_css_dpc2_types.h | 6 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 2 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 2 +- .../isp/kernels/eed1_8/ia_css_eed1_8_types.h | 82 +- .../isp/kernels/fc/fc_1.0/ia_css_formats_types.h | 6 +- .../isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 14 +- .../isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 32 +- .../css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h | 14 +- .../css2400/isp/kernels/hdr/ia_css_hdr_types.h | 26 +- .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 2 +- .../yuv444_io_ls/ia_css_yuv444_io.host.c | 2 +- .../kernels/macc/macc1_5/ia_css_macc1_5_types.h | 16 +- .../isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 12 +- .../css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h | 12 +- .../isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 26 +- .../output/output_1.0/ia_css_output_param.h | 2 +- .../output/output_1.0/ia_css_output_types.h | 8 +- .../kernels/qplane/qplane_2/ia_css_qplane_types.h | 2 +- .../isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 2 +- .../isp/kernels/ref/ref_1.0/ia_css_ref_param.h | 2 +- .../isp/kernels/ref/ref_1.0/ia_css_ref_types.h | 2 +- .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 98 +- .../kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h | 2 +- .../css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 4 +- .../isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 42 +- .../kernels/sdis/common/ia_css_sdis_common_types.h | 104 +- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 20 +- .../isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h | 40 +- .../isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 38 +- .../isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 26 +- .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 10 +- .../isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 4 +- .../isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 4 +- .../isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 14 +- .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 2 +- .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 2 +- .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 20 +- .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 30 +- .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 28 +- .../isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 40 +- .../yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h | 2 +- .../atomisp/pci/atomisp2/css2400/memory_realloc.c | 2 +- .../runtime/binary/interface/ia_css_binary.h | 2 +- .../atomisp2/css2400/runtime/binary/src/binary.c | 2 +- .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 2 +- .../css2400/runtime/debug/interface/ia_css_debug.h | 30 +- .../css2400/runtime/debug/src/ia_css_debug.c | 10 +- .../pci/atomisp2/css2400/runtime/event/src/event.c | 4 +- .../atomisp2/css2400/runtime/eventq/src/eventq.c | 2 +- .../css2400/runtime/frame/interface/ia_css_frame.h | 22 +- .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 2 +- .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 2 +- .../css2400/runtime/inputfifo/src/inputfifo.c | 2 +- .../isp_param/interface/ia_css_isp_param_types.h | 6 +- .../css2400/runtime/isp_param/src/isp_param.c | 2 +- .../css2400/runtime/isys/interface/ia_css_isys.h | 6 +- .../css2400/runtime/isys/src/csi_rx_rmgr.c | 2 +- .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c | 2 +- .../css2400/runtime/isys/src/isys_dma_rmgr.c | 2 +- .../atomisp2/css2400/runtime/isys/src/isys_init.c | 2 +- .../runtime/isys/src/isys_stream2mmio_rmgr.c | 2 +- .../pci/atomisp2/css2400/runtime/isys/src/rx.c | 2 +- .../css2400/runtime/isys/src/virtual_isys.c | 8 +- .../runtime/pipeline/interface/ia_css_pipeline.h | 28 +- .../css2400/runtime/pipeline/src/pipeline.c | 8 +- .../css2400/runtime/queue/interface/ia_css_queue.h | 22 +- .../css2400/runtime/queue/src/queue_access.c | 2 +- .../pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c | 4 +- .../atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 26 +- .../runtime/spctrl/interface/ia_css_spctrl.h | 20 +- .../runtime/spctrl/interface/ia_css_spctrl_comm.h | 14 +- .../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 4 +- .../pci/atomisp2/css2400/runtime/timer/src/timer.c | 2 +- .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 68 +- .../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 22 +- .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 2 +- .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 4 +- .../atomisp/pci/atomisp2/css2400/sh_css_params.h | 4 +- .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 18 +- .../atomisp/pci/atomisp2/css2400/sh_css_struct.h | 2 +- drivers/staging/octeon-usb/octeon-hcd.c | 6 +- drivers/staging/pi433/rf69.c | 2 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 14 +- drivers/target/target_core_pscsi.c | 4 +- drivers/tee/optee/core.c | 1 - drivers/thunderbolt/nhi.c | 2 +- drivers/tty/n_tty.c | 4 +- drivers/tty/serdev/serdev-ttyport.c | 26 +- drivers/tty/serial/8250/8250_early.c | 14 +- drivers/tty/serial/8250/8250_pci.c | 3 + drivers/usb/chipidea/ci_hdrc_msm.c | 2 +- drivers/usb/common/ulpi.c | 4 +- drivers/usb/core/config.c | 32 +- drivers/usb/core/devio.c | 14 +- drivers/usb/core/hub.c | 9 + drivers/usb/core/quirks.c | 9 +- drivers/usb/dwc2/core.h | 4 + drivers/usb/dwc2/gadget.c | 42 +- drivers/usb/dwc2/params.c | 29 +- drivers/usb/dwc3/dwc3-of-simple.c | 5 +- drivers/usb/dwc3/gadget.c | 4 +- drivers/usb/gadget/composite.c | 7 +- drivers/usb/gadget/function/f_fs.c | 15 +- drivers/usb/gadget/legacy/Kconfig | 2 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 1 - drivers/usb/gadget/udc/core.c | 36 +- drivers/usb/gadget/udc/renesas_usb3.c | 2 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/xhci-debugfs.c | 16 +- drivers/usb/host/xhci-mem.c | 22 +- drivers/usb/host/xhci-pci.c | 3 + drivers/usb/host/xhci-ring.c | 18 +- drivers/usb/host/xhci.c | 6 +- drivers/usb/misc/usb3503.c | 2 + drivers/usb/mon/mon_bin.c | 8 +- drivers/usb/musb/da8xx.c | 10 +- drivers/usb/serial/cp210x.c | 2 + drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 6 + drivers/usb/serial/option.c | 20 + drivers/usb/serial/qcserial.c | 3 + drivers/usb/serial/usb_debug.c | 2 + drivers/usb/storage/uas-detect.h | 4 + drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/storage/unusual_uas.h | 14 + drivers/usb/typec/Kconfig | 54 +- drivers/usb/typec/ucsi/Kconfig | 1 - drivers/usb/usbip/stub_dev.c | 3 +- drivers/usb/usbip/stub_main.c | 5 +- drivers/usb/usbip/stub_rx.c | 47 +- drivers/usb/usbip/stub_tx.c | 13 +- drivers/usb/usbip/usbip_common.c | 33 +- drivers/usb/usbip/usbip_common.h | 1 + drivers/usb/usbip/vhci_hcd.c | 13 +- drivers/usb/usbip/vhci_rx.c | 23 +- drivers/usb/usbip/vhci_sysfs.c | 25 +- drivers/usb/usbip/vhci_tx.c | 3 +- drivers/usb/usbip/vudc_rx.c | 19 + drivers/usb/usbip/vudc_tx.c | 11 +- drivers/vhost/net.c | 20 +- drivers/virtio/virtio.c | 2 + drivers/virtio/virtio_balloon.c | 3 +- drivers/virtio/virtio_mmio.c | 22 +- drivers/xen/Kconfig | 2 +- drivers/xen/balloon.c | 65 +- drivers/xen/gntdev.c | 8 +- drivers/xen/pvcalls-front.c | 6 +- fs/9p/vfs_super.c | 6 +- fs/adfs/super.c | 4 +- fs/affs/amigaffs.c | 2 +- fs/affs/bitmap.c | 6 +- fs/affs/super.c | 16 +- fs/afs/dir.c | 37 +- fs/afs/inode.c | 4 + fs/afs/internal.h | 5 +- fs/afs/rxrpc.c | 2 +- fs/afs/security.c | 18 +- fs/afs/super.c | 18 +- fs/afs/write.c | 8 +- fs/autofs4/root.c | 17 +- fs/autofs4/waitq.c | 1 - fs/befs/ChangeLog | 2 +- fs/befs/linuxvfs.c | 4 +- fs/btrfs/compression.c | 9 +- fs/btrfs/compression.h | 5 +- fs/btrfs/ctree.c | 18 +- fs/btrfs/ctree.h | 3 +- fs/btrfs/delayed-inode.c | 45 +- fs/btrfs/disk-io.c | 22 +- fs/btrfs/extent-tree.c | 15 +- fs/btrfs/extent_io.c | 4 +- fs/btrfs/extent_io.h | 8 +- fs/btrfs/file.c | 130 +- fs/btrfs/free-space-cache.c | 3 +- fs/btrfs/inode.c | 36 +- fs/btrfs/ioctl.c | 6 +- fs/btrfs/relocation.c | 3 +- fs/btrfs/send.c | 124 +- fs/btrfs/super.c | 63 +- fs/btrfs/tests/extent-io-tests.c | 6 +- fs/btrfs/tests/inode-tests.c | 12 +- fs/btrfs/tree-checker.c | 27 +- fs/btrfs/tree-checker.h | 14 +- fs/btrfs/tree-log.c | 2 +- fs/btrfs/volumes.c | 37 +- fs/ceph/mds_client.c | 42 +- fs/ceph/super.c | 8 +- fs/cifs/cifs_fs_sb.h | 2 +- fs/cifs/cifsfs.c | 12 +- fs/cifs/cifsglob.h | 4 +- fs/cifs/inode.c | 2 +- fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 30 +- fs/cifs/xattr.c | 8 +- fs/coda/inode.c | 4 +- fs/cramfs/Kconfig | 1 + fs/cramfs/inode.c | 4 +- fs/ecryptfs/main.c | 8 +- fs/efs/super.c | 4 +- fs/exec.c | 16 +- fs/ext2/balloc.c | 4 +- fs/ext2/ialloc.c | 4 +- fs/ext2/super.c | 20 +- fs/ext4/extents.c | 1 + fs/ext4/ialloc.c | 2 + fs/ext4/inode.c | 13 +- fs/ext4/namei.c | 4 + fs/ext4/super.c | 52 +- fs/f2fs/checkpoint.c | 10 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/gc.c | 2 +- fs/f2fs/recovery.c | 10 +- fs/f2fs/super.c | 28 +- fs/fat/fatent.c | 6 +- fs/fat/inode.c | 10 +- fs/fat/misc.c | 2 +- fs/fat/namei_msdos.c | 2 +- fs/freevxfs/vxfs_super.c | 4 +- fs/fs-writeback.c | 2 +- fs/fuse/inode.c | 12 +- fs/gfs2/ops_fstype.c | 16 +- fs/gfs2/super.c | 10 +- fs/gfs2/trans.c | 2 +- fs/hfs/mdb.c | 4 +- fs/hfs/super.c | 16 +- fs/hfsplus/super.c | 22 +- fs/hpfs/dir.c | 1 - fs/hpfs/dnode.c | 2 - fs/hpfs/map.c | 2 +- fs/hpfs/super.c | 9 +- fs/hugetlbfs/inode.c | 4 +- fs/inode.c | 10 +- fs/isofs/inode.c | 2 +- fs/jffs2/fs.c | 4 +- fs/jffs2/os-linux.h | 2 +- fs/jffs2/super.c | 4 +- fs/jfs/super.c | 10 +- fs/kernfs/mount.c | 2 +- fs/libfs.c | 6 +- fs/lockd/host.c | 24 +- fs/lockd/mon.c | 3 +- fs/lockd/svc.c | 38 +- fs/lockd/svcsubs.c | 2 +- fs/locks.c | 2 +- fs/mbcache.c | 3 + fs/minix/inode.c | 4 +- fs/namei.c | 15 +- fs/namespace.c | 1 + fs/ncpfs/inode.c | 4 +- fs/nfs/client.c | 11 + fs/nfs/dir.c | 2 +- fs/nfs/inode.c | 2 +- fs/nfs/internal.h | 2 +- fs/nfs/nfs4client.c | 17 +- fs/nfs/nfs4state.c | 4 +- fs/nfs/super.c | 22 +- fs/nfs/write.c | 2 + fs/nfs_common/grace.c | 10 +- fs/nfsd/auth.c | 3 + fs/nfsd/export.c | 10 +- fs/nfsd/netns.h | 3 + fs/nfsd/nfs4idmap.c | 4 +- fs/nfsd/nfs4state.c | 279 +- fs/nfsd/nfsctl.c | 3 + fs/nfsd/nfssvc.c | 14 +- fs/nilfs2/segment.c | 2 +- fs/nilfs2/super.c | 24 +- fs/nilfs2/the_nilfs.c | 6 +- fs/notify/fsnotify.c | 2 +- fs/nsfs.c | 2 +- fs/ntfs/super.c | 32 +- fs/ocfs2/file.c | 2 +- fs/ocfs2/super.c | 28 +- fs/ocfs2/xattr.c | 2 +- fs/openpromfs/inode.c | 4 +- fs/orangefs/super.c | 8 +- fs/overlayfs/Kconfig | 10 + fs/overlayfs/dir.c | 3 +- fs/overlayfs/namei.c | 18 +- fs/overlayfs/overlayfs.h | 2 +- fs/overlayfs/ovl_entry.h | 2 + fs/overlayfs/readdir.c | 7 +- fs/overlayfs/super.c | 97 +- fs/proc/array.c | 7 +- fs/proc/base.c | 5 +- fs/proc/inode.c | 2 +- fs/proc/root.c | 2 +- fs/proc_namespace.c | 8 +- fs/qnx4/inode.c | 4 +- fs/qnx6/inode.c | 4 +- fs/quota/dquot.c | 22 +- fs/reiserfs/inode.c | 2 +- fs/reiserfs/journal.c | 6 +- fs/reiserfs/prints.c | 4 +- fs/reiserfs/super.c | 19 +- fs/reiserfs/xattr.c | 10 +- fs/romfs/super.c | 4 +- fs/squashfs/super.c | 4 +- fs/statfs.c | 6 +- fs/super.c | 43 +- fs/sysfs/mount.c | 2 +- fs/sysv/inode.c | 2 +- fs/sysv/super.c | 2 +- fs/ubifs/file.c | 2 +- fs/ubifs/io.c | 2 +- fs/ubifs/super.c | 20 +- fs/ubifs/ubifs.h | 4 +- fs/udf/super.c | 6 +- fs/ufs/balloc.c | 8 +- fs/ufs/ialloc.c | 10 +- fs/ufs/super.c | 30 +- fs/userfaultfd.c | 20 +- fs/xfs/libxfs/xfs_alloc.c | 4 +- fs/xfs/libxfs/xfs_attr.c | 20 +- fs/xfs/libxfs/xfs_attr_leaf.c | 9 +- fs/xfs/libxfs/xfs_attr_leaf.h | 3 +- fs/xfs/libxfs/xfs_bmap.c | 8 +- fs/xfs/libxfs/xfs_defer.c | 39 +- fs/xfs/libxfs/xfs_defer.h | 5 +- fs/xfs/libxfs/xfs_ialloc.c | 10 +- fs/xfs/libxfs/xfs_ialloc.h | 1 - fs/xfs/libxfs/xfs_iext_tree.c | 4 +- fs/xfs/libxfs/xfs_refcount.c | 52 +- fs/xfs/libxfs/xfs_rmap.c | 99 +- fs/xfs/libxfs/xfs_rmap.h | 16 +- fs/xfs/scrub/inode.c | 14 +- fs/xfs/scrub/quota.c | 4 +- fs/xfs/scrub/scrub.c | 1 - fs/xfs/scrub/trace.c | 1 - fs/xfs/xfs_aops.c | 12 +- fs/xfs/xfs_bmap_item.c | 23 +- fs/xfs/xfs_bmap_item.h | 3 +- fs/xfs/xfs_buf.c | 15 +- fs/xfs/xfs_dquot.c | 14 +- fs/xfs/xfs_dquot_item.c | 40 +- fs/xfs/xfs_extfree_item.c | 2 +- fs/xfs/xfs_fsops.c | 5 + fs/xfs/xfs_icache.c | 35 +- fs/xfs/xfs_icache.h | 1 + fs/xfs/xfs_inode.c | 82 +- fs/xfs/xfs_inode.h | 3 +- fs/xfs/xfs_iomap.c | 4 +- fs/xfs/xfs_log.c | 6 +- fs/xfs/xfs_log_recover.c | 75 +- fs/xfs/xfs_qm.c | 50 +- fs/xfs/xfs_refcount_item.c | 21 +- fs/xfs/xfs_refcount_item.h | 3 +- fs/xfs/xfs_reflink.c | 23 +- fs/xfs/xfs_super.c | 17 +- fs/xfs/xfs_super.h | 2 +- fs/xfs/xfs_symlink.c | 15 +- fs/xfs/xfs_trace.c | 1 - include/acpi/acpi_bus.h | 4 + include/acpi/acpi_drivers.h | 1 + include/asm-generic/mm_hooks.h | 5 +- include/asm-generic/pgtable.h | 17 +- include/crypto/if_alg.h | 6 +- include/crypto/internal/hash.h | 8 + include/crypto/mcryptd.h | 1 + include/drm/drm_connector.h | 10 + include/drm/drm_edid.h | 5 +- include/drm/drm_mode_config.h | 18 +- include/drm/ttm/ttm_page_alloc.h | 32 +- include/kvm/arm_arch_timer.h | 5 +- include/linux/acpi.h | 6 + include/linux/bio.h | 2 + include/linux/blk_types.h | 9 +- include/linux/blkdev.h | 25 +- include/linux/bpf.h | 36 +- include/linux/bpf_verifier.h | 4 +- include/linux/compiler-gcc.h | 2 +- include/linux/compiler.h | 47 +- include/linux/completion.h | 46 - include/linux/cpu.h | 7 + include/linux/cpuhotplug.h | 2 +- include/linux/crash_core.h | 2 + include/linux/cred.h | 1 + include/linux/debugfs.h | 2 + include/linux/delayacct.h | 8 +- include/linux/dma-mapping.h | 2 - include/linux/efi.h | 4 +- include/linux/fs.h | 19 +- include/linux/fscache.h | 2 +- include/linux/gpio/driver.h | 33 +- include/linux/hugetlb.h | 8 - include/linux/hyperv.h | 1 + include/linux/idr.h | 1 + include/linux/iio/adc/stm32-dfsdm-adc.h | 18 + include/linux/iio/consumer.h | 37 + include/linux/iio/hw-consumer.h | 21 + include/linux/iio/iio.h | 28 - include/linux/iio/timer/stm32-lptim-trigger.h | 5 +- include/linux/iio/types.h | 28 + include/linux/intel-pti.h | 43 + include/linux/ipv6.h | 3 +- include/linux/irq.h | 17 + include/linux/irqdesc.h | 15 +- include/linux/irqdomain.h | 2 +- include/linux/irqflags.h | 4 - include/linux/kallsyms.h | 6 - include/linux/kmemcheck.h | 1 - include/linux/kvm_host.h | 5 +- include/{lib => linux}/libgcc.h | 0 include/linux/lockdep.h | 127 - include/linux/mfd/rtsx_pci.h | 2 +- include/linux/migrate.h | 2 +- include/linux/mlx5/driver.h | 26 +- include/linux/mlx5/mlx5_ifc.h | 13 +- include/linux/mm.h | 14 + include/linux/netlink.h | 4 +- include/linux/oom.h | 9 + include/linux/pci.h | 3 + include/linux/perf_event.h | 6 +- include/linux/pm.h | 1 + include/linux/pti.h | 50 +- include/linux/ptr_ring.h | 23 +- include/linux/rbtree.h | 2 + include/linux/rculist_nulls.h | 38 - include/linux/rwlock_types.h | 3 - include/linux/sched.h | 17 +- include/linux/sched/coredump.h | 1 + include/linux/serdev.h | 2 +- include/linux/sh_eth.h | 1 - include/linux/skbuff.h | 3 +- include/linux/spi/spi.h | 2 +- include/linux/spinlock.h | 5 - include/linux/spinlock_types.h | 3 - include/linux/string.h | 5 +- include/linux/sunrpc/cache.h | 2 +- include/linux/sysfs.h | 6 + include/linux/tcp.h | 3 +- include/linux/tick.h | 1 + include/linux/timer.h | 4 +- include/linux/trace.h | 2 +- include/linux/usb/usbnet.h | 1 + include/linux/vermagic.h | 8 +- include/net/arp.h | 3 + include/net/cfg80211.h | 3 +- include/net/gue.h | 18 +- include/net/ip.h | 1 + include/net/mac80211.h | 8 +- include/net/pkt_cls.h | 5 +- include/net/red.h | 13 +- include/net/sch_generic.h | 3 + include/net/sctp/checksum.h | 13 +- include/net/sctp/sctp.h | 5 + include/net/sctp/stream_sched.h | 5 + include/net/sctp/structs.h | 5 +- include/net/sock.h | 11 +- include/net/tc_act/tc_sample.h | 1 - include/net/tcp.h | 5 +- include/net/tls.h | 2 +- include/net/vxlan.h | 2 +- include/net/xfrm.h | 3 + include/scsi/libsas.h | 2 +- include/sound/hdaudio_ext.h | 4 +- include/sound/pcm.h | 8 + include/sound/rt5514.h | 2 + include/sound/rt5645.h | 3 + include/sound/soc-acpi-intel-match.h | 1 + include/sound/soc-acpi.h | 14 +- include/sound/soc-dai.h | 5 +- include/sound/soc.h | 11 +- include/trace/events/clk.h | 4 +- include/trace/events/kvm.h | 7 +- include/trace/events/preemptirq.h | 11 +- include/trace/events/rxrpc.h | 86 +- include/trace/events/tcp.h | 97 +- include/trace/events/xdp.h | 1 + include/uapi/asm-generic/bpf_perf_event.h | 9 + include/uapi/linux/bcache.h | 2 +- include/uapi/linux/bfs_fs.h | 2 +- include/uapi/linux/bpf_perf_event.h | 5 +- include/uapi/linux/if_ether.h | 3 + include/uapi/linux/kfd_ioctl.h | 22 +- include/uapi/linux/kvm.h | 8 +- include/uapi/linux/libc-compat.h | 61 +- include/uapi/linux/netfilter/nf_conntrack_common.h | 2 +- include/uapi/linux/openvswitch.h | 1 - include/uapi/linux/pkt_sched.h | 1 - include/uapi/linux/rtnetlink.h | 1 + include/uapi/linux/rxrpc.h | 1 + include/uapi/linux/usb/ch9.h | 3 + include/uapi/linux/vm_sockets_diag.h | 1 + include/uapi/sound/asound.h | 9 + include/uapi/sound/snd_sst_tokens.h | 17 +- include/xen/balloon.h | 5 + init/Kconfig | 14 +- init/main.c | 16 +- ipc/mqueue.c | 2 +- kernel/acct.c | 2 +- kernel/bpf/arraymap.c | 61 +- kernel/bpf/core.c | 26 +- kernel/bpf/hashtab.c | 2 + kernel/bpf/inode.c | 40 +- kernel/bpf/offload.c | 15 + kernel/bpf/sockmap.c | 11 +- kernel/bpf/syscall.c | 2 +- kernel/bpf/verifier.c | 388 ++- kernel/cgroup/cgroup-v1.c | 6 +- kernel/cgroup/cgroup.c | 21 +- kernel/cgroup/debug.c | 4 +- kernel/cgroup/stat.c | 8 +- kernel/cpu.c | 26 +- kernel/crash_core.c | 2 +- kernel/debug/kdb/kdb_io.c | 2 +- kernel/delayacct.c | 42 +- kernel/events/core.c | 7 +- kernel/exit.c | 9 + kernel/fork.c | 3 +- kernel/futex.c | 90 +- kernel/groups.c | 5 +- kernel/irq/debug.h | 5 + kernel/irq/debugfs.c | 1 + kernel/irq/generic-chip.c | 11 +- kernel/irq/internals.h | 2 +- kernel/irq/irqdomain.c | 13 +- kernel/irq/matrix.c | 24 +- kernel/irq/msi.c | 64 +- kernel/kallsyms.c | 8 +- kernel/kcov.c | 4 +- kernel/locking/lockdep.c | 651 +---- kernel/locking/rtmutex.c | 26 +- kernel/locking/rtmutex_common.h | 1 + kernel/locking/spinlock.c | 13 +- kernel/module.c | 6 +- kernel/pid.c | 8 +- kernel/printk/printk.c | 3 - kernel/sched/completion.c | 5 - kernel/sched/core.c | 28 +- kernel/sched/cpufreq_schedutil.c | 2 +- kernel/sched/fair.c | 102 +- kernel/sched/membarrier.c | 2 + kernel/sched/rt.c | 8 +- kernel/sched/wait.c | 2 +- kernel/time/Kconfig | 1 + kernel/time/posix-timers.c | 29 +- kernel/time/tick-sched.c | 32 +- kernel/time/timer.c | 37 +- kernel/trace/Kconfig | 3 +- kernel/trace/blktrace.c | 30 +- kernel/trace/bpf_trace.c | 27 +- kernel/trace/ring_buffer.c | 79 +- kernel/trace/trace.c | 54 +- kernel/trace/trace_events.c | 16 +- kernel/trace/trace_stack.c | 4 + kernel/uid16.c | 1 + kernel/workqueue.c | 46 +- lib/Kconfig.debug | 33 - lib/ashldi3.c | 2 +- lib/ashrdi3.c | 2 +- lib/asn1_decoder.c | 49 +- lib/cmpdi2.c | 2 +- lib/kobject_uevent.c | 16 +- lib/lshrdi3.c | 2 +- lib/mpi/longlong.h | 18 +- lib/muldi3.c | 2 +- lib/nlattr.c | 22 +- lib/oid_registry.c | 16 +- lib/rbtree.c | 10 + lib/test_bpf.c | 54 +- lib/test_printf.c | 108 +- lib/timerqueue.c | 8 +- lib/ucmpdi2.c | 2 +- lib/vsprintf.c | 194 +- mm/backing-dev.c | 17 +- mm/debug.c | 28 +- mm/early_ioremap.c | 2 +- mm/frame_vector.c | 14 + mm/gup.c | 64 + mm/huge_memory.c | 36 +- mm/hugetlb.c | 12 +- mm/kasan/report.c | 8 +- mm/kmemcheck.c | 1 - mm/kmemleak.c | 4 +- mm/madvise.c | 4 +- mm/memcontrol.c | 2 +- mm/memory.c | 13 +- mm/mmap.c | 18 +- mm/mprotect.c | 6 +- mm/oom_kill.c | 11 +- mm/page-writeback.c | 5 +- mm/page_alloc.c | 26 +- mm/page_owner.c | 1 - mm/percpu.c | 4 + mm/shmem.c | 10 +- mm/slab.c | 23 +- mm/sparse.c | 2 +- mm/vmscan.c | 3 + mm/zsmalloc.c | 1 + net/8021q/vlan.c | 7 +- net/9p/trans_fd.c | 1 - net/9p/trans_xen.c | 4 + net/batman-adv/bat_iv_ogm.c | 4 +- net/batman-adv/bat_v.c | 2 +- net/batman-adv/fragmentation.c | 2 + net/batman-adv/tp_meter.c | 4 +- net/bluetooth/l2cap_core.c | 20 +- net/bridge/br_netlink.c | 11 +- net/caif/caif_dev.c | 5 +- net/caif/caif_usb.c | 4 +- net/caif/cfcnfg.c | 10 +- net/caif/cfctrl.c | 4 +- net/can/af_can.c | 36 +- net/core/dev.c | 18 +- net/core/ethtool.c | 15 +- net/core/filter.c | 10 +- net/core/flow_dissector.c | 3 +- net/core/neighbour.c | 4 +- net/core/net_namespace.c | 2 +- net/core/netprio_cgroup.c | 1 - net/core/rtnetlink.c | 10 +- net/core/skbuff.c | 17 +- net/core/sock_diag.c | 2 +- net/core/sysctl_net_core.c | 6 + net/dccp/minisocks.c | 6 + net/dccp/proto.c | 5 + net/dsa/dsa2.c | 25 +- net/dsa/slave.c | 1 - net/ipv4/arp.c | 7 +- net/ipv4/devinet.c | 2 +- net/ipv4/esp4.c | 1 + net/ipv4/esp4_offload.c | 3 +- net/ipv4/fib_frontend.c | 9 +- net/ipv4/fib_semantics.c | 8 +- net/ipv4/igmp.c | 44 +- net/ipv4/inet_timewait_sock.c | 6 +- net/ipv4/ip_gre.c | 3 +- net/ipv4/ip_tunnel.c | 4 +- net/ipv4/netfilter/arp_tables.c | 1 - net/ipv4/netfilter/ip_tables.c | 1 - net/ipv4/netfilter/ipt_CLUSTERIP.c | 3 +- net/ipv4/raw.c | 17 +- net/ipv4/route.c | 1 + net/ipv4/tcp.c | 1 + net/ipv4/tcp_bbr.c | 12 +- net/ipv4/tcp_input.c | 22 +- net/ipv4/tcp_ipv4.c | 61 +- net/ipv4/tcp_minisocks.c | 6 + net/ipv4/tcp_rate.c | 10 +- net/ipv4/tcp_recovery.c | 28 +- net/ipv4/tcp_timer.c | 2 + net/ipv4/xfrm4_input.c | 12 +- net/ipv6/af_inet6.c | 1 - net/ipv6/esp6.c | 3 +- net/ipv6/esp6_offload.c | 3 +- net/ipv6/exthdrs.c | 9 + net/ipv6/ip6_fib.c | 83 +- net/ipv6/ip6_gre.c | 72 +- net/ipv6/ip6_output.c | 24 +- net/ipv6/ip6_tunnel.c | 26 +- net/ipv6/ipv6_sockglue.c | 1 + net/ipv6/mcast.c | 25 +- net/ipv6/netfilter/ip6_tables.c | 1 - net/ipv6/netfilter/ip6t_MASQUERADE.c | 8 +- net/ipv6/route.c | 20 +- net/ipv6/sit.c | 1 + net/ipv6/tcp_ipv6.c | 13 +- net/ipv6/xfrm6_input.c | 10 +- net/kcm/kcmsock.c | 68 +- net/key/af_key.c | 12 +- net/mac80211/ht.c | 7 +- net/mac80211/mesh_hwmp.c | 15 +- net/mac80211/mlme.c | 2 +- net/mac80211/rx.c | 2 + net/mac80211/tx.c | 29 +- net/netfilter/nf_conntrack_h323_asn1.c | 128 +- net/netfilter/nf_conntrack_netlink.c | 13 +- net/netfilter/nf_conntrack_proto_tcp.c | 3 + net/netfilter/nf_tables_api.c | 15 +- net/netfilter/nfnetlink_cthelper.c | 10 + net/netfilter/nfnetlink_log.c | 5 + net/netfilter/nfnetlink_queue.c | 5 + net/netfilter/nft_exthdr.c | 2 + net/netfilter/x_tables.c | 9 + net/netfilter/xt_bpf.c | 20 +- net/netfilter/xt_osf.c | 7 + net/netlink/af_netlink.c | 6 +- net/openvswitch/datapath.c | 2 +- net/openvswitch/flow.c | 15 +- net/openvswitch/flow_netlink.c | 67 +- net/packet/af_packet.c | 37 +- net/packet/internal.h | 1 - net/rds/rdma.c | 6 +- net/rds/send.c | 3 + net/rxrpc/af_rxrpc.c | 24 +- net/rxrpc/ar-internal.h | 103 +- net/rxrpc/call_accept.c | 2 +- net/rxrpc/call_event.c | 229 +- net/rxrpc/call_object.c | 62 +- net/rxrpc/conn_client.c | 54 +- net/rxrpc/conn_event.c | 124 +- net/rxrpc/conn_object.c | 76 +- net/rxrpc/input.c | 76 +- net/rxrpc/misc.c | 19 +- net/rxrpc/net_ns.c | 33 +- net/rxrpc/output.c | 43 +- net/rxrpc/recvmsg.c | 12 +- net/rxrpc/sendmsg.c | 126 +- net/rxrpc/sysctl.c | 60 +- net/sched/act_gact.c | 2 +- net/sched/act_meta_mark.c | 1 - net/sched/act_meta_skbtcindex.c | 1 - net/sched/act_mirred.c | 2 +- net/sched/act_sample.c | 14 +- net/sched/cls_api.c | 20 +- net/sched/cls_bpf.c | 123 +- net/sched/cls_u32.c | 1 - net/sched/sch_api.c | 17 +- net/sched/sch_cbq.c | 9 +- net/sched/sch_choke.c | 3 + net/sched/sch_generic.c | 25 +- net/sched/sch_gred.c | 3 + net/sched/sch_ingress.c | 32 +- net/sched/sch_red.c | 33 +- net/sched/sch_sfq.c | 4 + net/sctp/chunk.c | 11 + net/sctp/debug.c | 3 + net/sctp/input.c | 28 +- net/sctp/ipv6.c | 1 + net/sctp/outqueue.c | 23 +- net/sctp/protocol.c | 1 + net/sctp/socket.c | 85 +- net/sctp/stream.c | 101 +- net/sctp/stream_sched.c | 25 +- net/sctp/stream_sched_prio.c | 7 +- net/sctp/stream_sched_rr.c | 7 +- net/sctp/transport.c | 29 +- net/sctp/ulpqueue.c | 24 +- net/socket.c | 123 +- net/strparser/strparser.c | 2 +- net/sunrpc/auth_gss/gss_rpc_xdr.c | 1 + net/sunrpc/auth_gss/svcauth_gss.c | 5 +- net/sunrpc/cache.c | 2 +- net/sunrpc/clnt.c | 5 + net/sunrpc/svcauth_unix.c | 6 +- net/sunrpc/xprt.c | 28 +- net/sunrpc/xprtrdma/rpc_rdma.c | 6 +- net/sunrpc/xprtrdma/transport.c | 2 + net/sunrpc/xprtrdma/verbs.c | 2 +- net/sunrpc/xprtrdma/xprt_rdma.h | 1 + net/sunrpc/xprtsock.c | 2 + net/tipc/bearer.c | 5 +- net/tipc/group.c | 71 +- net/tipc/monitor.c | 6 +- net/tipc/node.c | 26 +- net/tipc/server.c | 3 +- net/tipc/socket.c | 4 +- net/tipc/udp_media.c | 4 - net/tls/tls_main.c | 17 +- net/tls/tls_sw.c | 16 +- net/vmw_vsock/hyperv_transport.c | 2 +- net/vmw_vsock/vmci_transport.c | 14 +- net/wireless/Kconfig | 7 + net/wireless/Makefile | 39 +- net/wireless/certs/sforshee.hex | 86 + net/wireless/certs/sforshee.x509 | Bin 680 -> 0 bytes net/wireless/core.c | 8 +- net/wireless/core.h | 2 - net/wireless/nl80211.c | 20 +- net/wireless/reg.c | 3 +- net/wireless/wext-compat.c | 3 +- net/xfrm/xfrm_input.c | 69 +- net/xfrm/xfrm_policy.c | 24 +- net/xfrm/xfrm_state.c | 12 +- net/xfrm/xfrm_user.c | 26 +- samples/bpf/bpf_load.c | 14 +- scripts/Makefile.build | 14 +- scripts/bloat-o-meter | 7 +- scripts/checkpatch.pl | 24 +- scripts/decodecode | 8 + scripts/faddr2line | 21 +- scripts/gdb/linux/tasks.py | 2 + scripts/genksyms/.gitignore | 1 - scripts/kconfig/expr.c | 5 +- scripts/kernel-doc | 2 +- security/Kconfig | 11 + security/apparmor/apparmorfs.c | 2 +- security/apparmor/domain.c | 9 +- security/apparmor/include/audit.h | 12 +- security/apparmor/include/lib.h | 2 +- security/apparmor/include/perms.h | 3 + security/apparmor/ipc.c | 53 +- security/apparmor/mount.c | 12 +- security/commoncap.c | 21 +- security/keys/key.c | 1 - security/keys/keyctl.c | 24 +- security/keys/request_key.c | 48 +- sound/core/oss/pcm_oss.c | 41 +- sound/core/oss/pcm_plugin.c | 14 +- sound/core/pcm.c | 2 + sound/core/pcm_lib.c | 5 +- sound/core/pcm_misc.c | 19 +- sound/core/pcm_native.c | 9 +- sound/core/rawmidi.c | 15 +- sound/core/seq/seq_clientmgr.c | 3 + sound/core/seq/seq_clientmgr.h | 1 + sound/core/seq/seq_timer.c | 2 +- sound/drivers/aloop.c | 98 +- sound/hda/ext/hdac_ext_bus.c | 2 +- sound/hda/hdac_i915.c | 2 +- sound/pci/hda/patch_cirrus.c | 1 + sound/pci/hda/patch_conexant.c | 29 + sound/pci/hda/patch_hdmi.c | 6 +- sound/pci/hda/patch_realtek.c | 58 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/amd/acp-pcm-dma.c | 42 +- sound/soc/atmel/Kconfig | 2 +- sound/soc/atmel/atmel-classd.c | 6 - sound/soc/atmel/sam9g20_wm8731.c | 17 +- sound/soc/atmel/sam9x5_wm8731.c | 12 +- sound/soc/au1x/ac97c.c | 6 +- sound/soc/bcm/bcm2835-i2s.c | 20 +- sound/soc/cirrus/ep93xx-ac97.c | 6 +- sound/soc/codecs/88pm860x-codec.c | 9 +- sound/soc/codecs/Kconfig | 46 +- sound/soc/codecs/Makefile | 13 +- sound/soc/codecs/ak4613.c | 78 + sound/soc/codecs/cq93vc.c | 10 +- sound/soc/codecs/cs35l32.c | 18 +- sound/soc/codecs/cs35l34.c | 19 +- sound/soc/codecs/cs42l52.c | 13 +- sound/soc/codecs/cs42l56.c | 13 +- sound/soc/codecs/cs42l73.c | 15 +- sound/soc/codecs/cs47l24.c | 12 +- sound/soc/codecs/cx20442.c | 46 +- sound/soc/codecs/da7213.c | 7 +- sound/soc/codecs/da7218.c | 11 +- sound/soc/codecs/dmic.c | 24 +- sound/soc/codecs/hdac_hdmi.c | 358 ++- sound/soc/codecs/max98373.c | 976 +++++++ sound/soc/codecs/max98373.h | 213 ++ sound/soc/codecs/max98926.c | 2 +- sound/soc/codecs/max98927.c | 1 - sound/soc/codecs/mc13783.c | 9 +- sound/soc/codecs/msm8916-wcd-analog.c | 10 +- sound/soc/codecs/msm8916-wcd-digital.c | 4 +- sound/soc/codecs/nau8540.c | 98 +- sound/soc/codecs/nau8540.h | 20 + sound/soc/codecs/nau8824.c | 18 +- sound/soc/codecs/nau8825.c | 102 +- sound/soc/codecs/nau8825.h | 3 +- sound/soc/codecs/pcm186x-i2c.c | 69 + sound/soc/codecs/pcm186x-spi.c | 69 + sound/soc/codecs/pcm186x.c | 719 ++++++ sound/soc/codecs/pcm186x.h | 220 ++ sound/soc/codecs/pcm512x-spi.c | 4 + sound/soc/codecs/rl6231.c | 93 +- sound/soc/codecs/rt5514-spi.c | 16 +- sound/soc/codecs/rt5514.c | 87 +- sound/soc/codecs/rt5514.h | 5 +- sound/soc/codecs/rt5645.c | 189 +- sound/soc/codecs/rt5645.h | 6 + sound/soc/codecs/rt5663.c | 4 + sound/soc/codecs/rt5663.h | 4 + sound/soc/codecs/sgtl5000.c | 7 +- sound/soc/codecs/si476x.c | 9 +- sound/soc/codecs/sn95031.c | 936 ------- sound/soc/codecs/sn95031.h | 133 - sound/soc/codecs/spdif_receiver.c | 5 +- sound/soc/codecs/spdif_transmitter.c | 5 +- sound/soc/codecs/tas5720.c | 61 +- sound/soc/codecs/tas5720.h | 31 + sound/soc/codecs/tas6424.c | 707 +++++ sound/soc/codecs/tas6424.h | 144 ++ sound/soc/codecs/tfa9879.c | 1 + sound/soc/codecs/tlv320aic31xx.c | 310 +-- sound/soc/codecs/tlv320aic31xx.h | 335 +-- sound/soc/codecs/tlv320aic32x4.c | 182 +- sound/soc/codecs/tlv320aic32x4.h | 308 ++- sound/soc/codecs/tlv320aic3x.c | 15 +- sound/soc/codecs/tlv320dac33.c | 32 +- sound/soc/codecs/ts3a227e.c | 2 +- sound/soc/codecs/tscs42xx.c | 1456 +++++++++++ sound/soc/codecs/tscs42xx.h | 2693 ++++++++++++++++++++ sound/soc/codecs/twl4030.c | 13 +- sound/soc/codecs/twl6040.c | 18 +- sound/soc/codecs/uda1380.c | 42 +- sound/soc/codecs/wm0010.c | 5 +- sound/soc/codecs/wm2000.c | 6 +- sound/soc/codecs/wm2200.c | 9 +- sound/soc/codecs/wm5102.c | 11 +- sound/soc/codecs/wm5110.c | 12 +- sound/soc/codecs/wm8350.c | 10 +- sound/soc/codecs/wm8400.c | 9 +- sound/soc/codecs/wm8903.c | 12 +- sound/soc/codecs/wm8994.c | 10 +- sound/soc/codecs/wm8997.c | 11 +- sound/soc/codecs/wm8998.c | 12 +- sound/soc/codecs/wm_adsp.c | 12 +- sound/soc/davinci/davinci-mcasp.c | 19 + sound/soc/fsl/eukrea-tlv320.c | 1 - sound/soc/fsl/fsl-asoc-card.c | 4 +- sound/soc/fsl/fsl_asrc.h | 6 +- sound/soc/fsl/fsl_dma.c | 4 +- sound/soc/fsl/fsl_ssi.c | 1393 +++++----- sound/soc/fsl/fsl_ssi.h | 427 ++-- sound/soc/fsl/fsl_ssi_dbg.c | 59 +- sound/soc/hisilicon/hi6210-i2s.c | 1 - sound/soc/intel/Kconfig | 118 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 3 + sound/soc/intel/atom/sst/sst_stream.c | 8 +- sound/soc/intel/boards/Kconfig | 196 +- sound/soc/intel/boards/bytcht_da7213.c | 4 +- sound/soc/intel/boards/bytcht_es8316.c | 26 +- sound/soc/intel/boards/bytcr_rt5640.c | 4 +- sound/soc/intel/boards/bytcr_rt5651.c | 50 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 13 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 4 +- sound/soc/intel/boards/haswell.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 99 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- sound/soc/intel/boards/mfld_machine.c | 428 ---- sound/soc/intel/common/sst-dsp.c | 4 +- sound/soc/intel/skylake/Makefile | 5 + sound/soc/intel/skylake/bxt-sst.c | 2 +- sound/soc/intel/skylake/cnl-sst.c | 2 +- sound/soc/intel/skylake/skl-i2s.h | 95 + sound/soc/intel/skylake/skl-messages.c | 23 + sound/soc/intel/skylake/skl-nhlt.c | 190 +- sound/soc/intel/skylake/skl-pcm.c | 14 +- sound/soc/intel/skylake/skl-ssp-clk.c | 429 ++++ sound/soc/intel/skylake/skl-ssp-clk.h | 117 + sound/soc/intel/skylake/skl-sst-dsp.c | 14 +- sound/soc/intel/skylake/skl-sst-dsp.h | 4 + sound/soc/intel/skylake/skl-sst-utils.c | 6 +- sound/soc/intel/skylake/skl-sst.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 47 +- sound/soc/intel/skylake/skl.c | 150 +- sound/soc/intel/skylake/skl.h | 28 + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 552 ++-- sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 15 +- sound/soc/mediatek/mt2701/mt2701-afe-common.h | 87 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 215 +- sound/soc/mediatek/mt2701/mt2701-reg.h | 42 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 - sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 - sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 - sound/soc/mxs/mxs-sgtl5000.c | 25 +- sound/soc/nuc900/nuc900-ac97.c | 11 +- sound/soc/omap/ams-delta.c | 4 +- sound/soc/qcom/apq8016_sbc.c | 10 +- sound/soc/rockchip/rk3399_gru_sound.c | 22 +- sound/soc/rockchip/rockchip_i2s.c | 11 +- sound/soc/rockchip/rockchip_spdif.c | 18 +- sound/soc/samsung/bells.c | 40 +- sound/soc/sh/rcar/adg.c | 6 +- sound/soc/sh/rcar/core.c | 147 +- sound/soc/sh/rcar/dma.c | 104 +- sound/soc/sh/rcar/rsnd.h | 15 +- sound/soc/sh/rcar/ssi.c | 161 +- sound/soc/sh/rcar/ssiu.c | 5 +- sound/soc/soc-acpi.c | 73 +- sound/soc/soc-compress.c | 81 +- sound/soc/soc-core.c | 44 +- sound/soc/soc-io.c | 6 + sound/soc/soc-ops.c | 4 +- sound/soc/soc-pcm.c | 7 +- sound/soc/soc-utils.c | 2 +- sound/soc/stm/Kconfig | 12 + sound/soc/stm/Makefile | 3 + sound/soc/stm/stm32_adfsdm.c | 347 +++ sound/soc/stm/stm32_sai.c | 114 +- sound/soc/sunxi/sun4i-codec.c | 29 +- sound/soc/sunxi/sun4i-i2s.c | 57 +- sound/soc/sunxi/sun8i-codec.c | 82 +- sound/soc/uniphier/Kconfig | 19 + sound/soc/uniphier/Makefile | 3 + sound/soc/uniphier/evea.c | 567 +++++ sound/soc/ux500/mop500.c | 4 + sound/soc/ux500/ux500_pcm.c | 5 + sound/usb/mixer.c | 30 +- sound/usb/quirks.c | 7 +- tools/arch/arm/include/uapi/asm/kvm.h | 7 + tools/arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 + tools/arch/arm64/include/uapi/asm/kvm.h | 7 + tools/arch/s390/include/uapi/asm/bpf_perf_event.h | 9 + tools/arch/s390/include/uapi/asm/kvm.h | 4 - tools/arch/s390/include/uapi/asm/kvm_perf.h | 4 - tools/arch/s390/include/uapi/asm/perf_regs.h | 44 + tools/arch/s390/include/uapi/asm/ptrace.h | 457 ++++ tools/arch/x86/include/asm/cpufeatures.h | 538 ++-- tools/arch/x86/include/asm/disabled-features.h | 8 +- tools/bpf/bpftool/Documentation/Makefile | 2 +- tools/bpf/bpftool/Makefile | 7 +- tools/bpf/bpftool/main.c | 36 +- tools/bpf/bpftool/main.h | 5 +- tools/bpf/bpftool/map.c | 8 +- tools/bpf/bpftool/prog.c | 2 + tools/hv/hv_kvp_daemon.c | 70 +- tools/include/linux/compiler.h | 21 +- tools/include/linux/kmemcheck.h | 1 - tools/include/linux/lockdep.h | 1 + tools/include/uapi/asm-generic/bpf_perf_event.h | 9 + tools/include/uapi/asm-generic/mman.h | 1 + tools/include/uapi/asm/bpf_perf_event.h | 7 + tools/include/uapi/drm/drm.h | 41 + tools/include/uapi/drm/i915_drm.h | 33 +- tools/include/uapi/linux/bpf_perf_event.h | 6 +- tools/include/uapi/linux/kcmp.h | 1 + tools/include/uapi/linux/kvm.h | 5 +- tools/include/uapi/linux/perf_event.h | 1 + tools/include/uapi/linux/prctl.h | 10 + tools/kvm/kvm_stat/kvm_stat | 74 +- tools/kvm/kvm_stat/kvm_stat.txt | 4 +- tools/objtool/Makefile | 10 +- tools/objtool/arch/x86/decode.c | 2 +- tools/objtool/arch/x86/lib/x86-opcode-map.txt | 15 +- tools/objtool/builtin-orc.c | 4 +- tools/objtool/check.c | 69 +- tools/objtool/check.h | 2 +- tools/objtool/elf.c | 4 +- tools/objtool/orc_dump.c | 7 +- tools/objtool/orc_gen.c | 2 + tools/perf/Makefile.config | 9 +- tools/perf/arch/s390/Makefile | 1 + tools/perf/arch/s390/include/perf_regs.h | 2 +- tools/perf/arch/s390/util/dwarf-regs.c | 32 +- tools/perf/bench/numa.c | 56 +- tools/perf/builtin-help.c | 4 +- tools/perf/builtin-record.c | 42 +- tools/perf/builtin-report.c | 3 + tools/perf/builtin-script.c | 31 +- tools/perf/builtin-top.c | 36 +- tools/perf/builtin-trace.c | 6 +- tools/perf/check-headers.sh | 2 + tools/perf/jvmti/jvmti_agent.c | 16 +- tools/perf/jvmti/jvmti_agent.h | 7 +- tools/perf/jvmti/libjvmti.c | 147 +- .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 7 +- tools/perf/tests/shell/trace+probe_vfs_getname.sh | 6 +- tools/perf/tests/task-exit.c | 4 + tools/perf/trace/beauty/mmap.c | 3 + tools/perf/util/annotate.c | 18 +- tools/perf/util/evlist.c | 14 +- tools/perf/util/evlist.h | 2 + tools/perf/util/evsel.c | 14 +- tools/perf/util/evsel.h | 1 + tools/perf/util/intel-pt-decoder/inat.h | 10 + .../perf/util/intel-pt-decoder/x86-opcode-map.txt | 15 +- tools/perf/util/machine.c | 3 + tools/perf/util/mmap.h | 2 +- tools/perf/util/parse-events.c | 2 + tools/perf/util/parse-events.h | 3 + tools/perf/util/pmu.c | 5 + tools/power/cpupower/bench/system.c | 2 +- .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 9 +- tools/testing/selftests/bpf/Makefile | 5 +- tools/testing/selftests/bpf/test_align.c | 22 +- tools/testing/selftests/bpf/test_progs.c | 8 +- tools/testing/selftests/bpf/test_verifier.c | 819 +++++- tools/testing/selftests/bpf/test_verifier_log.c | 7 + tools/testing/selftests/net/config | 1 + tools/testing/selftests/x86/Makefile | 2 +- tools/testing/selftests/x86/ldt_gdt.c | 12 +- tools/testing/selftests/x86/test_vsyscall.c | 500 ++++ tools/usb/usbip/libsrc/vhci_driver.c | 24 +- tools/usb/usbip/src/utils.c | 9 +- tools/virtio/ringtest/ptr_ring.c | 29 +- tools/vm/slabinfo-gnuplot.sh | 2 +- virt/kvm/arm/arch_timer.c | 43 +- virt/kvm/arm/arm.c | 17 +- virt/kvm/arm/hyp/timer-sr.c | 48 +- virt/kvm/arm/hyp/vgic-v2-sr.c | 4 - virt/kvm/arm/mmio.c | 6 +- virt/kvm/arm/mmu.c | 12 +- virt/kvm/arm/vgic/vgic-init.c | 8 +- virt/kvm/arm/vgic/vgic-irqfd.c | 3 +- virt/kvm/arm/vgic/vgic-its.c | 4 +- virt/kvm/arm/vgic/vgic-v3.c | 2 +- virt/kvm/arm/vgic/vgic-v4.c | 8 +- virt/kvm/arm/vgic/vgic.c | 8 +- virt/kvm/kvm_main.c | 31 + 2798 files changed, 46707 insertions(+), 21546 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/max98373.txt create mode 100644 Documentation/devicetree/bindings/sound/pcm186x.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,tas6424.txt create mode 100644 Documentation/devicetree/bindings/sound/tscs42xx.txt create mode 100644 Documentation/devicetree/bindings/sound/uniphier,evea.txt create mode 100644 Documentation/driver-api/iio/hw-consumer.rst delete mode 100644 Documentation/locking/crossrelease.txt create mode 100644 Documentation/media/dvb-drivers/frontends.rst create mode 100644 Documentation/x86/pti.txt create mode 100644 arch/arm64/include/uapi/asm/bpf_perf_event.h delete mode 100644 arch/arm64/kernel/ftrace-mod.S create mode 100644 arch/mips/include/asm/serial.h create mode 100644 arch/mips/lib/multi3.c create mode 100644 arch/riscv/include/uapi/asm/syscalls.h create mode 100644 arch/riscv/kernel/vdso/clock_getres.S create mode 100644 arch/riscv/kernel/vdso/clock_gettime.S create mode 100644 arch/riscv/kernel/vdso/flush_icache.S create mode 100644 arch/riscv/kernel/vdso/getcpu.S create mode 100644 arch/riscv/kernel/vdso/gettimeofday.S create mode 100644 arch/riscv/mm/cacheflush.c create mode 100644 arch/s390/include/uapi/asm/bpf_perf_event.h create mode 100644 arch/x86/boot/compressed/pgtable_64.c create mode 100644 arch/x86/include/asm/cpu_entry_area.h create mode 100644 arch/x86/include/asm/intel_ds.h create mode 100644 arch/x86/include/asm/invpcid.h delete mode 100644 arch/x86/include/asm/kmemcheck.h create mode 100644 arch/x86/include/asm/nospec-branch.h create mode 100644 arch/x86/include/asm/pti.h create mode 100644 arch/x86/lib/retpoline.S create mode 100644 arch/x86/mm/cpu_entry_area.c delete mode 100644 arch/x86/mm/kmemcheck/error.c delete mode 100644 arch/x86/mm/kmemcheck/error.h delete mode 100644 arch/x86/mm/kmemcheck/opcode.c delete mode 100644 arch/x86/mm/kmemcheck/opcode.h delete mode 100644 arch/x86/mm/kmemcheck/pte.c delete mode 100644 arch/x86/mm/kmemcheck/pte.h delete mode 100644 arch/x86/mm/kmemcheck/selftest.c delete mode 100644 arch/x86/mm/kmemcheck/selftest.h delete mode 100644 arch/x86/mm/kmemcheck/shadow.h create mode 100644 arch/x86/mm/pti.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mcp77.c create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmmcp77.c create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/buffer/industrialio-hw-consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h create mode 100644 include/linux/iio/hw-consumer.h create mode 100644 include/linux/intel-pti.h delete mode 100644 include/linux/kmemcheck.h rename include/{lib => linux}/libgcc.h (100%) create mode 100644 include/uapi/asm-generic/bpf_perf_event.h delete mode 100644 mm/kmemcheck.c create mode 100644 net/wireless/certs/sforshee.hex delete mode 100644 net/wireless/certs/sforshee.x509 create mode 100644 sound/soc/codecs/max98373.c create mode 100644 sound/soc/codecs/max98373.h create mode 100644 sound/soc/codecs/pcm186x-i2c.c create mode 100644 sound/soc/codecs/pcm186x-spi.c create mode 100644 sound/soc/codecs/pcm186x.c create mode 100644 sound/soc/codecs/pcm186x.h delete mode 100644 sound/soc/codecs/sn95031.c delete mode 100644 sound/soc/codecs/sn95031.h create mode 100644 sound/soc/codecs/tas6424.c create mode 100644 sound/soc/codecs/tas6424.h create mode 100644 sound/soc/codecs/tscs42xx.c create mode 100644 sound/soc/codecs/tscs42xx.h delete mode 100644 sound/soc/intel/boards/mfld_machine.c create mode 100644 sound/soc/intel/skylake/skl-i2s.h create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h create mode 100644 sound/soc/stm/stm32_adfsdm.c create mode 100644 sound/soc/uniphier/Kconfig create mode 100644 sound/soc/uniphier/Makefile create mode 100644 sound/soc/uniphier/evea.c create mode 100644 tools/arch/arm64/include/uapi/asm/bpf_perf_event.h create mode 100644 tools/arch/s390/include/uapi/asm/bpf_perf_event.h create mode 100644 tools/arch/s390/include/uapi/asm/perf_regs.h create mode 100644 tools/arch/s390/include/uapi/asm/ptrace.h delete mode 100644 tools/include/linux/kmemcheck.h create mode 100644 tools/include/uapi/asm-generic/bpf_perf_event.h create mode 100644 tools/include/uapi/asm/bpf_perf_event.h create mode 100644 tools/testing/selftests/x86/test_vsyscall.c

1 0

Re: [alsa-devel] [PATCH] Asoc: samsung: clean makefile about inexistant files
by Krzysztof Kozlowski 29 Jan '18

29 Jan '18

On Mon, Jan 29, 2018 at 1:26 PM, Corentin Labbe <clabbe(a)baylibre.com> wrote: > 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> > --- > sound/soc/samsung/Makefile | 3 --- > 1 file changed, 3 deletions(-) Reviewed-by: Krzysztof Kozlowski <krzk(a)kernel.org> Best regards, Krzysztof

1 0

[alsa-devel] [PATCH 0/3] ASoC: sun4i-i2s: Updates to the driver
by codekipper＠gmail.com 29 Jan '18

29 Jan '18

From: Marcus Cooper <codekipper(a)gmail.com> Hi All, here is a patch series to add some improvements to the sun4i-i2s driver found whilst getting slave clocking and hdmi audio working on the newer SoCs. This has been tested on a Pine64 using the ES9023 audio POT board (https://github.com/codekipper/linux-sunxi/commits/upstream) BR, CK Marcus Cooper (3): ASoC: sun4i-i2s: Add set_tdm_slot functionality ASoC: sun4i-i2s: Do not divide clocks when slave ASoC: sun4i-i2s: Add regmap field to sign extend sample sound/soc/sunxi/sun4i-i2s.c | 154 ++++++++++++++++++++++++++++---------------- 1 file changed, 100 insertions(+), 54 deletions(-) -- 2.16.0

5 15

[alsa-devel] [RFC 0/3] ASoC: Add Multi CPU DAI support
by Shreyas NC 29 Jan '18

29 Jan '18

As discussed in [1], ASoC core supports multi codec DAIs on a DAI link. However it does not do so for CPU DAIs. So, add support for multi CPU DAIs on a DAI Link by adding multi CPU DAI in Card instantiation, suspend and resume functions, PCM ops, stream handling functions and DAPM. [1]: https://www.spinics.net/lists/alsa-devel/msg71369.html Shreyas NC (3): ASoC: Add initial support for multiple CPU DAIs ASoC: Add Multi CPU DAI support for PCM ops ASoC: Add Multi CPU DAI support in DAPM include/sound/soc.h | 5 + sound/soc/soc-core.c | 195 ++++++++++++++++------ sound/soc/soc-dapm.c | 71 +++++--- sound/soc/soc-pcm.c | 460 +++++++++++++++++++++++++++++++++------------------ 4 files changed, 495 insertions(+), 236 deletions(-) -- 2.7.4

1 3

[alsa-devel] [PATCH] ASoC: Intel: Fix some error handling path in 'sst_platform_get_resources()'
by Christophe JAILLET 28 Jan '18

28 Jan '18

Several error handling paths set 'ret' to an error code, but the function always returns 0 (i.e. success) Return 'ret' instead in order to return the error code. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- I guess that the code needs more correction. For this first try, I've left the logic as-is, but I don't really see why we call 'pci_release_regions()' in the normal path. A 'return 0;' before the 'do_release_regions' label would sound more logical to me. --- sound/soc/intel/atom/sst/sst_pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/atom/sst/sst_pci.c b/sound/soc/intel/atom/sst/sst_pci.c index 6906ee624cf6..8cae20802b7c 100644 --- a/sound/soc/intel/atom/sst/sst_pci.c +++ b/sound/soc/intel/atom/sst/sst_pci.c @@ -105,9 +105,12 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) goto do_release_regions; } dev_dbg(ctx->dev, "DRAM Ptr %p\n", ctx->dram); + + ret = 0; + do_release_regions: pci_release_regions(pci); - return 0; + return ret; } /* -- 2.14.1 --- L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast. https://www.avast.com/antivirus

2 1

[alsa-devel] [PATCH] ASoC: atmel: Remove check for node pointer
by Ladislav Michl 27 Jan '18

27 Jan '18

Probe function is called only after DT compatible is matched, thus node pointer cannot be NULL. Signed-off-by: Ladislav Michl <ladis(a)linux-mips.org> --- Note: this patch replaces previously sent "ASoC: sam9x5_wm8731: Return -ENODEV when probe does not find OF node" and "ASoC: atmel_wm8904: Return -ENODEV when probe does not find OF node" while taking Alexandre Belloni's advice into account and extending it for the rest of Atmel's drivers. sound/soc/atmel/atmel_wm8904.c | 5 ----- sound/soc/atmel/sam9g20_wm8731.c | 4 ---- sound/soc/atmel/sam9x5_wm8731.c | 5 ----- sound/soc/atmel/tse850-pcm5142.c | 5 ----- 4 files changed, 19 deletions(-) diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c index fbc10f61eb55..0619a9961e0c 100644 --- a/sound/soc/atmel/atmel_wm8904.c +++ b/sound/soc/atmel/atmel_wm8904.c @@ -85,11 +85,6 @@ static int atmel_asoc_wm8904_dt_init(struct platform_device *pdev) struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink; int ret; - if (!np) { - dev_err(&pdev->dev, "only device tree supported\n"); - return -EINVAL; - } - ret = snd_soc_of_parse_card_name(card, "atmel,model"); if (ret) { dev_err(&pdev->dev, "failed to parse card name\n"); diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 98f93e79c654..a53f3ee82d30 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -163,10 +163,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) struct snd_soc_card *card = &snd_soc_at91sam9g20ek; int ret; - if (!np) { - return -ENODEV; - } - ret = atmel_ssc_set_audio(0); if (ret) { dev_err(&pdev->dev, "ssc channel is not valid\n"); diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c index 920f72565ff2..b177524f5926 100644 --- a/sound/soc/atmel/sam9x5_wm8731.c +++ b/sound/soc/atmel/sam9x5_wm8731.c @@ -83,11 +83,6 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) struct sam9x5_drvdata *priv; int ret; - if (!np) { - dev_err(&pdev->dev, "No device node supplied\n"); - return -EINVAL; - } - card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); dai = devm_kzalloc(&pdev->dev, sizeof(*dai), GFP_KERNEL); diff --git a/sound/soc/atmel/tse850-pcm5142.c b/sound/soc/atmel/tse850-pcm5142.c index 3a1393283156..73b327e781ab 100644 --- a/sound/soc/atmel/tse850-pcm5142.c +++ b/sound/soc/atmel/tse850-pcm5142.c @@ -327,11 +327,6 @@ static int tse850_dt_init(struct platform_device *pdev) struct device_node *codec_np, *cpu_np; struct snd_soc_dai_link *dailink = &tse850_dailink; - if (!np) { - dev_err(&pdev->dev, "only device tree supported\n"); - return -EINVAL; - } - cpu_np = of_parse_phandle(np, "axentia,cpu-dai", 0); if (!cpu_np) { dev_err(&pdev->dev, "failed to get cpu dai\n"); -- 2.15.1

3 2

[alsa-devel] [PATCH v2 3/5] ALSA: emu10k1: add optional debug printouts with DMA addresses
by Maciej S. Szmigiero 27 Jan '18

27 Jan '18

When we get a IOMMU page fault for a emu10k1 device it is very hard to discover which of chip many DMA allocations triggered it (since on a IOMMU system the DMA address space is often very different from the CPU one). Let's add optional debug printouts providing this information. These debug printouts are only enabled on an explicit request via the kernel dynamic debug mechanism. Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- Changes from v1: Fix a sparse warning by changing a variable type in __{get,set}_ptb_entry from u32 to __le32, don't open code EMUPAGESIZE. sound/pci/emu10k1/emu10k1_main.c | 8 ++++++++ sound/pci/emu10k1/memory.c | 15 +++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 11e868f569d6..8decd2a7a404 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1898,6 +1898,9 @@ int snd_emu10k1_create(struct snd_card *card, err = -ENOMEM; goto error; } + dev_dbg(card->dev, "page table address range is %.8lx:%.8lx\n", + (unsigned long)emu->ptb_pages.addr, + (unsigned long)(emu->ptb_pages.addr + emu->ptb_pages.bytes)); emu->page_ptr_table = vmalloc(emu->max_cache_pages * sizeof(void *)); emu->page_addr_table = vmalloc(emu->max_cache_pages * @@ -1912,6 +1915,11 @@ int snd_emu10k1_create(struct snd_card *card, err = -ENOMEM; goto error; } + dev_dbg(card->dev, "silent page range is %.8lx:%.8lx\n", + (unsigned long)emu->silent_page.addr, + (unsigned long)(emu->silent_page.addr + + emu->silent_page.bytes)); + emu->memhdr = snd_util_memhdr_new(emu->max_cache_pages * PAGE_SIZE); if (emu->memhdr == NULL) { err = -ENOMEM; diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index eaa61024ac7f..fcb04cbbc9ab 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -34,7 +34,10 @@ * aligned pages in others */ #define __set_ptb_entry(emu,page,addr) \ - (((u32 *)(emu)->ptb_pages.area)[page] = cpu_to_le32(((addr) << (emu->address_mode)) | (page))) + (((__le32 *)(emu)->ptb_pages.area)[page] = \ + cpu_to_le32(((addr) << (emu->address_mode)) | (page))) +#define __get_ptb_entry(emu, page) \ + (le32_to_cpu(((__le32 *)(emu)->ptb_pages.area)[page])) #define UNIT_PAGES (PAGE_SIZE / EMUPAGESIZE) #define MAX_ALIGN_PAGES0 (MAXPAGES0 / UNIT_PAGES) @@ -44,8 +47,7 @@ /* get offset address from aligned page */ #define aligned_page_offset(page) ((page) << PAGE_SHIFT) -#if PAGE_SIZE == 4096 -/* page size == EMUPAGESIZE */ +#if PAGE_SIZE == EMUPAGESIZE && !IS_ENABLED(CONFIG_DYNAMIC_DEBUG) /* fill PTB entrie(s) corresponding to page with addr */ #define set_ptb_entry(emu,page,addr) __set_ptb_entry(emu,page,addr) /* fill PTB entrie(s) corresponding to page with silence pointer */ @@ -58,6 +60,8 @@ static inline void set_ptb_entry(struct snd_emu10k1 *emu, int page, dma_addr_t a page *= UNIT_PAGES; for (i = 0; i < UNIT_PAGES; i++, page++) { __set_ptb_entry(emu, page, addr); + dev_dbg(emu->card->dev, "mapped page %d to entry %.8x\n", page, + (unsigned int)__get_ptb_entry(emu, page)); addr += EMUPAGESIZE; } } @@ -65,9 +69,12 @@ static inline void set_silent_ptb(struct snd_emu10k1 *emu, int page) { int i; page *= UNIT_PAGES; - for (i = 0; i < UNIT_PAGES; i++, page++) + for (i = 0; i < UNIT_PAGES; i++, page++) { /* do not increment ptr */ __set_ptb_entry(emu, page, emu->silent_page.addr); + dev_dbg(emu->card->dev, "mapped silent page %d to entry %.8x\n", + page, (unsigned int)__get_ptb_entry(emu, page)); + } } #endif /* PAGE_SIZE */

1 0

[alsa-devel] [PATCH v2 2/5] ALSA: emu10k1: use dma_set_mask_and_coherent()
by Maciej S. Szmigiero 27 Jan '18

27 Jan '18

We have been calling dma_set_mask() and then dma_set_coherent_mask() with the same value, but there is a dma_set_mask_and_coherent() function that does exactly that so let's use it instead. Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- Changes from v1: None in this patch. sound/pci/emu10k1/emu10k1_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index a0a4d31ded53..11e868f569d6 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1871,8 +1871,7 @@ int snd_emu10k1_create(struct snd_card *card, emu->address_mode = is_audigy ? 0 : 1; /* set the DMA transfer mask */ emu->dma_mask = emu->address_mode ? EMU10K1_DMA_MASK : AUDIGY_DMA_MASK; - if (dma_set_mask(&pci->dev, emu->dma_mask) < 0 || - dma_set_coherent_mask(&pci->dev, emu->dma_mask) < 0) { + if (dma_set_mask_and_coherent(&pci->dev, emu->dma_mask) < 0) { dev_err(card->dev, "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask);

1 0

[alsa-devel] [PATCH v2 1/5] ALSA: emu10k1: remove reserved_page
by Maciej S. Szmigiero 27 Jan '18

27 Jan '18

The emu10k1-family chips need the first page (index 0) reserved in their page tables for some reason (every emu10k1 driver I've checked does this without much of an explanation). Using the first page for normal samples results in a broken playback. However, we already have a dummy page allocated - so called "silent page" and, in fact, had always been setting it as the first page in the chip page table because an initialization of every entry of the page table to point to a silent page happens after and overwrites the reserved_page allocation. So the only thing remaining to remove the reserved_page allocation is a trivial change to the page allocation logic to ignore the first page entry and start its allocations from the second entry (index 1). Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- Changes from v1: None in this patch. include/sound/emu10k1.h | 1 - sound/pci/emu10k1/emu10k1_main.c | 11 ----------- sound/pci/emu10k1/memory.c | 8 ++++++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 4f42affe777c..db32b7de52e0 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1718,7 +1718,6 @@ struct snd_emu10k1 { struct snd_dma_buffer p16v_buffer; struct snd_util_memhdr *memhdr; /* page allocation list */ - struct snd_emu10k1_memblk *reserved_page; /* reserved page */ struct list_head mapped_link_head; struct list_head mapped_order_link_head; diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index ccf4415a1c7b..a0a4d31ded53 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1272,12 +1272,6 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu) release_firmware(emu->dock_fw); if (emu->irq >= 0) free_irq(emu->irq, emu); - /* remove reserved page */ - if (emu->reserved_page) { - snd_emu10k1_synth_free(emu, - (struct snd_util_memblk *)emu->reserved_page); - emu->reserved_page = NULL; - } snd_util_memhdr_free(emu->memhdr); if (emu->silent_page.area) snd_dma_free_pages(&emu->silent_page); @@ -1993,11 +1987,6 @@ int snd_emu10k1_create(struct snd_card *card, SPCS_GENERATIONSTATUS | 0x00001200 | 0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT; - emu->reserved_page = (struct snd_emu10k1_memblk *) - snd_emu10k1_synth_alloc(emu, 4096); - if (emu->reserved_page) - emu->reserved_page->map_locked = 1; - /* Clear silent pages and set up pointers */ memset(emu->silent_page.area, 0, PAGE_SIZE); silent_page = emu->silent_page.addr << emu->address_mode; diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 4f1f69be1865..eaa61024ac7f 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -102,7 +102,7 @@ static void emu10k1_memblk_init(struct snd_emu10k1_memblk *blk) */ static int search_empty_map_area(struct snd_emu10k1 *emu, int npages, struct list_head **nextp) { - int page = 0, found_page = -ENOMEM; + int page = 1, found_page = -ENOMEM; int max_size = npages; int size; struct list_head *candidate = &emu->mapped_link_head; @@ -147,6 +147,10 @@ static int map_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk) page = search_empty_map_area(emu, blk->pages, &next); if (page < 0) /* not found */ return page; + if (page == 0) { + dev_err(emu->card->dev, "trying to map zero (reserved) page\n"); + return -EINVAL; + } /* insert this block in the proper position of mapped list */ list_add_tail(&blk->mapped_link, next); /* append this as a newest block in order list */ @@ -177,7 +181,7 @@ static int unmap_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk) q = get_emu10k1_memblk(p, mapped_link); start_page = q->mapped_page + q->pages; } else - start_page = 0; + start_page = 1; if ((p = blk->mapped_link.next) != &emu->mapped_link_head) { q = get_emu10k1_memblk(p, mapped_link); end_page = q->mapped_page;

1 0

[alsa-devel] [PATCH 1/3] ASoC: compress: Correct handling of copy callback
by Charles Keepax 26 Jan '18

26 Jan '18

The soc_compr_copy callback is currently broken. Since the changes to move the compr_ops over to the component the return value is not correctly propagated, always returning zero on success rather than the number of bytes copied. This causes user-space to stall continuously reading as it does not believe it has received any data. Furthermore, the changes to move the compr_ops over to the component iterate through the list of components and will call the copy callback for any that have compressed ops. There isn't currently any consensus on the mechanism to combine the results of multiple copy callbacks. To fix this issue for now halt searching the component list when we locate a copy callback and return the result of that single callback. Additional work should probably be done to look at the other ops, tidy things up, and work out if we want to support multiple components on a single compressed, but this is the only fix required to get things working again. Fixes: 9e7e3738ab0e ("ASoC: snd_soc_component_driver has snd_compr_ops") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Ok here is the simpler fix that should make it much easier to either sneak this into 4.15 or at least apply it to stable. Going to do a little more thinking on the full patch before I send again that need to really wrap my head around what the intentions are with trying to enable multiple components to furfil the same role. If anyone has any thoughts on use cases etc. for this please do send them on :-) Thanks, Charles sound/soc/soc-compress.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 81232f4ab614b..7973f92cd40f5 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -944,7 +944,7 @@ static int soc_compr_copy(struct snd_compr_stream *cstream, struct snd_soc_platform *platform = rtd->platform; struct snd_soc_component *component; struct snd_soc_rtdcom_list *rtdcom; - int ret = 0, __ret; + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); @@ -965,10 +965,10 @@ static int soc_compr_copy(struct snd_compr_stream *cstream, !component->driver->compr_ops->copy) continue; - __ret = component->driver->compr_ops->copy(cstream, buf, count); - if (__ret < 0) - ret = __ret; + ret = component->driver->compr_ops->copy(cstream, buf, count); + break; } + err: mutex_unlock(&rtd->pcm_mutex); return ret; -- 2.11.0

2 5

[alsa-devel] Applied "ASoC: Intel: Skylake: Add ssp clock driver" to the asoc tree
by Mark Brown 26 Jan '18

26 Jan '18

The patch ASoC: Intel: Skylake: Add ssp clock driver 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 01f50d69bebe1bb0b30bba1eba3cdaf1f02dd7c4 Mon Sep 17 00:00:00 2001 From: Sriram Periyasamy <sriramx.periyasamy(a)intel.com> Date: Thu, 4 Jan 2018 16:55:14 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Add ssp clock driver For certain platforms, it is required to start the clocks (mclk/sclk/fs) before the stream start. Example: for few chrome systems, codec needs the mclk/sclk to be enabled early for a successful clock synchronization and for few IVI platforms, clock need to be enabled at boot and should be ON always. Add the required structures and create set_dma_control ipc to enable or disable the clock. To enable sclk without fs, mclk ipc structure is used, else sclkfs ipc structure is used. Clock prepare/unprepare are used to enable/disable the clock as the IPC will be sent in non-atomic context. The clk set_dma_control IPC structures are populated during the set_rate callback and IPC is sent to enable the clock during prepare callback. This patch creates virtual clock driver, which allows the machine driver to use the clock interface to send IPCs to DSP to enable/disable the clocks. Signed-off-by: Sriram Periyasamy <sriramx.periyasamy(a)intel.com> Signed-off-by: Jaikrishna Nemallapudi <jaikrishnax.nemallapudi(a)intel.com> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Acked-by: Vinod Koul <vinod.koul(a)intel.com> Reviewed-by: Stephen Boyd <sboyd(a)codeaurora.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/Kconfig | 3 + sound/soc/intel/skylake/Makefile | 5 + sound/soc/intel/skylake/skl-messages.c | 1 + sound/soc/intel/skylake/skl-ssp-clk.c | 429 +++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-ssp-clk.h | 38 +++ sound/soc/intel/skylake/skl.h | 6 + 6 files changed, 482 insertions(+) create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index f2c9e8c5970a..ceb105cbd461 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -97,6 +97,9 @@ config SND_SST_ATOM_HIFI2_PLATFORM codec, then enable this option by saying Y or m. This is a recommended option +config SND_SOC_INTEL_SKYLAKE_SSP_CLK + tristate + config SND_SOC_INTEL_SKYLAKE tristate "SKL/BXT/KBL/GLK/CNL... Platforms" depends on PCI && ACPI diff --git a/sound/soc/intel/skylake/Makefile b/sound/soc/intel/skylake/Makefile index d1ccbecd141f..86f6e1d801af 100644 --- a/sound/soc/intel/skylake/Makefile +++ b/sound/soc/intel/skylake/Makefile @@ -14,3 +14,8 @@ snd-soc-skl-ipc-objs := skl-sst-ipc.o skl-sst-dsp.o cnl-sst-dsp.o \ skl-sst-utils.o obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl-ipc.o + +#Skylake Clock device support +snd-soc-skl-ssp-clk-objs := skl-ssp-clk.o + +obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK) += snd-soc-skl-ssp-clk.o diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index 8cbf080c38b3..60d76adade43 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -675,6 +675,7 @@ int skl_dsp_set_dma_control(struct skl_sst *ctx, u32 *caps, kfree(dma_ctrl); return err; } +EXPORT_SYMBOL_GPL(skl_dsp_set_dma_control); static void skl_setup_out_format(struct skl_sst *ctx, struct skl_module_cfg *mconfig, diff --git a/sound/soc/intel/skylake/skl-ssp-clk.c b/sound/soc/intel/skylake/skl-ssp-clk.c new file mode 100644 index 000000000000..7fbddf5e3b00 --- /dev/null +++ b/sound/soc/intel/skylake/skl-ssp-clk.c @@ -0,0 +1,429 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright(c) 2015-17 Intel Corporation + +/* + * skl-ssp-clk.c - ASoC skylake ssp clock driver + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/platform_device.h> +#include <linux/clk-provider.h> +#include <linux/clkdev.h> +#include "skl.h" +#include "skl-ssp-clk.h" +#include "skl-topology.h" + +#define to_skl_clk(_hw) container_of(_hw, struct skl_clk, hw) + +struct skl_clk_parent { + struct clk_hw *hw; + struct clk_lookup *lookup; +}; + +struct skl_clk { + struct clk_hw hw; + struct clk_lookup *lookup; + unsigned long rate; + struct skl_clk_pdata *pdata; + u32 id; +}; + +struct skl_clk_data { + struct skl_clk_parent parent[SKL_MAX_CLK_SRC]; + struct skl_clk *clk[SKL_MAX_CLK_CNT]; + u8 avail_clk_cnt; +}; + +static int skl_get_clk_type(u32 index) +{ + switch (index) { + case 0 ... (SKL_SCLK_OFS - 1): + return SKL_MCLK; + + case SKL_SCLK_OFS ... (SKL_SCLKFS_OFS - 1): + return SKL_SCLK; + + case SKL_SCLKFS_OFS ... (SKL_MAX_CLK_CNT - 1): + return SKL_SCLK_FS; + + default: + return -EINVAL; + } +} + +static int skl_get_vbus_id(u32 index, u8 clk_type) +{ + switch (clk_type) { + case SKL_MCLK: + return index; + + case SKL_SCLK: + return index - SKL_SCLK_OFS; + + case SKL_SCLK_FS: + return index - SKL_SCLKFS_OFS; + + default: + return -EINVAL; + } +} + +static void skl_fill_clk_ipc(struct skl_clk_rate_cfg_table *rcfg, u8 clk_type) +{ + struct nhlt_fmt_cfg *fmt_cfg; + union skl_clk_ctrl_ipc *ipc; + struct wav_fmt *wfmt; + + if (!rcfg) + return; + + ipc = &rcfg->dma_ctl_ipc; + if (clk_type == SKL_SCLK_FS) { + fmt_cfg = (struct nhlt_fmt_cfg *)rcfg->config; + wfmt = &fmt_cfg->fmt_ext.fmt; + + /* Remove TLV Header size */ + ipc->sclk_fs.hdr.size = sizeof(struct skl_dmactrl_sclkfs_cfg) - + sizeof(struct skl_tlv_hdr); + ipc->sclk_fs.sampling_frequency = wfmt->samples_per_sec; + ipc->sclk_fs.bit_depth = wfmt->bits_per_sample; + ipc->sclk_fs.valid_bit_depth = + fmt_cfg->fmt_ext.sample.valid_bits_per_sample; + ipc->sclk_fs.number_of_channels = wfmt->channels; + } else { + ipc->mclk.hdr.type = DMA_CLK_CONTROLS; + /* Remove TLV Header size */ + ipc->mclk.hdr.size = sizeof(struct skl_dmactrl_mclk_cfg) - + sizeof(struct skl_tlv_hdr); + } +} + +/* Sends dma control IPC to turn the clock ON/OFF */ +static int skl_send_clk_dma_control(struct skl *skl, + struct skl_clk_rate_cfg_table *rcfg, + u32 vbus_id, u8 clk_type, + bool enable) +{ + struct nhlt_specific_cfg *sp_cfg; + u32 i2s_config_size, node_id = 0; + struct nhlt_fmt_cfg *fmt_cfg; + union skl_clk_ctrl_ipc *ipc; + void *i2s_config = NULL; + u8 *data, size; + int ret; + + if (!rcfg) + return -EIO; + + ipc = &rcfg->dma_ctl_ipc; + fmt_cfg = (struct nhlt_fmt_cfg *)rcfg->config; + sp_cfg = &fmt_cfg->config; + + if (clk_type == SKL_SCLK_FS) { + ipc->sclk_fs.hdr.type = + enable ? DMA_TRANSMITION_START : DMA_TRANSMITION_STOP; + data = (u8 *)&ipc->sclk_fs; + size = sizeof(struct skl_dmactrl_sclkfs_cfg); + } else { + /* 1 to enable mclk, 0 to enable sclk */ + if (clk_type == SKL_SCLK) + ipc->mclk.mclk = 0; + else + ipc->mclk.mclk = 1; + + ipc->mclk.keep_running = enable; + ipc->mclk.warm_up_over = enable; + ipc->mclk.clk_stop_over = !enable; + data = (u8 *)&ipc->mclk; + size = sizeof(struct skl_dmactrl_mclk_cfg); + } + + i2s_config_size = sp_cfg->size + size; + i2s_config = kzalloc(i2s_config_size, GFP_KERNEL); + if (!i2s_config) + return -ENOMEM; + + /* copy blob */ + memcpy(i2s_config, sp_cfg->caps, sp_cfg->size); + + /* copy additional dma controls information */ + memcpy(i2s_config + sp_cfg->size, data, size); + + node_id = ((SKL_DMA_I2S_LINK_INPUT_CLASS << 8) | (vbus_id << 4)); + ret = skl_dsp_set_dma_control(skl->skl_sst, (u32 *)i2s_config, + i2s_config_size, node_id); + kfree(i2s_config); + + return ret; +} + +static struct skl_clk_rate_cfg_table *skl_get_rate_cfg( + struct skl_clk_rate_cfg_table *rcfg, + unsigned long rate) +{ + int i; + + for (i = 0; (i < SKL_MAX_CLK_RATES) && rcfg[i].rate; i++) { + if (rcfg[i].rate == rate) + return &rcfg[i]; + } + + return NULL; +} + +static int skl_clk_change_status(struct skl_clk *clkdev, + bool enable) +{ + struct skl_clk_rate_cfg_table *rcfg; + int vbus_id, clk_type; + + clk_type = skl_get_clk_type(clkdev->id); + if (clk_type < 0) + return clk_type; + + vbus_id = skl_get_vbus_id(clkdev->id, clk_type); + if (vbus_id < 0) + return vbus_id; + + rcfg = skl_get_rate_cfg(clkdev->pdata->ssp_clks[clkdev->id].rate_cfg, + clkdev->rate); + if (!rcfg) + return -EINVAL; + + return skl_send_clk_dma_control(clkdev->pdata->pvt_data, rcfg, + vbus_id, clk_type, enable); +} + +static int skl_clk_prepare(struct clk_hw *hw) +{ + struct skl_clk *clkdev = to_skl_clk(hw); + + return skl_clk_change_status(clkdev, true); +} + +static void skl_clk_unprepare(struct clk_hw *hw) +{ + struct skl_clk *clkdev = to_skl_clk(hw); + + skl_clk_change_status(clkdev, false); +} + +static int skl_clk_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct skl_clk *clkdev = to_skl_clk(hw); + struct skl_clk_rate_cfg_table *rcfg; + int clk_type; + + if (!rate) + return -EINVAL; + + rcfg = skl_get_rate_cfg(clkdev->pdata->ssp_clks[clkdev->id].rate_cfg, + rate); + if (!rcfg) + return -EINVAL; + + clk_type = skl_get_clk_type(clkdev->id); + if (clk_type < 0) + return clk_type; + + skl_fill_clk_ipc(rcfg, clk_type); + clkdev->rate = rate; + + return 0; +} + +static unsigned long skl_clk_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct skl_clk *clkdev = to_skl_clk(hw); + + if (clkdev->rate) + return clkdev->rate; + + return 0; +} + +/* 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) +{ + return rate; +} + +/* + * prepare/unprepare are used instead of enable/disable as IPC will be sent + * in non-atomic context. + */ +static const struct clk_ops skl_clk_ops = { + .prepare = skl_clk_prepare, + .unprepare = skl_clk_unprepare, + .set_rate = skl_clk_set_rate, + .round_rate = skl_clk_round_rate, + .recalc_rate = skl_clk_recalc_rate, +}; + +static void unregister_parent_src_clk(struct skl_clk_parent *pclk, + unsigned int id) +{ + while (id--) { + clkdev_drop(pclk[id].lookup); + clk_hw_unregister_fixed_rate(pclk[id].hw); + } +} + +static void unregister_src_clk(struct skl_clk_data *dclk) +{ + u8 cnt = dclk->avail_clk_cnt; + + while (cnt--) + clkdev_drop(dclk->clk[cnt]->lookup); +} + +static int skl_register_parent_clks(struct device *dev, + struct skl_clk_parent *parent, + struct skl_clk_parent_src *pclk) +{ + int i, ret; + + for (i = 0; i < SKL_MAX_CLK_SRC; i++) { + + /* Register Parent clock */ + parent[i].hw = clk_hw_register_fixed_rate(dev, pclk[i].name, + pclk[i].parent_name, 0, pclk[i].rate); + if (IS_ERR(parent[i].hw)) { + ret = PTR_ERR(parent[i].hw); + goto err; + } + + parent[i].lookup = clkdev_hw_create(parent[i].hw, pclk[i].name, + NULL); + if (!parent[i].lookup) { + clk_hw_unregister_fixed_rate(parent[i].hw); + ret = -ENOMEM; + goto err; + } + } + + return 0; +err: + unregister_parent_src_clk(parent, i); + return ret; +} + +/* Assign fmt_config to clk_data */ +static struct skl_clk *register_skl_clk(struct device *dev, + struct skl_ssp_clk *clk, + struct skl_clk_pdata *clk_pdata, int id) +{ + struct clk_init_data init; + struct skl_clk *clkdev; + int ret; + + clkdev = devm_kzalloc(dev, sizeof(*clkdev), GFP_KERNEL); + if (!clkdev) + return ERR_PTR(-ENOMEM); + + init.name = clk->name; + init.ops = &skl_clk_ops; + init.flags = CLK_SET_RATE_GATE; + init.parent_names = &clk->parent_name; + init.num_parents = 1; + clkdev->hw.init = &init; + clkdev->pdata = clk_pdata; + + clkdev->id = id; + ret = devm_clk_hw_register(dev, &clkdev->hw); + if (ret) { + clkdev = ERR_PTR(ret); + return clkdev; + } + + clkdev->lookup = clkdev_hw_create(&clkdev->hw, init.name, NULL); + if (!clkdev->lookup) + clkdev = ERR_PTR(-ENOMEM); + + return clkdev; +} + +static int skl_clk_dev_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device *parent_dev = dev->parent; + struct skl_clk_parent_src *parent_clks; + struct skl_clk_pdata *clk_pdata; + struct skl_clk_data *data; + struct skl_ssp_clk *clks; + int ret, i; + + clk_pdata = dev_get_platdata(&pdev->dev); + parent_clks = clk_pdata->parent_clks; + clks = clk_pdata->ssp_clks; + if (!parent_clks || !clks) + return -EIO; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + /* Register Parent clock */ + ret = skl_register_parent_clks(parent_dev, data->parent, parent_clks); + if (ret < 0) + return ret; + + for (i = 0; i < clk_pdata->num_clks; i++) { + /* + * Only register valid clocks + * i.e. for which nhlt entry is present. + */ + if (clks[i].rate_cfg[0].rate == 0) + continue; + + data->clk[i] = register_skl_clk(dev, &clks[i], clk_pdata, i); + if (IS_ERR(data->clk[i])) { + ret = PTR_ERR(data->clk[i]); + goto err_unreg_skl_clk; + } + + data->avail_clk_cnt++; + } + + platform_set_drvdata(pdev, data); + + return 0; + +err_unreg_skl_clk: + unregister_src_clk(data); + unregister_parent_src_clk(data->parent, SKL_MAX_CLK_SRC); + + return ret; +} + +static int skl_clk_dev_remove(struct platform_device *pdev) +{ + struct skl_clk_data *data; + + data = platform_get_drvdata(pdev); + unregister_src_clk(data); + unregister_parent_src_clk(data->parent, SKL_MAX_CLK_SRC); + + return 0; +} + +static struct platform_driver skl_clk_driver = { + .driver = { + .name = "skl-ssp-clk", + }, + .probe = skl_clk_dev_probe, + .remove = skl_clk_dev_remove, +}; + +module_platform_driver(skl_clk_driver); + +MODULE_DESCRIPTION("Skylake clock driver"); +MODULE_AUTHOR("Jaikrishna Nemallapudi <jaikrishnax.nemallapudi(a)intel.com>"); +MODULE_AUTHOR("Subhransu S. Prusty <subhransu.s.prusty(a)intel.com>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:skl-ssp-clk"); diff --git a/sound/soc/intel/skylake/skl-ssp-clk.h b/sound/soc/intel/skylake/skl-ssp-clk.h index c9ea84004260..d1be50f96c05 100644 --- a/sound/soc/intel/skylake/skl-ssp-clk.h +++ b/sound/soc/intel/skylake/skl-ssp-clk.h @@ -54,8 +54,46 @@ struct skl_clk_parent_src { const char *parent_name; }; +struct skl_tlv_hdr { + u32 type; + u32 size; +}; + +struct skl_dmactrl_mclk_cfg { + struct skl_tlv_hdr hdr; + /* DMA Clk TLV params */ + u32 clk_warm_up:16; + u32 mclk:1; + u32 warm_up_over:1; + u32 rsvd0:14; + u32 clk_stop_delay:16; + u32 keep_running:1; + u32 clk_stop_over:1; + u32 rsvd1:14; +}; + +struct skl_dmactrl_sclkfs_cfg { + struct skl_tlv_hdr hdr; + /* DMA SClk&FS TLV params */ + u32 sampling_frequency; + u32 bit_depth; + u32 channel_map; + u32 channel_config; + u32 interleaving_style; + u32 number_of_channels : 8; + u32 valid_bit_depth : 8; + u32 sample_type : 8; + u32 reserved : 8; +}; + +union skl_clk_ctrl_ipc { + struct skl_dmactrl_mclk_cfg mclk; + struct skl_dmactrl_sclkfs_cfg sclk_fs; +}; + struct skl_clk_rate_cfg_table { unsigned long rate; + union skl_clk_ctrl_ipc dma_ctl_ipc; void *config; }; diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index f411579bc713..2d13f3fd988a 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -38,6 +38,10 @@ /* D0I3C Register fields */ #define AZX_REG_VS_D0I3C_CIP 0x1 /* Command in progress */ #define AZX_REG_VS_D0I3C_I3 0x4 /* D0i3 enable */ +#define SKL_MAX_DMACTRL_CFG 18 +#define DMA_CLK_CONTROLS 1 +#define DMA_TRANSMITION_START 2 +#define DMA_TRANSMITION_STOP 3 struct skl_dsp_resource { u32 max_mcps; @@ -147,6 +151,8 @@ int skl_nhlt_create_sysfs(struct skl *skl); void skl_nhlt_remove_sysfs(struct skl *skl); void skl_get_clks(struct skl *skl, struct skl_ssp_clk *ssp_clks); struct skl_clk_parent_src *skl_get_parent_clk(u8 clk_id); +int skl_dsp_set_dma_control(struct skl_sst *ctx, u32 *caps, + u32 caps_size, u32 node_id); struct skl_module_cfg; -- 2.15.1

1 0

[alsa-devel] [PATCH v5 0/6] ASoC: Intel: Skylake: Add a clk driver to enable ssp clks early
by Sriram Periyasamy 26 Jan '18

26 Jan '18

For certain platforms, clocks (mclk/sclk/fs) are required to be up before the stream start. Example: some codecs needs the mclk/sclk/fs to be enabled early for a successful clock synchronization. Some platforms require clock to be enabled at boot and be always ON. By sending set_dma_control IPC (with the i2s blobs queried from NHLT), these clocks can be enabled early after the firmware is downloaded. With this series, a virtual clock driver is created which provides interface to send the required IPCs from machine driver to enable the clocks. NHLT is parsed during probe and the clock information is populated. The pointer to blob is cached and sent along with the set_dma_control IPC structure during the clk prepare/unprepare callback. Clocks are created for a ssp if the nhlt table has endpoint configuration for that particular ssp. Kabylake machine driver uses the clock interface to enable the clocks early as it is required by the rt5663 driver for clock synchronization. v4 -> v5 - Remove checks for clock enable status from machine driver since taken care in the framework already - Add check in the skl_clk_set_rate to avoid different rates when clock is enabled already v3 -> v4 - Add missing signed-offs v2 -> v3 - Moved the clk ops and IPCs from Skylake driver to clk driver and reordered commits accordingly - Add the support for extended I2S blob config which supports multiple mclk dividers in NHLT - Enable the clocks as well in DAPM PMU event instead of hw_params in machine drivers as confirmed by codec vendor - Do not register the clk if there is no valid clock source is avail in the I2S blob - Take care of error return in the clk driver - Address rest of the review comments and more optimization added - Fix the warning sound/soc/intel/skylake/skl.c:724:1-3: WARNING: PTR_ERR_OR_ZERO can be used reported by scripts/coccinelle/api/ptr_ret.cocci - Modified DSP replies as human readable to ease the debugging - Add firmware replies for MCLK/SCLK clocks if they are running already v1 -> v2 - Register parent clocks with skylake device. With the patch "clk: Add support for runtime PM" soon to be merged will help DSP to stay active on call to clock enable. Reference: (https://patchwork.kernel.org/patch/9911741/) - Fix the machine driver to enable clocks early for headphone playback path as well to fix a pop noise issue Harsha Priya (1): ASoC: Intel: kbl: Enable mclk and ssp sclk early Naveen M (1): ASoC: Intel: eve: Enable mclk and ssp sclk early Sriram Periyasamy (2): ASoC: Intel: Skylake: Add ssp clock driver ASoC: Intel: Skylake: Add extended I2S config blob support in Clock driver Subhransu S. Prusty (2): ASoC: Intel: Skylake: Make DSP replies more human readable ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC sound/soc/intel/Kconfig | 3 + sound/soc/intel/boards/Kconfig | 2 + sound/soc/intel/boards/kbl_rt5663_max98927.c | 95 ++++- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 94 ++++ sound/soc/intel/skylake/Makefile | 5 + sound/soc/intel/skylake/skl-i2s.h | 31 ++ sound/soc/intel/skylake/skl-messages.c | 1 + sound/soc/intel/skylake/skl-nhlt.c | 41 +- sound/soc/intel/skylake/skl-ssp-clk.c | 473 +++++++++++++++++++++ sound/soc/intel/skylake/skl-ssp-clk.h | 38 ++ sound/soc/intel/skylake/skl-sst-ipc.c | 50 ++- sound/soc/intel/skylake/skl.h | 6 + 12 files changed, 815 insertions(+), 24 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c -- 2.7.4

6 19

[alsa-devel] [PATCH v7 0/6] ASoC: Intel: Skylake: Add a clk driver to enable ssp clks early
by Sriram Periyasamy 26 Jan '18

26 Jan '18

For certain platforms, clocks (mclk/sclk/fs) are required to be up before the stream start. Example: some codecs needs the mclk/sclk/fs to be enabled early for a successful clock synchronization. Some platforms require clock to be enabled at boot and be always ON. By sending set_dma_control IPC (with the i2s blobs queried from NHLT), these clocks can be enabled early after the firmware is downloaded. With this series, a virtual clock driver is created which provides interface to send the required IPCs from machine driver to enable the clocks. NHLT is parsed during probe and the clock information is populated. The pointer to blob is cached and sent along with the set_dma_control IPC structure during the clk prepare/unprepare callback. Clocks are created for a ssp if the nhlt table has endpoint configuration for that particular ssp. Kabylake machine driver uses the clock interface to enable the clocks early as it is required by the rt5663 driver for clock synchronization. v6 -> v7 - Remove the check to deny set_rate when clock is enabled and instead use framework flag CLK_SET_RATE_GATE v5 -> v6 - Remove unwanted checks from clk ops - Modify recalc_rate to return just the cached rate and remove the rate calculations - Add license based on SPDX v4 -> v5 - Remove checks for clock enable status from machine driver since taken care in the framework already - Add check in the skl_clk_set_rate to avoid different rates when clock is enabled already v3 -> v4 - Add missing signed-offs v2 -> v3 - Moved the clk ops and IPCs from Skylake driver to clk driver and reordered commits accordingly - Add the support for extended I2S blob config which supports multiple mclk dividers in NHLT - Enable the clocks as well in DAPM PMU event instead of hw_params in machine drivers as confirmed by codec vendor - Do not register the clk if there is no valid clock source is avail in the I2S blob - Take care of error return in the clk driver - Address rest of the review comments and more optimization added - Fix the warning sound/soc/intel/skylake/skl.c:724:1-3: WARNING: PTR_ERR_OR_ZERO can be used reported by scripts/coccinelle/api/ptr_ret.cocci - Modified DSP replies as human readable to ease the debugging - Add firmware replies for MCLK/SCLK clocks if they are running already v1 -> v2 - Register parent clocks with skylake device. With the patch "clk: Add support for runtime PM" soon to be merged will help DSP to stay active on call to clock enable. Reference: (https://patchwork.kernel.org/patch/9911741/) - Fix the machine driver to enable clocks early for headphone playback path as well to fix a pop noise issue Harsha Priya (1): ASoC: Intel: kbl: Enable mclk and ssp sclk early Naveen M (1): ASoC: Intel: eve: Enable mclk and ssp sclk early Sriram Periyasamy (2): ASoC: Intel: Skylake: Add ssp clock driver ASoC: Intel: Skylake: Add extended I2S config blob support in Clock driver Subhransu S. Prusty (2): ASoC: Intel: Skylake: Make DSP replies more human readable ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC sound/soc/intel/Kconfig | 3 + sound/soc/intel/boards/Kconfig | 2 + sound/soc/intel/boards/kbl_rt5663_max98927.c | 95 ++++- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 94 +++++ sound/soc/intel/skylake/Makefile | 5 + sound/soc/intel/skylake/skl-i2s.h | 31 ++ sound/soc/intel/skylake/skl-messages.c | 1 + sound/soc/intel/skylake/skl-nhlt.c | 41 +- sound/soc/intel/skylake/skl-ssp-clk.c | 429 +++++++++++++++++++++ sound/soc/intel/skylake/skl-ssp-clk.h | 38 ++ sound/soc/intel/skylake/skl-sst-ipc.c | 50 ++- sound/soc/intel/skylake/skl.h | 6 + 12 files changed, 771 insertions(+), 24 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c -- 2.7.4

2 9

[alsa-devel] [PATCH 1/2] ASoC: compress: Correct handling of compressed ops
by Charles Keepax 26 Jan '18

26 Jan '18

The soc_compr_copy callback is currently broken. Since the changes to move the compr_ops over to the component the return value is not correctly propagated, always returning zero on success rather than the number of bytes copied. This causes user-space to stall continuously reading as it does not believe it has received any data. Furthermore, the changes to move the compr_ops over to the component iterate through the list of components and will call the compressed operation for any that have compressed ops. However, there would be signifcantly more work required to support such a system. There isn't currently any sensible mechanism to forward the ops to multiple components. For example what should be done about merging data from copy? Or what should be returned through the pointer call, each component may have different amounts of data available, but user-space expects a single answer? As such clean up the code a little by factoring out the search for the relevant component and bring things back to looking for a single component that supports compressed ops on a single runtime. These refactorings also put back the original handling for the copy callback, correcting the return value. Fixes: 9e7e3738ab0e ("ASoC: snd_soc_component_driver has snd_compr_ops") Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- These refactorings should also fix the static analysis warnings that Dan Carpenter was seeing [1]. Which were being caused due to the loops that could "in theory" call the free on more than one component. [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2018-January/130822.ht… sound/soc/soc-compress.c | 587 ++++++++++------------------------------------- 1 file changed, 118 insertions(+), 469 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 81232f4ab614..34834c02dda8 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -26,14 +26,42 @@ #include <sound/initval.h> #include <sound/soc-dpcm.h> -static int soc_compr_open(struct snd_compr_stream *cstream) +static struct snd_soc_component * +soc_compr_get_component(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_pcm_runtime *rtd = cstream->private_data; struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; struct snd_soc_rtdcom_list *rtdcom; + + if (platform) + return &platform->component; + + for_each_rtdcom(rtd, rtdcom) { + if (rtdcom->component->driver->compr_ops) + return rtdcom->component; + } + + return NULL; +} + +static const struct snd_compr_ops * +soc_compr_get_ops(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_component *component) +{ + struct snd_soc_platform *platform = rtd->platform; + + if (platform) + return platform->driver->compr_ops; + else + return component->driver->compr_ops; +} + +static int soc_compr_open(struct snd_compr_stream *cstream) +{ + struct snd_soc_pcm_runtime *rtd = cstream->private_data; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int ret = 0, __ret; + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); @@ -46,36 +74,15 @@ static int soc_compr_open(struct snd_compr_stream *cstream) } } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->open) { - ret = platform->driver->compr_ops->open(cstream); + if (compr_ops && compr_ops->open) { + ret = compr_ops->open(cstream); if (ret < 0) { pr_err("compress asoc: can't open platform %s\n", - platform->component.name); + component->name); goto plat_err; } } - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->open) - continue; - - __ret = component->driver->compr_ops->open(cstream); - if (__ret < 0) { - pr_err("compress asoc: can't open platform %s\n", - component->name); - ret = __ret; - } - } - if (ret < 0) - goto machine_err; - if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->startup) { ret = rtd->dai_link->compr_ops->startup(cstream); if (ret < 0) { @@ -91,22 +98,8 @@ static int soc_compr_open(struct snd_compr_stream *cstream) return 0; machine_err: - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->free) - continue; - - component->driver->compr_ops->free(cstream); - } - - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free) - platform->driver->compr_ops->free(cstream); + if (compr_ops && compr_ops->free) + compr_ops->free(cstream); plat_err: if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown) cpu_dai->driver->cops->shutdown(cstream, cpu_dai); @@ -118,16 +111,15 @@ static int soc_compr_open(struct snd_compr_stream *cstream) static int soc_compr_open_fe(struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *fe = cstream->private_data; + struct snd_soc_component *component = soc_compr_get_component(fe); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(fe, component); struct snd_pcm_substream *fe_substream = fe->pcm->streams[cstream->direction].substream; - struct snd_soc_platform *platform = fe->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_dai *cpu_dai = fe->cpu_dai; struct snd_soc_dpcm *dpcm; struct snd_soc_dapm_widget_list *list; int stream; - int ret = 0, __ret; + int ret = 0; if (cstream->direction == SND_COMPRESS_PLAYBACK) stream = SNDRV_PCM_STREAM_PLAYBACK; @@ -145,37 +137,15 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) } } - - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->open) { - ret = platform->driver->compr_ops->open(cstream); + if (compr_ops && compr_ops->open) { + ret = compr_ops->open(cstream); if (ret < 0) { pr_err("compress asoc: can't open platform %s\n", - platform->component.name); + component->name); goto plat_err; } } - for_each_rtdcom(fe, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->open) - continue; - - __ret = component->driver->compr_ops->open(cstream); - if (__ret < 0) { - pr_err("compress asoc: can't open platform %s\n", - component->name); - ret = __ret; - } - } - if (ret < 0) - goto machine_err; - if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->startup) { ret = fe->dai_link->compr_ops->startup(cstream); if (ret < 0) { @@ -227,22 +197,8 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->shutdown) fe->dai_link->compr_ops->shutdown(cstream); machine_err: - for_each_rtdcom(fe, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->free) - continue; - - component->driver->compr_ops->free(cstream); - } - - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free) - platform->driver->compr_ops->free(cstream); + if (compr_ops && compr_ops->free) + compr_ops->free(cstream); plat_err: if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown) cpu_dai->driver->cops->shutdown(cstream, cpu_dai); @@ -283,9 +239,8 @@ static void close_delayed_work(struct work_struct *work) static int soc_compr_free(struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *codec_dai = rtd->codec_dai; int stream; @@ -311,22 +266,8 @@ static int soc_compr_free(struct snd_compr_stream *cstream) if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown) rtd->dai_link->compr_ops->shutdown(cstream); - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->free) - continue; - - component->driver->compr_ops->free(cstream); - } - - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free) - platform->driver->compr_ops->free(cstream); + if (compr_ops && compr_ops->free) + compr_ops->free(cstream); if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown) cpu_dai->driver->cops->shutdown(cstream, cpu_dai); @@ -356,9 +297,8 @@ static int soc_compr_free(struct snd_compr_stream *cstream) static int soc_compr_free_fe(struct snd_compr_stream *cstream) { struct snd_soc_pcm_runtime *fe = cstream->private_data; - struct snd_soc_platform *platform = fe->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(fe); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(fe, component); struct snd_soc_dai *cpu_dai = fe->cpu_dai; struct snd_soc_dpcm *dpcm; int stream, ret; @@ -396,22 +336,8 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->shutdown) fe->dai_link->compr_ops->shutdown(cstream); - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free) - platform->driver->compr_ops->free(cstream); - - for_each_rtdcom(fe, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->free) - continue; - - component->driver->compr_ops->free(cstream); - } + if (compr_ops && compr_ops->free) + compr_ops->free(cstream); if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown) cpu_dai->driver->cops->shutdown(cstream, cpu_dai); @@ -424,43 +350,23 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int ret = 0, __ret; + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->trigger) { - ret = platform->driver->compr_ops->trigger(cstream, cmd); + if (compr_ops && compr_ops->trigger) { + ret = compr_ops->trigger(cstream, cmd); if (ret < 0) goto out; } - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->trigger) - continue; - - __ret = component->driver->compr_ops->trigger(cstream, cmd); - if (__ret < 0) - ret = __ret; - } - if (ret < 0) - goto out; - if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) cpu_dai->driver->cops->trigger(cstream, cmd, cpu_dai); - switch (cmd) { case SNDRV_PCM_TRIGGER_START: snd_soc_dai_digital_mute(codec_dai, 0, cstream->direction); @@ -478,37 +384,16 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd) { struct snd_soc_pcm_runtime *fe = cstream->private_data; - struct snd_soc_platform *platform = fe->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(fe); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(fe, component); struct snd_soc_dai *cpu_dai = fe->cpu_dai; - int ret = 0, __ret, stream; + int ret = 0, stream; if (cmd == SND_COMPR_TRIGGER_PARTIAL_DRAIN || cmd == SND_COMPR_TRIGGER_DRAIN) { - if (platform && - platform->driver->compr_ops && - platform->driver->compr_ops->trigger) - return platform->driver->compr_ops->trigger(cstream, - cmd); - - for_each_rtdcom(fe, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->trigger) - continue; - - __ret = component->driver->compr_ops->trigger(cstream, cmd); - if (__ret < 0) - ret = __ret; - } - return ret; + if (compr_ops && compr_ops->trigger) + return compr_ops->trigger(cstream, cmd); } if (cstream->direction == SND_COMPRESS_PLAYBACK) @@ -525,30 +410,12 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd) goto out; } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->trigger) { - ret = platform->driver->compr_ops->trigger(cstream, cmd); + if (compr_ops && compr_ops->trigger) { + ret = compr_ops->trigger(cstream, cmd); if (ret < 0) goto out; } - for_each_rtdcom(fe, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->trigger) - continue; - - __ret = component->driver->compr_ops->trigger(cstream, cmd); - if (__ret < 0) - ret = __ret; - } - if (ret < 0) - goto out; - fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; ret = dpcm_be_dai_trigger(fe, stream, cmd); @@ -578,11 +445,10 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, struct snd_compr_params *params) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int ret = 0, __ret; + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); @@ -598,30 +464,12 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, goto err; } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->set_params) { - ret = platform->driver->compr_ops->set_params(cstream, params); + if (compr_ops && compr_ops->set_params) { + ret = compr_ops->set_params(cstream, params); if (ret < 0) goto err; } - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->set_params) - continue; - - __ret = component->driver->compr_ops->set_params(cstream, params); - if (__ret < 0) - ret = __ret; - } - if (ret < 0) - goto err; - if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->set_params) { ret = rtd->dai_link->compr_ops->set_params(cstream); if (ret < 0) @@ -654,11 +502,10 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, struct snd_soc_pcm_runtime *fe = cstream->private_data; struct snd_pcm_substream *fe_substream = fe->pcm->streams[cstream->direction].substream; - struct snd_soc_platform *platform = fe->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(fe); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(fe, component); struct snd_soc_dai *cpu_dai = fe->cpu_dai; - int ret = 0, __ret, stream; + int ret = 0, stream; if (cstream->direction == SND_COMPRESS_PLAYBACK) stream = SNDRV_PCM_STREAM_PLAYBACK; @@ -673,30 +520,12 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, goto out; } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->set_params) { - ret = platform->driver->compr_ops->set_params(cstream, params); + if (compr_ops && compr_ops->set_params) { + ret = compr_ops->set_params(cstream, params); if (ret < 0) goto out; } - for_each_rtdcom(fe, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->set_params) - continue; - - __ret = component->driver->compr_ops->set_params(cstream, params); - if (__ret < 0) - ret = __ret; - } - if (ret < 0) - goto out; - if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->set_params) { ret = fe->dai_link->compr_ops->set_params(cstream); if (ret < 0) @@ -734,11 +563,10 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, struct snd_codec *params) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int ret = 0, __ret; + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); @@ -748,27 +576,8 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, goto err; } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->get_params) { - ret = platform->driver->compr_ops->get_params(cstream, params); - if (ret < 0) - goto err; - } - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->get_params) - continue; - - __ret = component->driver->compr_ops->get_params(cstream, params); - if (__ret < 0) - ret = __ret; - } + if (compr_ops && compr_ops->get_params) + ret = compr_ops->get_params(cstream, params); err: mutex_unlock(&rtd->pcm_mutex); @@ -779,36 +588,15 @@ static int soc_compr_get_caps(struct snd_compr_stream *cstream, struct snd_compr_caps *caps) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; - int ret = 0, __ret; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->get_caps) { - ret = platform->driver->compr_ops->get_caps(cstream, caps); - if (ret < 0) - goto err; - } - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->get_caps) - continue; + if (compr_ops && compr_ops->get_caps) + ret = compr_ops->get_caps(cstream, caps); - __ret = component->driver->compr_ops->get_caps(cstream, caps); - if (__ret < 0) - ret = __ret; - } - -err: mutex_unlock(&rtd->pcm_mutex); return ret; } @@ -817,36 +605,15 @@ static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream, struct snd_compr_codec_caps *codec) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; - int ret = 0, __ret; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->get_codec_caps) { - ret = platform->driver->compr_ops->get_codec_caps(cstream, codec); - if (ret < 0) - goto err; - } - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; + if (compr_ops && compr_ops->get_codec_caps) + ret = compr_ops->get_codec_caps(cstream, codec); - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->get_codec_caps) - continue; - - __ret = component->driver->compr_ops->get_codec_caps(cstream, codec); - if (__ret < 0) - ret = __ret; - } - -err: mutex_unlock(&rtd->pcm_mutex); return ret; } @@ -854,11 +621,10 @@ static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream, static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int ret = 0, __ret; + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); @@ -868,27 +634,8 @@ static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes) goto err; } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->ack) { - ret = platform->driver->compr_ops->ack(cstream, bytes); - if (ret < 0) - goto err; - } - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->ack) - continue; - - __ret = component->driver->compr_ops->ack(cstream, bytes); - if (__ret < 0) - ret = __ret; - } + if (compr_ops && compr_ops->ack) + ret = compr_ops->ack(cstream, bytes); err: mutex_unlock(&rtd->pcm_mutex); @@ -899,10 +646,9 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, struct snd_compr_tstamp *tstamp) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; - int ret = 0, __ret; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); + int ret = 0; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); @@ -910,29 +656,9 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, if (cpu_dai->driver->cops && cpu_dai->driver->cops->pointer) cpu_dai->driver->cops->pointer(cstream, tstamp, cpu_dai); - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->pointer) { - ret = platform->driver->compr_ops->pointer(cstream, tstamp); - if (ret < 0) - goto err; - } - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->pointer) - continue; + if (compr_ops && compr_ops->pointer) + ret = compr_ops->pointer(cstream, tstamp); - __ret = component->driver->compr_ops->pointer(cstream, tstamp); - if (__ret < 0) - ret = __ret; - } - -err: mutex_unlock(&rtd->pcm_mutex); return ret; } @@ -941,35 +667,15 @@ static int soc_compr_copy(struct snd_compr_stream *cstream, char __user *buf, size_t count) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; - int ret = 0, __ret; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); + int ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->copy) { - ret = platform->driver->compr_ops->copy(cstream, buf, count); - if (ret < 0) - goto err; - } - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; + if (compr_ops && compr_ops->copy) + ret = compr_ops->copy(cstream, buf, count); - if (!component->driver->compr_ops || - !component->driver->compr_ops->copy) - continue; - - __ret = component->driver->compr_ops->copy(cstream, buf, count); - if (__ret < 0) - ret = __ret; - } -err: mutex_unlock(&rtd->pcm_mutex); return ret; } @@ -978,11 +684,10 @@ static int soc_compr_set_metadata(struct snd_compr_stream *cstream, struct snd_compr_metadata *metadata) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int ret = 0, __ret; + int ret = 0; if (cpu_dai->driver->cops && cpu_dai->driver->cops->set_metadata) { ret = cpu_dai->driver->cops->set_metadata(cstream, metadata, cpu_dai); @@ -990,27 +695,8 @@ static int soc_compr_set_metadata(struct snd_compr_stream *cstream, return ret; } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->set_metadata) { - ret = platform->driver->compr_ops->set_metadata(cstream, metadata); - if (ret < 0) - return ret; - } - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->set_metadata) - continue; - - __ret = component->driver->compr_ops->set_metadata(cstream, metadata); - if (__ret < 0) - ret = __ret; - } + if (compr_ops && compr_ops->set_metadata) + ret = compr_ops->set_metadata(cstream, metadata); return ret; } @@ -1019,11 +705,10 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream, struct snd_compr_metadata *metadata) { struct snd_soc_pcm_runtime *rtd = cstream->private_data; - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int ret = 0, __ret; + int ret = 0; if (cpu_dai->driver->cops && cpu_dai->driver->cops->get_metadata) { ret = cpu_dai->driver->cops->get_metadata(cstream, metadata, cpu_dai); @@ -1031,27 +716,8 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream, return ret; } - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->get_metadata) { - ret = platform->driver->compr_ops->get_metadata(cstream, metadata); - if (ret < 0) - return ret; - } - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->get_metadata) - continue; - - __ret = component->driver->compr_ops->get_metadata(cstream, metadata); - if (__ret < 0) - ret = __ret; - } + if (compr_ops && compr_ops->get_metadata) + ret = compr_ops->get_metadata(cstream, metadata); return ret; } @@ -1096,9 +762,8 @@ static struct snd_compr_ops soc_compr_dyn_ops = { */ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) { - struct snd_soc_platform *platform = rtd->platform; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component = soc_compr_get_component(rtd); + const struct snd_compr_ops *compr_ops = soc_compr_get_ops(rtd, component); struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_compr *compr; @@ -1174,25 +839,9 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) memcpy(compr->ops, &soc_compr_ops, sizeof(soc_compr_ops)); } - /* Add copy callback for not memory mapped DSPs */ - if (platform && platform->driver->compr_ops && platform->driver->compr_ops->copy) - compr->ops->copy = soc_compr_copy; - - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - /* ignore duplication for now */ - if (platform && (component == &platform->component)) - continue; - - if (!component->driver->compr_ops || - !component->driver->compr_ops->copy) - continue; - + if (compr_ops && compr_ops->copy) compr->ops->copy = soc_compr_copy; - } - mutex_init(&compr->lock); ret = snd_compress_new(rtd->card->snd_card, num, direction, -- 2.11.0

5 15

[alsa-devel] [PATCH] ASoC: Fix twl4030 and 6040 regression by adding back read and write
by Tony Lindgren 25 Jan '18

25 Jan '18

Commit 3bb0f7c31b1a ("ASoC: don't use snd_soc_write/read on twl4030") caused regressions for both twl4030 and twl6040 as it assumes the ASoC driver is using regmap. As a side effect, this also causes a considerable increase in idle power consumption omap3 boards using twl4030 as the PMIC. This is because the removal of read and write function pointers causes some of the ASoC IO functions to not do anything. For example, snd_soc_register_card() calls snd_soc_dapm_new_widgets() that calls snd_soc_codec_drv_read() that now does nothing. A long term solution suggested by Mark Brown <broonie(a)kernel.org> is to make the twl drivers use regmap by adding a call to snd_soc_codec_set_regmap(). This however needs more consideration as currently the driver internal reads do caching and we would have both regmap access and internal read/write access accessing the same hardware registers. So to fix the regression, let's just do a partial revert adding back the read and write function pointers. Note that other non-regmap ASoC drivers may need similar patches. Fixes: 3bb0f7c31b1a ("ASoC: don't use snd_soc_write/read on twl4030") Fixes: 93a00c467fe9 ("ASoC: don't use snd_soc_write/read on twl6040") Acked-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Acked-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> --- sound/soc/codecs/twl4030.c | 2 ++ sound/soc/codecs/twl6040.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -2195,6 +2195,8 @@ static int twl4030_soc_remove(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_dev_twl4030 = { .probe = twl4030_soc_probe, .remove = twl4030_soc_remove, + .read = twl4030_read, + .write = twl4030_write, .set_bias_level = twl4030_set_bias_level, .idle_bias_off = true, diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1158,6 +1158,8 @@ static int twl6040_remove(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_dev_twl6040 = { .probe = twl6040_probe, .remove = twl6040_remove, + .read = twl6040_read, + .write = twl6040_write, .set_bias_level = twl6040_set_bias_level, .suspend_bias_off = true, .ignore_pmdown_time = true, -- 2.16.0

2 1

[alsa-devel] [PATCH] ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink
by Jeffy Chen 25 Jan '18

25 Jan '18

The rt5514 dsp captures pcm data through spi directly, so we should not use rockchip-i2s as it's cpu dai like other codecs. Use dummy_dai for rt5514 dsp dailink to make voice wakeup work again. Reported-by: Jimmy Cheng-Yi Chiang <cychiang(a)google.com> Fixes: (72cfb0f20c75 ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp) Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> --- sound/soc/rockchip/rk3399_gru_sound.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index d64fbbd50544..aa8ffd035377 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -367,7 +367,8 @@ static const struct snd_soc_dai_link rockchip_dais[] = { [DAILINK_RT5514_DSP] = { .name = "RT5514 DSP", .stream_name = "Wake on Voice", - .codec_dai_name = "rt5514-dsp-cpu-dai", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", }, }; @@ -528,7 +529,18 @@ static int rockchip_sound_of_parse_dais(struct device *dev, if (index < 0) continue; - np_cpu = (index == DAILINK_CDNDP) ? np_cpu1 : np_cpu0; + switch (index) { + case DAILINK_CDNDP: + np_cpu = np_cpu1; + break; + case DAILINK_RT5514_DSP: + np_cpu = np_codec; + break; + default: + np_cpu = np_cpu0; + break; + } + if (!np_cpu) { dev_err(dev, "Missing 'rockchip,cpu' for %s\n", rockchip_dais[index].name); @@ -538,7 +550,8 @@ static int rockchip_sound_of_parse_dais(struct device *dev, dai = &card->dai_link[card->num_links++]; *dai = rockchip_dais[index]; - dai->codec_of_node = np_codec; + if (!dai->codec_name) + dai->codec_of_node = np_codec; dai->platform_of_node = np_cpu; dai->cpu_of_node = np_cpu; -- 2.11.0

3 2

[alsa-devel] [PATCH 0/2] sunxi: Add Capture support for sun8i-a33
by Mylène Josserand 25 Jan '18

25 Jan '18

Hello everyone, Here is a first series to add support for the capture for Allwinner Sun8I-A33 SoC (sun8i-codec). These patches have been tested on Sun8i-r16 parrot board and the two microphones are working well. Noticed that the DAPM route is not correct: "Right/Left Digital ADC Mixer" widgets should be after the "Right ADC" (according to what I understood from the datasheet). This is currently not the case but when I tried to update it, I got an error about "failing to add routes". I will investigate why in next weeks (and send a V2) but as it can take time, I think it is better to send a V1 and got reviews (because it is the first time I am implementing such features). Thank you in advance, Best regards, Mylène Mylène Josserand (2): ASoC: sun8i-codec: Add ADC support for a33 ARM: dts: sun8i: Add ADC routing arch/arm/boot/dts/sun8i-a33.dtsi | 10 ++++- sound/soc/sunxi/sun8i-codec.c | 82 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 89 insertions(+), 3 deletions(-) -- 2.11.0

3 4

[alsa-devel] [PATCH for-4.15] ASoC: rt5514: don't assume rt5514 component was "attached"
by Brian Norris 24 Jan '18

24 Jan '18

I've found that on Google's "Kevin" Chromebook, the rt5514 codec might not be set up completely, yet its device is still present, and therefore its PM suspend/resume is called. This hits a NULL pointer exception, since we never had the chance to set our drvdata pointer. This resolves crashes seen when trying to resume my system. Fixes: e9c50aa6bd39 ("ASoC: rt5514-spi: check irq status to schedule data copy in resume function") Signed-off-by: Brian Norris <briannorris(a)chromium.org> --- This is a v4.15-rc1 regression sound/soc/codecs/rt5514-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 2df91db765ac..9255afcf2c3a 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -482,7 +482,7 @@ static int __maybe_unused rt5514_resume(struct device *dev) if (device_may_wakeup(dev)) disable_irq_wake(irq); - if (rt5514_dsp->substream) { + if (rt5514_dsp && rt5514_dsp->substream) { rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf, sizeof(buf)); if (buf[0] & RT5514_IRQ_STATUS_BIT) rt5514_schedule_copy(rt5514_dsp); -- 2.15.1.504.g5279b80103-goog

3 9

[alsa-devel] [PATCH] ASoC: soc-pcm: rename .pmdown_time to .use_pmdown_time for Component
by Kuninori Morimoto 24 Jan '18

24 Jan '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit fbb16563c6c2 ("ASoC: snd_soc_component_driver has pmdown_time") added new .pmdown_time which is for inverted version of current .ignore_pmdown_time But it is confusable name. Let's rename it to .use_pmdown_time Reported-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- include/sound/soc.h | 2 +- sound/soc/soc-pcm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index a34aa20..e05c51f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -838,7 +838,7 @@ struct snd_soc_component_driver { /* bits */ unsigned int idle_bias_on:1; unsigned int suspend_bias_off:1; - unsigned int pmdown_time:1; /* care pmdown_time at stop */ + unsigned int use_pmdown_time:1; /* care pmdown_time at stop */ unsigned int endianness:1; unsigned int non_legacy_dai_naming:1; }; diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8075856..bce0741 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -144,7 +144,7 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd) for_each_rtdcom(rtd, rtdcom) { component = rtdcom->component; - ignore &= !component->driver->pmdown_time; + ignore &= !component->driver->use_pmdown_time; } /* this will be removed */ -- 1.9.1

2 1

[alsa-devel] [RESEND PATCH] ASoC: rt5514-spi: Check the validity of drvdata pointer on resume
by Marc Zyngier 24 Jan '18

24 Jan '18

The rt5514-spi driver seem to assume the validity of the drvdata pointer on resume, which it may not be populated, leading to a not-so-nice crash. This stems from the fact that rt5514_spi_pcm_probe() is never called on my system (a kevin Chromebook). No idea why, but if it can happen, it is worth fixing. Fixes: e9c50aa6bd39 ("ASoC: rt5514-spi: check irq status to schedule data copy in resume function") Signed-off-by: Marc Zyngier <marc.zyngier(a)arm.com> --- sound/soc/codecs/rt5514-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 2df91db765ac..9255afcf2c3a 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -482,7 +482,7 @@ static int __maybe_unused rt5514_resume(struct device *dev) if (device_may_wakeup(dev)) disable_irq_wake(irq); - if (rt5514_dsp->substream) { + if (rt5514_dsp && rt5514_dsp->substream) { rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf, sizeof(buf)); if (buf[0] & RT5514_IRQ_STATUS_BIT) rt5514_schedule_copy(rt5514_dsp); -- 2.14.2

1 0

[alsa-devel] [PATCH] ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free()
by Kuninori Morimoto 24 Jan '18

24 Jan '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit f523acebbb74 ("ASoC: add Component level pcm_new/pcm_free v2") added component level pcm_new/pcm_free, but flush_delayed_work() on soc_pcm_private_free() is called in for_each_rtdcom() loop. It doesn't need to be called many times. This patch moves it out of loop. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-pcm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8075856..998800c 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2831,10 +2831,9 @@ static void soc_pcm_private_free(struct snd_pcm *pcm) struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_component *component; + /* need to sync the delayed work before releasing resources */ + flush_delayed_work(&rtd->delayed_work); for_each_rtdcom(rtd, rtdcom) { - /* need to sync the delayed work before releasing resources */ - - flush_delayed_work(&rtd->delayed_work); component = rtdcom->component; if (component->pcm_free) -- 1.9.1

2 1

[alsa-devel] [PATCH v5] ASoC: ak4613: call dummy write for PW_MGMT1/3 when Playback
by Kuninori Morimoto 24 Jan '18

24 Jan '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Power Down Release Command (PMVR, PMDAC, RSTN, PMDA1-PMDA6) which are located on PW_MGMT1 / PW_MGMT3 register must be write again after at least 5 LRCK cycle or later on each command. Otherwise, Playback volume will be 0dB. Basically, it should be 1. PowerDownRelease by Power Management1 <= call 1.x after 5LRCK 1.x Dummy write to Power Management1 2. PowerDownRelease by Power Management3 <= call 2.x after 5LRCK 2.x Dummy write to Power Management3 To avoid too many dummy write, this patch is merging these. 1. PowerDownRelease by Power Management1 2. PowerDownRelease by Power Management3 <= call after 5LRCK 2.x Dummy write to Power Management1/3 <= merge dummy write This patch adds dummy write when Playback Start timing. Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v4 -> v5 - added Note on comment - tidyup comment (delayed work -> schedule_work) sound/soc/codecs/ak4613.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index ee9e822..d85c61e 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -15,6 +15,7 @@ */ #include <linux/clk.h> +#include <linux/delay.h> #include <linux/i2c.h> #include <linux/slab.h> #include <linux/of_device.h> @@ -95,6 +96,9 @@ struct ak4613_priv { struct mutex lock; const struct ak4613_interface *iface; struct snd_pcm_hw_constraint_list constraint; + struct work_struct dummy_write_work; + struct snd_soc_component *component; + unsigned int rate; unsigned int sysclk; unsigned int fmt; @@ -392,6 +396,7 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } + priv->rate = rate; /* * FIXME @@ -467,11 +472,83 @@ static int ak4613_set_bias_level(struct snd_soc_component *component, return 0; } +static void ak4613_dummy_write(struct work_struct *work) +{ + struct ak4613_priv *priv = container_of(work, + struct ak4613_priv, + dummy_write_work); + struct snd_soc_component *component = priv->component; + unsigned int mgmt1; + unsigned int mgmt3; + + /* + * PW_MGMT1 / PW_MGMT3 needs dummy write at least after 5 LR clocks + * + * Note + * + * To avoid extra delay, we want to avoid preemption here, + * but we can't. Because it uses I2C access which is using IRQ + * and sleep. Thus, delay might be more than 5 LR clocks + * see also + * ak4613_dai_trigger() + */ + udelay(5000000 / priv->rate); + + snd_soc_component_read(component, PW_MGMT1, &mgmt1); + snd_soc_component_read(component, PW_MGMT3, &mgmt3); + + snd_soc_component_write(component, PW_MGMT1, mgmt1); + snd_soc_component_write(component, PW_MGMT3, mgmt3); +} + +static int ak4613_dai_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak4613_priv *priv = snd_soc_codec_get_drvdata(codec); + + /* + * FIXME + * + * PW_MGMT1 / PW_MGMT3 needs dummy write at least after 5 LR clocks + * from Power Down Release. Otherwise, Playback volume will be 0dB. + * To avoid complex multiple delay/dummy_write method from + * ak4613_set_bias_level() / SND_SOC_DAPM_DAC_E("DACx", ...), + * call it once here. + * + * But, unfortunately, we can't "write" here because here is atomic + * context (It uses I2C access for writing). + * Thus, use schedule_work() to switching to normal context + * immediately. + * + * Note + * + * Calling ak4613_dummy_write() function might be delayed. + * In such case, ak4613 volume might be temporarily 0dB when + * beggining of playback. + * see also + * ak4613_dummy_write() + */ + + if ((cmd != SNDRV_PCM_TRIGGER_START) && + (cmd != SNDRV_PCM_TRIGGER_RESUME)) + return 0; + + if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) + return 0; + + priv->component = &codec->component; + schedule_work(&priv->dummy_write_work); + + return 0; +} + static const struct snd_soc_dai_ops ak4613_dai_ops = { .startup = ak4613_dai_startup, .shutdown = ak4613_dai_shutdown, .set_sysclk = ak4613_dai_set_sysclk, .set_fmt = ak4613_dai_set_fmt, + .trigger = ak4613_dai_trigger, .hw_params = ak4613_dai_hw_params, }; @@ -591,6 +668,7 @@ static int ak4613_i2c_probe(struct i2c_client *i2c, priv->iface = NULL; priv->cnt = 0; priv->sysclk = 0; + INIT_WORK(&priv->dummy_write_work, ak4613_dummy_write); mutex_init(&priv->lock); -- 1.9.1

2 1

[alsa-devel] [PATCH - JACK PCM plugin] jack: Support snd_pcm_drain()
by twischer＠de.adit-jv.com 24 Jan '18

24 Jan '18

From: Timo Wischer <twischer(a)de.adit-jv.com> Block on drain till available samples played Without this commit the JACK thread will be stopped before the ALSA buffer was completely forwarded to the JACK daemon. Signed-off-by: Timo Wischer <twischer(a)de.adit-jv.com> --- This patch is depending on http://mailman.alsa-project.org/pipermail/alsa-devel/2018-January/130991.ht… diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c index e75aadc..ec94583 100644 --- a/jack/pcm_jack.c +++ b/jack/pcm_jack.c @@ -28,6 +28,17 @@ #include <alsa/asoundlib.h> #include <alsa/pcm_external.h> +/* ALSA supports up to 64 periods per buffer. + * Therefore at least 64 retries are valid and + * should not be handled as an error case + */ +#define MAX_DRAIN_RETRIES 100 +/* ALSA supports a a period with 8192 frames. + * This would result in ~170ms at 48kHz. + * Therefore a time out of 1 second is sufficient + */ +#define DRAIN_TIMEOUT 1000 + typedef enum _jack_format { SND_PCM_JACK_FORMAT_RAW } snd_pcm_jack_format_t; @@ -146,7 +157,13 @@ static int pcm_poll_unblock_check(snd_pcm_ioplug_t *io) snd_pcm_jack_t *jack = io->private_data; avail = snd_pcm_avail_update(io->pcm); - if (avail < 0 || avail >= jack->min_avail) { + /* In draining state poll_fd is used to wait + * till all pending frames are played. + * Therefore it has to be guarantee that a poll event is also generated + * if the buffer contains less than min_avail frames + */ + if (avail < 0 || avail >= jack->min_avail || + jack->state == SND_PCM_STATE_DRAINING) { write(jack->fd, &buf, 1); return 1; } @@ -242,7 +259,8 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io) } hw_ptr = jack->hw_ptr; - if (jack->state == SND_PCM_STATE_RUNNING) { + if (jack->state == SND_PCM_STATE_RUNNING || + jack->state == SND_PCM_STATE_DRAINING) { const snd_pcm_channel_area_t *areas = snd_pcm_ioplug_mmap_areas(io); while (xfer < nframes) { @@ -402,6 +420,61 @@ static int snd_pcm_jack_start(snd_pcm_ioplug_t *io) return err; } +static int snd_pcm_jack_drain(snd_pcm_ioplug_t *io) +{ + snd_pcm_jack_t *jack = io->private_data; + const snd_pcm_state_t state = jack->state; + unsigned int retries = MAX_DRAIN_RETRIES; + char buf[32]; + + /* Immediately stop on capture device. + * snd_pcm_jack_stop() will be automatically called + * by snd_pcm_ioplug_drain() + */ + if (io->stream == SND_PCM_STREAM_CAPTURE) { + return 0; + } + + if (snd_pcm_jack_hw_avail(io, jack->hw_ptr, io->appl_ptr) <= 0) { + /* No data pending. Nothing to drain. */ + return 0; + } + + /* start device if not yet done */ + if (state == SND_PCM_STATE_PREPARED) { + snd_pcm_jack_start(io); + } + + /* FIXME: io->state will not be set to SND_PCM_STATE_DRAINING by the + * ALSA library before calling this function. + * Therefore this state has to be stored internally. + */ + jack->state = SND_PCM_STATE_DRAINING; + + struct pollfd pfd; + pfd.fd = io->poll_fd; + pfd.events = io->poll_events | POLLERR | POLLNVAL; + + while (snd_pcm_jack_hw_avail(io, jack->hw_ptr, io->appl_ptr) > 0) { + if (retries <= 0) { + SNDERR("Pending frames not yet processed."); + return -ETIMEDOUT; + } + + if (poll(&pfd, 1, DRAIN_TIMEOUT) < 0) { + SNDERR("Waiting for next JACK process callback failed (err %d)", + -errno); + return -errno; + } + + /* clean pending events. */ + while (read(io->poll_fd, &buf, sizeof(buf)) == sizeof(buf)) + ; + } + + return 0; +} + static int snd_pcm_jack_stop(snd_pcm_ioplug_t *io) { snd_pcm_jack_t *jack = io->private_data; @@ -433,6 +506,7 @@ static snd_pcm_ioplug_callback_t jack_pcm_callback = { .stop = snd_pcm_jack_stop, .pointer = snd_pcm_jack_pointer, .prepare = snd_pcm_jack_prepare, + .drain = snd_pcm_jack_drain, .poll_revents = snd_pcm_jack_poll_revents, }; -- 2.7.4

1 0

[alsa-devel] (no subject)
by twischer＠de.adit-jv.com 24 Jan '18

24 Jan '18

The following patch set will extend the JACK plugin to detect Xruns and signal them to the user application. This patch set is depending on http://mailman.alsa-project.org/pipermail/alsa-devel/2018-January/130987.ht…

1 3

[alsa-devel] Bug message caught in syslog
by Pavel Řezníček 24 Jan '18

24 Jan '18

Dear developers, I'm sorry if I write to the wrong list but I just catched several log messages that I was advised to report as a bug to you, the ALSA developers. I'm not experiencing any sound problems by ear, just found these messages in the syslog (via logcheck). Ran the alsa-info_alsa-info.sh shell script and its output can be found here: http://www.alsa-project.org/db/?f=d9b579a048b94cdc71e619c4deac60e4c8228dbb The log messages in question read as follows: Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: snd_pcm_avail() navrátil hodnotu, která je nezvykle vysoká: 570108 bajtů (3231 ms). Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: S největší pravděpodobností se jedná o chybu v ovladači ALSA "snd_hda_intel". Nahlaste prosím tento problém vývojářům ALSA. Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: snd_pcm_dump(): Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Soft volume PCM Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Control: PCM Playback Volume Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: min_dB: -51 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: max_dB: 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: resolution: 256 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Its setup is: Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: stream : PLAYBACK Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: access : MMAP_INTERLEAVED Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: format : S16_LE Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: subformat : STD Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: channels : 2 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: rate : 44100 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: exact rate : 44100 (44100/1) Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: msbits : 16 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: buffer_size : 16384 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_size : 8192 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_time : 185759 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: tstamp_mode : ENABLE Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: tstamp_type : MONOTONIC Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_step : 1 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: avail_min : 15802 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_event : 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: start_threshold : -1 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: stop_threshold : 4611686018427387904 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: silence_threshold: 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: silence_size : 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: boundary : 4611686018427387904 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Slave: Hardware PCM card 0 'HDA Intel PCH' device 0 subdevice 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Its setup is: Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: stream : PLAYBACK Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: access : MMAP_INTERLEAVED Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: format : S16_LE Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: subformat : STD Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: channels : 2 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: rate : 44100 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: exact rate : 44100 (44100/1) Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: msbits : 16 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: buffer_size : 16384 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_size : 8192 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_time : 185759 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: tstamp_mode : ENABLE Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: tstamp_type : MONOTONIC Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_step : 1 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: avail_min : 15802 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_event : 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: start_threshold : -1 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: stop_threshold : 4611686018427387904 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: silence_threshold: 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: silence_size : 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: boundary : 4611686018427387904 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: appl_ptr : 95068169 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: hw_ptr : 95194312 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: snd_pcm_delay() navrátil hodnotu, která je nezvykle vysoká: -454064 bajtů (-2574 ms). Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: S největší pravděpodobností se jedná o chybu v ovladači ALSA "snd_hda_intel". Nahlaste prosím tento problém vývojářům ALSA. Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: snd_pcm_dump(): Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Soft volume PCM Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Control: PCM Playback Volume Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: min_dB: -51 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: max_dB: 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: resolution: 256 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Its setup is: Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: stream : PLAYBACK Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: access : MMAP_INTERLEAVED Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: format : S16_LE Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: subformat : STD Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: channels : 2 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: rate : 44100 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: exact rate : 44100 (44100/1) Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: msbits : 16 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: buffer_size : 16384 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_size : 8192 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_time : 185759 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: tstamp_mode : ENABLE Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: tstamp_type : MONOTONIC Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_step : 1 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: avail_min : 15802 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_event : 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: start_threshold : -1 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: stop_threshold : 4611686018427387904 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: silence_threshold: 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: silence_size : 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: boundary : 4611686018427387904 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Slave: Hardware PCM card 0 'HDA Intel PCH' device 0 subdevice 0 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: Its setup is: Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: stream : PLAYBACK Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: access : MMAP_INTERLEAVED Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: format : S16_LE Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: subformat : STD Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: channels : 2 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: rate : 44100 Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: exact rate : 44100 (44100/1) Jan 24 07:01:25 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: msbits : 16 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: buffer_size : 16384 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_size : 8192 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_time : 185759 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: tstamp_mode : ENABLE Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: tstamp_type : MONOTONIC Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_step : 1 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: avail_min : 15802 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: period_event : 0 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: start_threshold : -1 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: stop_threshold : 4611686018427387904 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: silence_threshold: 0 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: silence_size : 0 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: boundary : 4611686018427387904 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: appl_ptr : 95099921 Jan 24 07:01:26 ideapad-310 pulseaudio[2724]: [alsa-sink-CX20751/2 Analog] alsa-util.c: hw_ptr : 95213480 I'd be happy to help you solving this issue if not known already. Please feel free to ask for whatever information you'd need. Pavel Řezníček A. K. A. Cigydd

1 0

[alsa-devel] [PATCH][resend] ASoC: soc-pcm: don't call flush_delayed_work() many times in soc_pcm_private_free()
by Kuninori Morimoto 24 Jan '18

24 Jan '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit f523acebbb74 ("ASoC: add Component level pcm_new/pcm_free v2") added component level pcm_new/pcm_free, but flush_delayed_work() on soc_pcm_private_free() is called in for_each_rtdcom() loop. It doesn't need to be called many times. This patch moves it out of loop. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- 2weeks passed. resend sound/soc/soc-pcm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8075856..998800c 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2831,10 +2831,9 @@ static void soc_pcm_private_free(struct snd_pcm *pcm) struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_component *component; + /* need to sync the delayed work before releasing resources */ + flush_delayed_work(&rtd->delayed_work); for_each_rtdcom(rtd, rtdcom) { - /* need to sync the delayed work before releasing resources */ - - flush_delayed_work(&rtd->delayed_work); component = rtdcom->component; if (component->pcm_free) -- 1.9.1

1 0

[alsa-devel] [PATCH v5][RESEND v2] ASoC: ak4613: call dummy write for PW_MGMT1/3 when Playback
by Kuninori Morimoto 24 Jan '18

24 Jan '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Power Down Release Command (PMVR, PMDAC, RSTN, PMDA1-PMDA6) which are located on PW_MGMT1 / PW_MGMT3 register must be write again after at least 5 LRCK cycle or later on each command. Otherwise, Playback volume will be 0dB. Basically, it should be 1. PowerDownRelease by Power Management1 <= call 1.x after 5LRCK 1.x Dummy write to Power Management1 2. PowerDownRelease by Power Management3 <= call 2.x after 5LRCK 2.x Dummy write to Power Management3 To avoid too many dummy write, this patch is merging these. 1. PowerDownRelease by Power Management1 2. PowerDownRelease by Power Management3 <= call after 5LRCK 2.x Dummy write to Power Management1/3 <= merge dummy write This patch adds dummy write when Playback Start timing. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- 2week passed. resend sound/soc/codecs/ak4613.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index ee9e822..d85c61e 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -15,6 +15,7 @@ */ #include <linux/clk.h> +#include <linux/delay.h> #include <linux/i2c.h> #include <linux/slab.h> #include <linux/of_device.h> @@ -95,6 +96,9 @@ struct ak4613_priv { struct mutex lock; const struct ak4613_interface *iface; struct snd_pcm_hw_constraint_list constraint; + struct work_struct dummy_write_work; + struct snd_soc_component *component; + unsigned int rate; unsigned int sysclk; unsigned int fmt; @@ -392,6 +396,7 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } + priv->rate = rate; /* * FIXME @@ -467,11 +472,83 @@ static int ak4613_set_bias_level(struct snd_soc_component *component, return 0; } +static void ak4613_dummy_write(struct work_struct *work) +{ + struct ak4613_priv *priv = container_of(work, + struct ak4613_priv, + dummy_write_work); + struct snd_soc_component *component = priv->component; + unsigned int mgmt1; + unsigned int mgmt3; + + /* + * PW_MGMT1 / PW_MGMT3 needs dummy write at least after 5 LR clocks + * + * Note + * + * To avoid extra delay, we want to avoid preemption here, + * but we can't. Because it uses I2C access which is using IRQ + * and sleep. Thus, delay might be more than 5 LR clocks + * see also + * ak4613_dai_trigger() + */ + udelay(5000000 / priv->rate); + + snd_soc_component_read(component, PW_MGMT1, &mgmt1); + snd_soc_component_read(component, PW_MGMT3, &mgmt3); + + snd_soc_component_write(component, PW_MGMT1, mgmt1); + snd_soc_component_write(component, PW_MGMT3, mgmt3); +} + +static int ak4613_dai_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak4613_priv *priv = snd_soc_codec_get_drvdata(codec); + + /* + * FIXME + * + * PW_MGMT1 / PW_MGMT3 needs dummy write at least after 5 LR clocks + * from Power Down Release. Otherwise, Playback volume will be 0dB. + * To avoid complex multiple delay/dummy_write method from + * ak4613_set_bias_level() / SND_SOC_DAPM_DAC_E("DACx", ...), + * call it once here. + * + * But, unfortunately, we can't "write" here because here is atomic + * context (It uses I2C access for writing). + * Thus, use schedule_work() to switching to normal context + * immediately. + * + * Note + * + * Calling ak4613_dummy_write() function might be delayed. + * In such case, ak4613 volume might be temporarily 0dB when + * beggining of playback. + * see also + * ak4613_dummy_write() + */ + + if ((cmd != SNDRV_PCM_TRIGGER_START) && + (cmd != SNDRV_PCM_TRIGGER_RESUME)) + return 0; + + if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) + return 0; + + priv->component = &codec->component; + schedule_work(&priv->dummy_write_work); + + return 0; +} + static const struct snd_soc_dai_ops ak4613_dai_ops = { .startup = ak4613_dai_startup, .shutdown = ak4613_dai_shutdown, .set_sysclk = ak4613_dai_set_sysclk, .set_fmt = ak4613_dai_set_fmt, + .trigger = ak4613_dai_trigger, .hw_params = ak4613_dai_hw_params, }; @@ -591,6 +668,7 @@ static int ak4613_i2c_probe(struct i2c_client *i2c, priv->iface = NULL; priv->cnt = 0; priv->sysclk = 0; + INIT_WORK(&priv->dummy_write_work, ak4613_dummy_write); mutex_init(&priv->lock); -- 1.9.1 _______________________________________________ Alsa-devel mailing list Alsa-devel(a)alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

1 0

[alsa-devel] [PATCH] ASoC: soc-core: snd_soc_rtdcom_lookup() cares component driver name
by Kuninori Morimoto 23 Jan '18

23 Jan '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> snd_soc_rtdcom_lookup() look up component by uisng driver name. Then, it uses component->driver->name. Some driver might doesn't have it, thus it should care NULL pointer. This patch solve this issue. Reported-by: Mukunda,Vijendar <vijendar.mukunda(a)amd.com> Reported-by: Manuel Lauss <manuel.lauss(a)gmail.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Tested-by: Mukunda,Vijendar <vijendar.mukunda(a)amd.com> --- sound/soc/soc-core.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 10f808e..c9fdcbb 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -358,9 +358,17 @@ struct snd_soc_component *snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd, { struct snd_soc_rtdcom_list *rtdcom; + if (!driver_name) + return NULL; + for_each_rtdcom(rtd, rtdcom) { - if ((rtdcom->component->driver->name == driver_name) || - strcmp(rtdcom->component->driver->name, driver_name) == 0) + const char *component_name = rtdcom->component->driver->name; + + if (!component_name) + continue; + + if ((component_name == driver_name) || + strcmp(component_name, driver_name) == 0) return rtdcom->component; } -- 1.9.1

2 1

[alsa-devel] [PATCH] sound: emu10k1: Replace GFP_ATOMIC with GFP_KERNEL in synth_alloc_pages
by Jia-Ju Bai 23 Jan '18

23 Jan '18

The function synth_alloc_pages is not called in atomic context. Thus GFP_ATOMIC is not necessary, and it can be replaced with GFP_KERNEL. Signed-off-by: Jia-Ju Bai <baijiaju1990(a)gmail.com> --- sound/pci/emu10k1/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 4f1f69b..a4dbae1 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -477,7 +477,7 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk if (p) __free_page(p); /* try to allocate from <16MB zone */ - p = alloc_page(GFP_ATOMIC | GFP_DMA | + p = alloc_page(GFP_KERNEL | GFP_DMA | __GFP_NORETRY | /* no OOM-killer */ __GFP_NOWARN); } -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: intel: clean up CONFIG_SND_SST_IPC handling
by Arnd Bergmann 22 Jan '18

22 Jan '18

In a configuration with SND_SST_ATOM_HIFI2_PLATFORM_PCI=y and SND_SST_ATOM_HIFI2_PLATFORM=m, we get this module link failure: ERROR: "sst_context_init" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "sst_context_cleanup" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "sst_alloc_drv_context" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "intel_sst_pm" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! ERROR: "sst_configure_runtime_pm" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined! The problem is that the sound/soc/intel/atom/ directory only gets entered by Kbuild when SND_SST_ATOM_HIFI2_PLATFORM is set, so we only build modules (obj-m) under here but not built-in files (obj-y) including the snd-intel-sst-core that we clearly want need here. Before commit 4772c16ede52 ("ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies"), this could not happen as all files in sound/soc/intel/atom/ depended on CONFIG_SND_SST_ATOM_HIFI2_PLATFORM anyway. Slightly later, commit 05f4434bc130 ("ASoC: Intel: remove mfld_machine") was added, which then removed the Merrifield machine code that happened to be the only user of SND_SST_ATOM_HIFI2_PLATFORM_PCI. With that gone, it appears that we can completely remove that symbol as well, along with the SND_SST_IPC_PCI code and everything associated with it that is now unused. For clarify, this also removes the SND_SST_IPC_ACPI symbol that is now synonymous with SND_SST_IPC, and links both into a single loadable module. Fixes: 4772c16ede52 ("ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies") Fixes: 05f4434bc130 ("ASoC: Intel: remove mfld_machine") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- I checked that this patch leads to a clean compilation, and that the code I'm removing is only used for the now-obsolete Merrifield PCI ID. If I got something else wrong, or you want a different fix, please just send a replacement patch and treat this as a bug report. --- sound/soc/intel/Kconfig | 27 +---- sound/soc/intel/atom/sst/Makefile | 6 +- sound/soc/intel/atom/sst/sst_pci.c | 209 ------------------------------------- sound/soc/intel/common/sst-acpi.c | 4 +- 4 files changed, 5 insertions(+), 241 deletions(-) delete mode 100644 sound/soc/intel/atom/sst/sst_pci.c diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index f2c9e8c5970a..2dc8cda7a7cd 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -17,21 +17,11 @@ if SND_SOC_INTEL_SST_TOPLEVEL config SND_SST_IPC tristate # This option controls the IPC core for HiFi2 platforms - -config SND_SST_IPC_PCI - tristate - select SND_SST_IPC - # This option controls the PCI-based IPC for HiFi2 platforms - # (Medfield, Merrifield). - -config SND_SST_IPC_ACPI - tristate - select SND_SST_IPC - # This option controls the ACPI-based IPC for HiFi2 platforms # (Baytrail, Cherrytrail) config SND_SOC_INTEL_SST_ACPI tristate + select SND_SST_IPC # This option controls ACPI-based probing on # Haswell/Broadwell/Baytrail legacy and will be set # when these platforms are enabled @@ -72,23 +62,10 @@ config SND_SOC_INTEL_BAYTRAIL for Baytrail Chromebooks but this option is now deprecated and is not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead. -config SND_SST_ATOM_HIFI2_PLATFORM_PCI - tristate "PCI HiFi2 (Medfield, Merrifield) Platforms" - depends on X86 && PCI - select SND_SST_IPC_PCI - select SND_SOC_COMPRESS - help - If you have a Intel Medfield or Merrifield/Edison platform, then - enable this option by saying Y or m. Distros will typically not - enable this option: Medfield devices are not available to - developers and while Merrifield/Edison can run a mainline kernel with - limited functionality it will require a firmware file which - is not in the standard firmware tree - config SND_SST_ATOM_HIFI2_PLATFORM tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms" depends on X86 && ACPI - select SND_SST_IPC_ACPI + select SND_SST_IPC select SND_SOC_COMPRESS select SND_SOC_ACPI_INTEL_MATCH select IOSF_MBI diff --git a/sound/soc/intel/atom/sst/Makefile b/sound/soc/intel/atom/sst/Makefile index 795d1cf8f386..f5b7008b4cea 100644 --- a/sound/soc/intel/atom/sst/Makefile +++ b/sound/soc/intel/atom/sst/Makefile @@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -snd-intel-sst-core-objs := sst.o sst_ipc.o sst_stream.o sst_drv_interface.o sst_loader.o sst_pvt.o -snd-intel-sst-pci-objs += sst_pci.o -snd-intel-sst-acpi-objs += sst_acpi.o +snd-intel-sst-core-objs := sst.o sst_ipc.o sst_stream.o sst_drv_interface.o sst_loader.o sst_pvt.o sst_acpi.o obj-$(CONFIG_SND_SST_IPC) += snd-intel-sst-core.o -obj-$(CONFIG_SND_SST_IPC_PCI) += snd-intel-sst-pci.o -obj-$(CONFIG_SND_SST_IPC_ACPI) += snd-intel-sst-acpi.o diff --git a/sound/soc/intel/atom/sst/sst_pci.c b/sound/soc/intel/atom/sst/sst_pci.c deleted file mode 100644 index 6906ee624cf6..000000000000 --- a/sound/soc/intel/atom/sst/sst_pci.c +++ /dev/null @@ -1,209 +0,0 @@ -/* - * sst_pci.c - SST (LPE) driver init file for pci enumeration. - * - * Copyright (C) 2008-14 Intel Corp - * Authors: Vinod Koul <vinod.koul(a)intel.com> - * Harsha Priya <priya.harsha(a)intel.com> - * Dharageswari R <dharageswari.r(a)intel.com> - * KP Jeeja <jeeja.kp(a)intel.com> - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ -#include <linux/module.h> -#include <linux/pci.h> -#include <linux/fs.h> -#include <linux/firmware.h> -#include <linux/pm_runtime.h> -#include <sound/core.h> -#include <sound/soc.h> -#include <asm/platform_sst_audio.h> -#include "../sst-mfld-platform.h" -#include "sst.h" - -static int sst_platform_get_resources(struct intel_sst_drv *ctx) -{ - int ddr_base, ret = 0; - struct pci_dev *pci = ctx->pci; - - ret = pci_request_regions(pci, SST_DRV_NAME); - if (ret) - return ret; - - /* map registers */ - /* DDR base */ - if (ctx->dev_id == SST_MRFLD_PCI_ID) { - ctx->ddr_base = pci_resource_start(pci, 0); - /* check that the relocated IMR base matches with FW Binary */ - ddr_base = relocate_imr_addr_mrfld(ctx->ddr_base); - if (!ctx->pdata->lib_info) { - dev_err(ctx->dev, "lib_info pointer NULL\n"); - ret = -EINVAL; - goto do_release_regions; - } - if (ddr_base != ctx->pdata->lib_info->mod_base) { - dev_err(ctx->dev, - "FW LSP DDR BASE does not match with IFWI\n"); - ret = -EINVAL; - goto do_release_regions; - } - ctx->ddr_end = pci_resource_end(pci, 0); - - ctx->ddr = pcim_iomap(pci, 0, - pci_resource_len(pci, 0)); - if (!ctx->ddr) { - ret = -EINVAL; - goto do_release_regions; - } - dev_dbg(ctx->dev, "sst: DDR Ptr %p\n", ctx->ddr); - } else { - ctx->ddr = NULL; - } - /* SHIM */ - ctx->shim_phy_add = pci_resource_start(pci, 1); - ctx->shim = pcim_iomap(pci, 1, pci_resource_len(pci, 1)); - if (!ctx->shim) { - ret = -EINVAL; - goto do_release_regions; - } - dev_dbg(ctx->dev, "SST Shim Ptr %p\n", ctx->shim); - - /* Shared SRAM */ - ctx->mailbox_add = pci_resource_start(pci, 2); - ctx->mailbox = pcim_iomap(pci, 2, pci_resource_len(pci, 2)); - if (!ctx->mailbox) { - ret = -EINVAL; - goto do_release_regions; - } - dev_dbg(ctx->dev, "SRAM Ptr %p\n", ctx->mailbox); - - /* IRAM */ - ctx->iram_end = pci_resource_end(pci, 3); - ctx->iram_base = pci_resource_start(pci, 3); - ctx->iram = pcim_iomap(pci, 3, pci_resource_len(pci, 3)); - if (!ctx->iram) { - ret = -EINVAL; - goto do_release_regions; - } - dev_dbg(ctx->dev, "IRAM Ptr %p\n", ctx->iram); - - /* DRAM */ - ctx->dram_end = pci_resource_end(pci, 4); - ctx->dram_base = pci_resource_start(pci, 4); - ctx->dram = pcim_iomap(pci, 4, pci_resource_len(pci, 4)); - if (!ctx->dram) { - ret = -EINVAL; - goto do_release_regions; - } - dev_dbg(ctx->dev, "DRAM Ptr %p\n", ctx->dram); -do_release_regions: - pci_release_regions(pci); - return 0; -} - -/* - * intel_sst_probe - PCI probe function - * - * @pci: PCI device structure - * @pci_id: PCI device ID structure - * - */ -static int intel_sst_probe(struct pci_dev *pci, - const struct pci_device_id *pci_id) -{ - int ret = 0; - struct intel_sst_drv *sst_drv_ctx; - struct sst_platform_info *sst_pdata = pci->dev.platform_data; - - dev_dbg(&pci->dev, "Probe for DID %x\n", pci->device); - ret = sst_alloc_drv_context(&sst_drv_ctx, &pci->dev, pci->device); - if (ret < 0) - return ret; - - sst_drv_ctx->pdata = sst_pdata; - sst_drv_ctx->irq_num = pci->irq; - snprintf(sst_drv_ctx->firmware_name, sizeof(sst_drv_ctx->firmware_name), - "%s%04x%s", "fw_sst_", - sst_drv_ctx->dev_id, ".bin"); - - ret = sst_context_init(sst_drv_ctx); - if (ret < 0) - return ret; - - /* Init the device */ - ret = pcim_enable_device(pci); - if (ret) { - dev_err(sst_drv_ctx->dev, - "device can't be enabled. Returned err: %d\n", ret); - goto do_free_drv_ctx; - } - sst_drv_ctx->pci = pci_dev_get(pci); - ret = sst_platform_get_resources(sst_drv_ctx); - if (ret < 0) - goto do_free_drv_ctx; - - pci_set_drvdata(pci, sst_drv_ctx); - sst_configure_runtime_pm(sst_drv_ctx); - - return ret; - -do_free_drv_ctx: - sst_context_cleanup(sst_drv_ctx); - dev_err(sst_drv_ctx->dev, "Probe failed with %d\n", ret); - return ret; -} - -/** - * intel_sst_remove - PCI remove function - * - * @pci: PCI device structure - * - * This function is called by OS when a device is unloaded - * This frees the interrupt etc - */ -static void intel_sst_remove(struct pci_dev *pci) -{ - struct intel_sst_drv *sst_drv_ctx = pci_get_drvdata(pci); - - sst_context_cleanup(sst_drv_ctx); - pci_dev_put(sst_drv_ctx->pci); - pci_release_regions(pci); - pci_set_drvdata(pci, NULL); -} - -/* PCI Routines */ -static const struct pci_device_id intel_sst_ids[] = { - { PCI_VDEVICE(INTEL, SST_MRFLD_PCI_ID), 0}, - { 0, } -}; - -static struct pci_driver sst_driver = { - .name = SST_DRV_NAME, - .id_table = intel_sst_ids, - .probe = intel_sst_probe, - .remove = intel_sst_remove, -#ifdef CONFIG_PM - .driver = { - .pm = &intel_sst_pm, - }, -#endif -}; - -module_pci_driver(sst_driver); - -MODULE_DESCRIPTION("Intel (R) SST(R) Audio Engine PCI Driver"); -MODULE_AUTHOR("Vinod Koul <vinod.koul(a)intel.com>"); -MODULE_AUTHOR("Harsha Priya <priya.harsha(a)intel.com>"); -MODULE_AUTHOR("Dharageswari R <dharageswari.r(a)intel.com>"); -MODULE_AUTHOR("KP Jeeja <jeeja.kp(a)intel.com>"); -MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("sst"); diff --git a/sound/soc/intel/common/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c index cf6fbbd4e378..3b669d5adbb6 100644 --- a/sound/soc/intel/common/sst-acpi.c +++ b/sound/soc/intel/common/sst-acpi.c @@ -206,7 +206,7 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { .dma_size = SST_LPT_DSP_DMA_SIZE, }; -#if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI) +#if !IS_ENABLED(CONFIG_SND_SST_IPC) static struct sst_acpi_desc sst_acpi_baytrail_desc = { .drv_name = "baytrail-pcm-audio", .machines = snd_soc_acpi_intel_baytrail_legacy_machines, @@ -222,7 +222,7 @@ static struct sst_acpi_desc sst_acpi_baytrail_desc = { static const struct acpi_device_id sst_acpi_match[] = { { "INT33C8", (unsigned long)&sst_acpi_haswell_desc }, { "INT3438", (unsigned long)&sst_acpi_broadwell_desc }, -#if !IS_ENABLED(CONFIG_SND_SST_IPC_ACPI) +#if !IS_ENABLED(CONFIG_SND_SST_IPC) { "80860F28", (unsigned long)&sst_acpi_baytrail_desc }, #endif { } -- 2.9.0

3 6

[alsa-devel] Where do amidi MIDI port names come from ?
by Happy 22 Jan '18

22 Jan '18

Does someone know where (USB) MIDI port names in Linux come from ? For example a MIDISport 4x4 shows "Midiman" at lsusb (the same for each one if there is more than one device. This comes from the idVendor, idProduct in the device descriptor) But "MIDISPORT 4x4 Anniv MIDI 1 to 4" by amidi -l for the device. Thus wonder where amidi (ALSA) gets the product/portname from. There are other examples where the SUB device ID is not known by Linux but the port name does have the vendor/product name Microsoft argues that some MIDI devices do not report a name But since Linux does not have a driver for each device I highly doubt so. (have not come across one) Microsoft chose to use the name from the device driver in their UWP MIDI implementation which has apparantly been not a good idea It has resulted in multiple duplicate device/port names for different devices.

2 1

[alsa-devel] Maximum 50 dB gain in ALSA softvol plugin
by Ricard Wanderlof 22 Jan '18

22 Jan '18

Hi, The ALSA softvol plugin has a maximum gain of 50 dB (MAX_DB_UPPER_LIMIT is fixed to 50 in pcm/pcm_softvol.c). Is there some technical reason for this limit? These days when >16 bit audio is becoming common, it's not unreasonable to have large gain figures, and that is in fact a usecase I have right now. I'm looking through the CONVERT_AREA and MULTI_DIV_foo macros to see if there's something there that degenerates when the gain factor becomes too large, but I'd thought I'd ask too rather than just do reverse engineering. /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

3 10

[alsa-devel] [PATCH] ASoC: sgtl5000: Clarify a bit about the ER1 meaning
by Fabio Estevam 22 Jan '18

22 Jan '18

The "check ER1" message is not very clear about its meaning. Improve it a bit by referring to it as "ER1 erratum" so that it becomes clearer that ER1 references to a SGTL5000 erratum. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/codecs/sgtl5000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 633cdcf..e1ab553 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1392,7 +1392,7 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, ana_pwr |= SGTL5000_LINEREG_D_POWERUP; dev_info(&client->dev, - "Using internal LDO instead of VDDD: check ER1\n"); + "Using internal LDO instead of VDDD: check ER1 erratum\n"); } else { /* using external LDO for VDDD * Clear startup powerup and simple powerup -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: mediatek: fix double free in mt2701_afe_pcm_dev_probe()
by Ryder Lee 22 Jan '18

22 Jan '18

The commit dfa3cbb8(ASoC: mediatek: modify MT2701 AFE driver to adapt mfd device) leads to the following static checker warning: sound/soc/mediatek/mt2701/mt2701-afe-pcm.c:1535 mt2701_afe_pcm_dev_probe() error: double free of 'component' This patch fixes that and adds a helper mt2701_afe_add_component() to setup component. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Ryder Lee <ryder.lee(a)mediatek.com> --- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 32 +++++++++++++++++------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c index f0cd08f..ff15537 100644 --- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c +++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c @@ -1405,9 +1405,24 @@ static int mt2701_afe_runtime_resume(struct device *dev) return mt2701_afe_enable_clock(afe); } -static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) +static int mt2701_afe_add_component(struct mtk_base_afe *afe) { struct snd_soc_component *component; + + component = kzalloc(sizeof(*component), GFP_KERNEL); + if (!component) + return -ENOMEM; + + component->regmap = afe->regmap; + + return snd_soc_add_component(afe->dev, component, + &mt2701_afe_pcm_dai_component, + mt2701_afe_pcm_dais, + ARRAY_SIZE(mt2701_afe_pcm_dais)); +} + +static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) +{ struct mtk_base_afe *afe; struct mt2701_afe_private *afe_priv; struct device *dev; @@ -1477,12 +1492,6 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) = &mt2701_i2s_data[i][I2S_IN]; } - component = kzalloc(sizeof(*component), GFP_KERNEL); - if (!component) - return -ENOMEM; - - component->regmap = afe->regmap; - afe->mtk_afe_hardware = &mt2701_afe_hardware; afe->memif_fs = mt2701_memif_fs; afe->irq_fs = mt2701_irq_fs; @@ -1495,7 +1504,7 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) ret = mt2701_init_clock(afe); if (ret) { dev_err(dev, "init clock error\n"); - goto err_init_clock; + return ret; } platform_set_drvdata(pdev, afe); @@ -1514,10 +1523,7 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) goto err_platform; } - ret = snd_soc_add_component(dev, component, - &mt2701_afe_pcm_dai_component, - mt2701_afe_pcm_dais, - ARRAY_SIZE(mt2701_afe_pcm_dais)); + ret = mt2701_afe_add_component(afe); if (ret) { dev_warn(dev, "err_dai_component\n"); goto err_dai_component; @@ -1531,8 +1537,6 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev) pm_runtime_put_sync(dev); err_pm_disable: pm_runtime_disable(dev); -err_init_clock: - kfree(component); return ret; } -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: codecs: dmic: Fix check of return value from read of 'num-channels'
by Matthias Kaehlcke 22 Jan '18

22 Jan '18

Commit 7fb59e940f62 ("ASoC: codecs: dmic: Make number of channels configurable") introduces an optional property to the device tree to specify the number of DMIC channels. dmic_codec_probe() uses of_property_read_u32() to read the DT value, and expects a return value of -ENOENT when the property does not exist. This expectation is incorrect, the actual value returned in this case is -EINVAL (see of_find_property_value_of_size(), which is called under the hood). Check for -EINVAL instead. Fixes: 7fb59e940f62 ("ASoC: codecs: dmic: Make number of channels configurable") Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- sound/soc/codecs/dmic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index c88f974ebe3e..cf83c423394d 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -113,7 +113,7 @@ static int dmic_dev_probe(struct platform_device *pdev) if (pdev->dev.of_node) { err = of_property_read_u32(pdev->dev.of_node, "num-channels", &chans); - if (err && (err != -ENOENT)) + if (err && (err != -EINVAL)) return err; if (!err) { -- 2.16.0.rc1.238.g530d649a79-goog

2 2

[alsa-devel] [PATCH] ASoC: max98373 Changed SPDX header in C++ comments style
by Ryan Lee 22 Jan '18

22 Jan '18

Signed-off-by: Ryan Lee <ryans.lee(a)maximintegrated.com> --- Chagelog: Changed SPDX header in C comment-style to C++ comment style sound/soc/codecs/max98373.c | 4 ++-- sound/soc/codecs/max98373.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index 31b0864..562e887 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2017, Maxim Integrated */ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2017, Maxim Integrated #include <linux/acpi.h> #include <linux/i2c.h> diff --git a/sound/soc/codecs/max98373.h b/sound/soc/codecs/max98373.h index d0b359d..f6a37aa 100644 --- a/sound/soc/codecs/max98373.h +++ b/sound/soc/codecs/max98373.h @@ -1,5 +1,6 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2017, Maxim Integrated */ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2017, Maxim Integrated + #ifndef _MAX98373_H #define _MAX98373_H -- 2.7.4

2 1

[alsa-devel] [PATCH 0/5] ASoC: (minor) atmel cleanup
by Ladislav Michl 22 Jan '18

22 Jan '18

Hi there! this patchset is a side product of reading ALSA code while trying to support new hardware. Nothing special here, just an attempt to make those three drivers to look more similar. Only patch 4 fixes actual problem, but: 1) this particular issue is present almost everywhere (as far as I looked) where of_node_put is used in ALSA. Perhaps coccinelle people could help? 2) seems noone bothered as OF_DYNAMIC is mostly disabled Compile tested only. Ladislav Michl (5): ASoC: sam9g20_wm8731: use dev_*() logging functions ASoC: sam9x5_wm8731: Drop 'ASoC' prefix from error messages ASoC: sam9x5_wm8731: Return -ENODEV when probe does not find OF node ASoC: sam9x5_wm8731: Fix OF node reference counting ASoC: atmel_wm8904: Return -ENODEV when probe does not find OF node sound/soc/atmel/atmel_wm8904.c | 6 ++---- sound/soc/atmel/sam9g20_wm8731.c | 17 +++++++-------- sound/soc/atmel/sam9x5_wm8731.c | 45 +++++++++++++++++----------------------- 3 files changed, 29 insertions(+), 39 deletions(-) -- 2.15.1

3 12

[alsa-devel] [bug report] ASoC: mediatek: modify MT2701 AFE driver to adapt mfd device
by Dan Carpenter 22 Jan '18

22 Jan '18

Hello Ryder Lee, The patch dfa3cbb83e09: "ASoC: mediatek: modify MT2701 AFE driver to adapt mfd device" from Jan 4, 2018, leads to the following static checker warning: sound/soc/mediatek/mt2701/mt2701-afe-pcm.c:1535 mt2701_afe_pcm_dev_probe() error: double free of 'component' sound/soc/mediatek/mt2701/mt2701-afe-pcm.c 1509 pm_runtime_get_sync(dev); 1510 1511 ret = snd_soc_register_platform(dev, &mtk_afe_pcm_platform); 1512 if (ret) { 1513 dev_warn(dev, "err_platform\n"); 1514 goto err_platform; 1515 } 1516 1517 ret = snd_soc_add_component(dev, component, ^^^^^^^^^ snd_soc_add_component() frees "component" on error. This seems like a layering violation to me, and it naturally leads to bugs like this. 1518 &mt2701_afe_pcm_dai_component, 1519 mt2701_afe_pcm_dais, 1520 ARRAY_SIZE(mt2701_afe_pcm_dais)); 1521 if (ret) { 1522 dev_warn(dev, "err_dai_component\n"); 1523 goto err_dai_component; 1524 } 1525 1526 return 0; 1527 1528 err_dai_component: 1529 snd_soc_unregister_platform(dev); 1530 err_platform: 1531 pm_runtime_put_sync(dev); 1532 err_pm_disable: 1533 pm_runtime_disable(dev); 1534 err_init_clock: 1535 kfree(component); ^^^^^^^^^ Double free 1536 1537 return ret; 1538 } regards, dan carpenter

2 1

[alsa-devel] [PATCH 3/5] ALSA: emu10k1: add optional debug printouts with DMA addresses
by Maciej S. Szmigiero 22 Jan '18

22 Jan '18

When we get a IOMMU page fault for a emu10k1 device it is very hard to discover which of chip many DMA allocations triggered it (since on a IOMMU system the DMA address space is often very different from the CPU one). Let's add optional debug printouts providing this information. These debug printouts are only enabled on an explicit request via the kernel dynamic debug mechanism. Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- sound/pci/emu10k1/emu10k1_main.c | 8 ++++++++ sound/pci/emu10k1/memory.c | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 11e868f569d6..8decd2a7a404 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1898,6 +1898,9 @@ int snd_emu10k1_create(struct snd_card *card, err = -ENOMEM; goto error; } + dev_dbg(card->dev, "page table address range is %.8lx:%.8lx\n", + (unsigned long)emu->ptb_pages.addr, + (unsigned long)(emu->ptb_pages.addr + emu->ptb_pages.bytes)); emu->page_ptr_table = vmalloc(emu->max_cache_pages * sizeof(void *)); emu->page_addr_table = vmalloc(emu->max_cache_pages * @@ -1912,6 +1915,11 @@ int snd_emu10k1_create(struct snd_card *card, err = -ENOMEM; goto error; } + dev_dbg(card->dev, "silent page range is %.8lx:%.8lx\n", + (unsigned long)emu->silent_page.addr, + (unsigned long)(emu->silent_page.addr + + emu->silent_page.bytes)); + emu->memhdr = snd_util_memhdr_new(emu->max_cache_pages * PAGE_SIZE); if (emu->memhdr == NULL) { err = -ENOMEM; diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index eaa61024ac7f..39afe199e1c7 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -35,6 +35,8 @@ */ #define __set_ptb_entry(emu,page,addr) \ (((u32 *)(emu)->ptb_pages.area)[page] = cpu_to_le32(((addr) << (emu->address_mode)) | (page))) +#define __get_ptb_entry(emu, page) \ + (le32_to_cpu(((u32 *)(emu)->ptb_pages.area)[page])) #define UNIT_PAGES (PAGE_SIZE / EMUPAGESIZE) #define MAX_ALIGN_PAGES0 (MAXPAGES0 / UNIT_PAGES) @@ -44,7 +46,7 @@ /* get offset address from aligned page */ #define aligned_page_offset(page) ((page) << PAGE_SHIFT) -#if PAGE_SIZE == 4096 +#if PAGE_SIZE == 4096 && !IS_ENABLED(CONFIG_DYNAMIC_DEBUG) /* page size == EMUPAGESIZE */ /* fill PTB entrie(s) corresponding to page with addr */ #define set_ptb_entry(emu,page,addr) __set_ptb_entry(emu,page,addr) @@ -58,6 +60,8 @@ static inline void set_ptb_entry(struct snd_emu10k1 *emu, int page, dma_addr_t a page *= UNIT_PAGES; for (i = 0; i < UNIT_PAGES; i++, page++) { __set_ptb_entry(emu, page, addr); + dev_dbg(emu->card->dev, "mapped page %d to entry %.8x\n", page, + (unsigned int)__get_ptb_entry(emu, page)); addr += EMUPAGESIZE; } } @@ -65,9 +69,12 @@ static inline void set_silent_ptb(struct snd_emu10k1 *emu, int page) { int i; page *= UNIT_PAGES; - for (i = 0; i < UNIT_PAGES; i++, page++) + for (i = 0; i < UNIT_PAGES; i++, page++) { /* do not increment ptr */ __set_ptb_entry(emu, page, emu->silent_page.addr); + dev_dbg(emu->card->dev, "mapped silent page %d to entry %.8x\n", + page, (unsigned int)__get_ptb_entry(emu, page)); + } } #endif /* PAGE_SIZE */

2 1

[alsa-devel] [PATCH 5/5] ALSA: emu10k1: add a IOMMU workaround
by Maciej S. Szmigiero 21 Jan '18

21 Jan '18

The Audigy 2 CA0102 chip (but most likely others from the emu10k1 family, too) has a problem that from time to time it likes to do few DMA reads a bit beyond its normal allocation and gets very confused if these reads get blocked by a IOMMU. For the first (reserved) page this happens multiple times at every playback, for various synth pages it happens randomly, rarely for the page table memory itself. All these reads seem to follow a similar pattern, observed read offsets beyond the allocation end were 0x00, 0x40, 0x80 and 0xc0 (PCI cache line multiples), so it looks like the device tries to accesses up to 256 extra bytes. As a workaround let's widen these DMA allocations by an extra page if we detect that the device is behind a non-passthrough IOMMU (the DMA memory should be relatively plenty on IOMMU systems). Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- include/sound/emu10k1.h | 1 + sound/pci/emu10k1/emu10k1_main.c | 49 +++++++++++++++++++++++++++++++++++++--- sound/pci/emu10k1/memory.c | 16 ++++++++++--- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index db32b7de52e0..ba27abf65408 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1710,6 +1710,7 @@ struct snd_emu10k1 { unsigned int ecard_ctrl; /* ecard control bits */ unsigned int address_mode; /* address mode */ unsigned long dma_mask; /* PCI DMA mask */ + bool iommu_workaround; /* IOMMU workaround needed */ unsigned int delay_pcm_irq; /* in samples */ int max_cache_pages; /* max memory size / PAGE_SIZE */ struct snd_dma_buffer silent_page; /* silent page */ diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 8decd2a7a404..3d1b57546379 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -36,6 +36,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/interrupt.h> +#include <linux/iommu.h> #include <linux/pci.h> #include <linux/slab.h> #include <linux/vmalloc.h> @@ -1758,6 +1759,37 @@ static struct snd_emu_chip_details emu_chip_details[] = { { } /* terminator */ }; +/* + * The chip (at least the Audigy 2 CA0102 chip, but most likely others, too) + * has a problem that from time to time it likes to do few DMA reads a bit + * beyond its normal allocation and gets very confused if these reads get + * blocked by a IOMMU. + * + * This behaviour has been observed for the first (reserved) page + * (for which it happens multiple times at every playback), often for various + * synth pages and sometimes for the page table memory itself. + * + * As a workaround let's widen these DMA allocations by an extra page if we + * detect that the device is behind a non-passthrough IOMMU. + */ +static void snd_emu10k1_detect_iommu(struct snd_emu10k1 *emu) +{ + struct iommu_domain *domain; + + emu->iommu_workaround = false; + + if (!iommu_present(emu->card->dev->bus)) + return; + + domain = iommu_get_domain_for_dev(emu->card->dev); + if (domain && domain->type == IOMMU_DOMAIN_IDENTITY) + return; + + dev_notice(emu->card->dev, + "non-passthrough IOMMU detected, widening DMA allocations"); + emu->iommu_workaround = true; +} + int snd_emu10k1_create(struct snd_card *card, struct pci_dev *pci, unsigned short extin_mask, @@ -1770,6 +1802,7 @@ int snd_emu10k1_create(struct snd_card *card, struct snd_emu10k1 *emu; int idx, err; int is_audigy; + size_t page_table_size, silent_page_size; unsigned int silent_page; const struct snd_emu_chip_details *c; static struct snd_device_ops ops = { @@ -1867,6 +1900,8 @@ int snd_emu10k1_create(struct snd_card *card, is_audigy = emu->audigy = c->emu10k2_chip; + snd_emu10k1_detect_iommu(emu); + /* set addressing mode */ emu->address_mode = is_audigy ? 0 : 1; /* set the DMA transfer mask */ @@ -1893,8 +1928,13 @@ int snd_emu10k1_create(struct snd_card *card, emu->port = pci_resource_start(pci, 0); emu->max_cache_pages = max_cache_bytes >> PAGE_SHIFT; + + page_table_size = sizeof(u32) * (emu->address_mode ? MAXPAGES1 : + MAXPAGES0); + if (emu->iommu_workaround) + page_table_size += PAGE_SIZE; if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), - (emu->address_mode ? 32 : 16) * 1024, &emu->ptb_pages) < 0) { + page_table_size, &emu->ptb_pages) < 0) { err = -ENOMEM; goto error; } @@ -1910,8 +1950,11 @@ int snd_emu10k1_create(struct snd_card *card, goto error; } + silent_page_size = EMUPAGESIZE; + if (emu->iommu_workaround) + silent_page_size *= 2; if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), - EMUPAGESIZE, &emu->silent_page) < 0) { + silent_page_size, &emu->silent_page) < 0) { err = -ENOMEM; goto error; } @@ -1995,7 +2038,7 @@ int snd_emu10k1_create(struct snd_card *card, 0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT; /* Clear silent pages and set up pointers */ - memset(emu->silent_page.area, 0, PAGE_SIZE); + memset(emu->silent_page.area, 0, silent_page_size); silent_page = emu->silent_page.addr << emu->address_mode; for (idx = 0; idx < (emu->address_mode ? MAXPAGES1 : MAXPAGES0); idx++) ((u32 *)emu->ptb_pages.area)[idx] = cpu_to_le32(silent_page | idx); diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index a23eba540132..85414852c3db 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -457,6 +457,16 @@ static void get_single_page_range(struct snd_util_memhdr *hdr, *last_page_ret = last_page; } +static size_t synth_get_alloc_size(struct snd_emu10k1 *emu) +{ + size_t alloc_size = PAGE_SIZE; + + if (emu->iommu_workaround) + alloc_size *= 2; + + return alloc_size; +} + /* * allocate kernel pages */ @@ -471,7 +481,7 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk for (page = first_page; page <= last_page; page++) { if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), - PAGE_SIZE, &dmab) < 0) + synth_get_alloc_size(emu), &dmab) < 0) goto __fail; if (!is_valid_page(emu, dmab.addr)) { snd_dma_free_pages(&dmab); @@ -488,7 +498,7 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk for (page = first_page; page <= last_page; page++) { dmab.area = emu->page_ptr_table[page]; dmab.addr = emu->page_addr_table[page]; - dmab.bytes = PAGE_SIZE; + dmab.bytes = synth_get_alloc_size(emu); snd_dma_free_pages(&dmab); emu->page_addr_table[page] = 0; emu->page_ptr_table[page] = NULL; @@ -513,7 +523,7 @@ static int synth_free_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk * continue; dmab.area = emu->page_ptr_table[page]; dmab.addr = emu->page_addr_table[page]; - dmab.bytes = PAGE_SIZE; + dmab.bytes = synth_get_alloc_size(emu); snd_dma_free_pages(&dmab); emu->page_addr_table[page] = 0; emu->page_ptr_table[page] = NULL;

1 0

[alsa-devel] [PATCH 4/5] ALSA: emu10k1: make sure synth DMA pages are allocated with DMA functions
by Maciej S. Szmigiero 21 Jan '18

21 Jan '18

Commit a5003fc04113 ("[ALSA] emu10k1 - simplify page allocation for synth") switched from using the DMA allocator for synth DMA pages to manually calling alloc_page(). However, this usage has an implicit assumption that the DMA address space for the emu10k1-family chip is the same as the CPU physical address space which is not true for a system with a IOMMU. Since this made the synth part of the driver non-functional on such systems let's effectively revert that commit. Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- sound/pci/emu10k1/memory.c | 70 ++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 39afe199e1c7..a23eba540132 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -457,49 +457,44 @@ static void get_single_page_range(struct snd_util_memhdr *hdr, *last_page_ret = last_page; } -/* release allocated pages */ -static void __synth_free_pages(struct snd_emu10k1 *emu, int first_page, - int last_page) -{ - int page; - - for (page = first_page; page <= last_page; page++) { - free_page((unsigned long)emu->page_ptr_table[page]); - emu->page_addr_table[page] = 0; - emu->page_ptr_table[page] = NULL; - } -} - /* * allocate kernel pages */ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk) { int page, first_page, last_page; + struct snd_dma_buffer dmab; emu10k1_memblk_init(blk); get_single_page_range(emu->memhdr, blk, &first_page, &last_page); /* allocate kernel pages */ for (page = first_page; page <= last_page; page++) { - /* first try to allocate from <4GB zone */ - struct page *p = alloc_page(GFP_KERNEL | GFP_DMA32 | - __GFP_NOWARN); - if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT))) { - if (p) - __free_page(p); - /* try to allocate from <16MB zone */ - p = alloc_page(GFP_ATOMIC | GFP_DMA | - __GFP_NORETRY | /* no OOM-killer */ - __GFP_NOWARN); - } - if (!p) { - __synth_free_pages(emu, first_page, page - 1); - return -ENOMEM; + if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, + snd_dma_pci_data(emu->pci), + PAGE_SIZE, &dmab) < 0) + goto __fail; + if (!is_valid_page(emu, dmab.addr)) { + snd_dma_free_pages(&dmab); + goto __fail; } - emu->page_addr_table[page] = page_to_phys(p); - emu->page_ptr_table[page] = page_address(p); + emu->page_addr_table[page] = dmab.addr; + emu->page_ptr_table[page] = dmab.area; } return 0; + +__fail: + /* release allocated pages */ + last_page = page - 1; + for (page = first_page; page <= last_page; page++) { + dmab.area = emu->page_ptr_table[page]; + dmab.addr = emu->page_addr_table[page]; + dmab.bytes = PAGE_SIZE; + snd_dma_free_pages(&dmab); + emu->page_addr_table[page] = 0; + emu->page_ptr_table[page] = NULL; + } + + return -ENOMEM; } /* @@ -507,10 +502,23 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk */ static int synth_free_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk) { - int first_page, last_page; + int page, first_page, last_page; + struct snd_dma_buffer dmab; get_single_page_range(emu->memhdr, blk, &first_page, &last_page); - __synth_free_pages(emu, first_page, last_page); + dmab.dev.type = SNDRV_DMA_TYPE_DEV; + dmab.dev.dev = snd_dma_pci_data(emu->pci); + for (page = first_page; page <= last_page; page++) { + if (emu->page_ptr_table[page] == NULL) + continue; + dmab.area = emu->page_ptr_table[page]; + dmab.addr = emu->page_addr_table[page]; + dmab.bytes = PAGE_SIZE; + snd_dma_free_pages(&dmab); + emu->page_addr_table[page] = 0; + emu->page_ptr_table[page] = NULL; + } + return 0; }

1 0

[alsa-devel] [PATCH 2/5] ALSA: emu10k1: use dma_set_mask_and_coherent()
by Maciej S. Szmigiero 21 Jan '18

21 Jan '18

We have been calling dma_set_mask() and then dma_set_coherent_mask() with the same value, but there is a dma_set_mask_and_coherent() function that does exactly that so let's use it instead. Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- sound/pci/emu10k1/emu10k1_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index a0a4d31ded53..11e868f569d6 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1871,8 +1871,7 @@ int snd_emu10k1_create(struct snd_card *card, emu->address_mode = is_audigy ? 0 : 1; /* set the DMA transfer mask */ emu->dma_mask = emu->address_mode ? EMU10K1_DMA_MASK : AUDIGY_DMA_MASK; - if (dma_set_mask(&pci->dev, emu->dma_mask) < 0 || - dma_set_coherent_mask(&pci->dev, emu->dma_mask) < 0) { + if (dma_set_mask_and_coherent(&pci->dev, emu->dma_mask) < 0) { dev_err(card->dev, "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask);

1 0

[alsa-devel] [PATCH 1/5] ALSA: emu10k1: remove reserved_page
by Maciej S. Szmigiero 21 Jan '18

21 Jan '18

The emu10k1-family chips need the first page (index 0) reserved in their page tables for some reason (every emu10k1 driver I've checked does this without much of an explanation). Using the first page for normal samples results in a broken playback. However, we already have a dummy page allocated - so called "silent page" and, in fact, had always been setting it as the first page in the chip page table because an initialization of every entry of the page table to point to a silent page happens after and overwrites the reserved_page allocation. So the only thing remaining to remove the reserved_page allocation is a trivial change to the page allocation logic to ignore the first page entry and start its allocations from the second entry (index 1). Signed-off-by: Maciej S. Szmigiero <mail(a)maciej.szmigiero.name> --- include/sound/emu10k1.h | 1 - sound/pci/emu10k1/emu10k1_main.c | 11 ----------- sound/pci/emu10k1/memory.c | 8 ++++++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 4f42affe777c..db32b7de52e0 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1718,7 +1718,6 @@ struct snd_emu10k1 { struct snd_dma_buffer p16v_buffer; struct snd_util_memhdr *memhdr; /* page allocation list */ - struct snd_emu10k1_memblk *reserved_page; /* reserved page */ struct list_head mapped_link_head; struct list_head mapped_order_link_head; diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index ccf4415a1c7b..a0a4d31ded53 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1272,12 +1272,6 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu) release_firmware(emu->dock_fw); if (emu->irq >= 0) free_irq(emu->irq, emu); - /* remove reserved page */ - if (emu->reserved_page) { - snd_emu10k1_synth_free(emu, - (struct snd_util_memblk *)emu->reserved_page); - emu->reserved_page = NULL; - } snd_util_memhdr_free(emu->memhdr); if (emu->silent_page.area) snd_dma_free_pages(&emu->silent_page); @@ -1993,11 +1987,6 @@ int snd_emu10k1_create(struct snd_card *card, SPCS_GENERATIONSTATUS | 0x00001200 | 0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT; - emu->reserved_page = (struct snd_emu10k1_memblk *) - snd_emu10k1_synth_alloc(emu, 4096); - if (emu->reserved_page) - emu->reserved_page->map_locked = 1; - /* Clear silent pages and set up pointers */ memset(emu->silent_page.area, 0, PAGE_SIZE); silent_page = emu->silent_page.addr << emu->address_mode; diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index 4f1f69be1865..eaa61024ac7f 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -102,7 +102,7 @@ static void emu10k1_memblk_init(struct snd_emu10k1_memblk *blk) */ static int search_empty_map_area(struct snd_emu10k1 *emu, int npages, struct list_head **nextp) { - int page = 0, found_page = -ENOMEM; + int page = 1, found_page = -ENOMEM; int max_size = npages; int size; struct list_head *candidate = &emu->mapped_link_head; @@ -147,6 +147,10 @@ static int map_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk) page = search_empty_map_area(emu, blk->pages, &next); if (page < 0) /* not found */ return page; + if (page == 0) { + dev_err(emu->card->dev, "trying to map zero (reserved) page\n"); + return -EINVAL; + } /* insert this block in the proper position of mapped list */ list_add_tail(&blk->mapped_link, next); /* append this as a newest block in order list */ @@ -177,7 +181,7 @@ static int unmap_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk) q = get_emu10k1_memblk(p, mapped_link); start_page = q->mapped_page + q->pages; } else - start_page = 0; + start_page = 1; if ((p = blk->mapped_link.next) != &emu->mapped_link_head) { q = get_emu10k1_memblk(p, mapped_link); end_page = q->mapped_page;

1 0

Re: [alsa-devel] BUG: unable to handle kernel paging request in memset_erms (2)
by Andrew Morton 20 Jan '18

20 Jan '18

On Fri, 19 Jan 2018 13:58:01 -0800 syzbot <syzbot+29f08ad5cb6820798dfe(a)syzkaller.appspotmail.com> wrote: > Hello, > > syzbot hit the following crash on mmots commit > 2164355612187e55e8d60a28d2cc6b2337841a7e (Fri Jan 19 01:07:54 2018 +0000) > pci: test for unexpectedly disabled bridges > > So far this crash happened 2 times on mmots. > C reproducer is attached. > syzkaller reproducer is attached. > Raw console output is attached. > compiler: gcc (GCC) 7.1.1 20170620 > .config is attached. > > IMPORTANT: if you fix the bug, please add the following tag to the commit: > Reported-by: syzbot+29f08ad5cb6820798dfe(a)syzkaller.appspotmail.com > It will help syzbot understand when the bug is fixed. See footer for > details. > If you forward the report, please keep this part and the footer. > > BUG: unable to handle kernel paging request at ffffc90001691000 > IP: memset_erms+0x9/0x10 arch/x86/lib/memset_64.S:65 > PGD 1dad2c067 P4D 1dad2c067 PUD 1dad2d067 PMD 1c6a8f067 PTE 0 > Oops: 0002 [#1] SMP KASAN > Dumping ftrace buffer: > (ftrace buffer empty) > Modules linked in: > CPU: 1 PID: 5739 Comm: syzkaller592073 Not tainted 4.15.0-rc8-mm1+ #57 > Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS > Google 01/01/2011 > RIP: 0010:memset_erms+0x9/0x10 arch/x86/lib/memset_64.S:65 > RSP: 0018:ffff8801cbbdfb78 EFLAGS: 00010246 > RAX: fffff520002d3f00 RBX: ffffc90001691000 RCX: 000000000000ee51 > RDX: 000000000000ee51 RSI: 0000000000000000 RDI: ffffc90001691000 > RBP: ffff8801cbbdfb98 R08: fffff520002d3fcb R09: ffffc90001691000 > R10: 0000000000001dcb R11: fffff520002d3fca R12: 000000000000ee51 > R13: 0000000000000000 R14: 00007ffffffff000 R15: 000000002001be51 > FS: 00007f88ae7d7700(0000) GS:ffff8801db300000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: ffffc90001691000 CR3: 00000001ccefa005 CR4: 00000000001606e0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > Call Trace: > memset include/linux/string.h:329 [inline] > _copy_from_user+0xe9/0x110 lib/usercopy.c:16 > copy_from_user include/linux/uaccess.h:147 [inline] > snd_pcm_oss_write1 sound/core/oss/pcm_oss.c:1347 [inline] > snd_pcm_oss_write+0x438/0x880 sound/core/oss/pcm_oss.c:2659 > __vfs_write+0xef/0x970 fs/read_write.c:480 > vfs_write+0x189/0x510 fs/read_write.c:544 > SYSC_write fs/read_write.c:589 [inline] > SyS_write+0xef/0x220 fs/read_write.c:581 > entry_SYSCALL_64_fastpath+0x29/0xa0 > RIP: 0033:0x44a559 > RSP: 002b:00007f88ae7d6da8 EFLAGS: 00000293 ORIG_RAX: 0000000000000001 > RAX: ffffffffffffffda RBX: 00000000006dcc24 RCX: 000000000044a559 > RDX: 000000000000fe51 RSI: 000000002000c000 RDI: 0000000000000003 > RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 > R10: 0000000000000000 R11: 0000000000000293 R12: 00000000006dcc20 > R13: 7073642f7665642f R14: 00800000c0045006 R15: 0000000000000001 > Code: 48 c1 e9 03 40 0f b6 f6 48 b8 01 01 01 01 01 01 01 01 48 0f af c6 f3 > 48 ab 89 d1 f3 aa 4c 89 c8 c3 90 49 89 f9 40 88 f0 48 89 d1 <f3> aa 4c 89 > c8 c3 90 49 89 fa 40 0f b6 ce 48 b8 01 01 01 01 01 > RIP: memset_erms+0x9/0x10 arch/x86/lib/memset_64.S:65 RSP: ffff8801cbbdfb78 > CR2: ffffc90001691000 > ---[ end trace 8f421641f3e10f44 ]--- > Kernel panic - not syncing: Fatal exception > Dumping ftrace buffer: > (ftrace buffer empty) > Kernel Offset: disabled > Rebooting in 86400 seconds.. It's hard to believe that the (four year old) workaround-for-a-pci-restoring-bug.patch could cause this. From: Linus Torvalds <torvalds(a)linux-foundation.org> Subject: pci: test for unexpectedly disabled bridges The all-ones value is not just a "device didn't exist" case, it's also potentially a quite valid value, so not restoring it would be wrong. What *would* be interesting is to hear where the bad values came from in the first place. It sounds like the device state is saved after the PCI bus controller in front of the device has been crapped on, resulting in the PCI config cycles never reaching the device at all. Something along this patch (together with suspend/resume debugging output) migth help pinpoint it. But it really sounds like something totally brokenly turned off the PCI bridge (some ACPI shutdown crud? I wouldn't be entirely surprised) Cc: Greg KH <greg(a)kroah.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- drivers/pci/pci.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff -puN drivers/pci/pci.c~workaround-for-a-pci-restoring-bug drivers/pci/pci.c --- a/drivers/pci/pci.c~workaround-for-a-pci-restoring-bug +++ a/drivers/pci/pci.c @@ -1094,6 +1094,15 @@ static void pci_restore_pcix_state(struc int pci_save_state(struct pci_dev *dev) { int i; + u32 val; + + /* Unable to read PCI device/manufacturer state? Something is seriously wrong! */ + if (pci_read_config_dword(dev, 0, &val) || val == 0xffffffff) { + printk("Broken read from PCI device %s\n", pci_name(dev)); + WARN_ON(1); + return -1; + } + /* XXX: 100% dword access ok here? */ for (i = 0; i < 16; i++) pci_read_config_dword(dev, i * 4, &dev->saved_config_space[i]); _

2 1

[alsa-devel] Bug report for: [P7xxDM2(-G), Realtek ALC898, issue: Headphone Jack, External] No sound at all
by Dennis Mungai 20 Jan '18

20 Jan '18

Hello there, I have Ubuntu 16.04LTS installed on the Clevo P751DM2-G, also marketed as the Origin Eon 15-X (Late 2016 model), the System76's Serval WS (2017 model), the Eurocom Sky X4E2, among others. The sound card is the Realtek ALC898 with the following output configuration: 1. One SPDIF/headphone combo jack (to the right) 2. One Line Out. 3. One Line-In. 4. One Mic-In. Background information: On Windows, one can use the Realtek HD Audio control panel pop-up menu on jack detection to set the output type when an audio device is plugged in to an appropriate jack, combined with Sound Blaster X-Fi MB5 software to enable post-processing effects such as Bass, noise cancellation, etc. What I have tried so far: 1. Setting the model definition at /etc/modprobe.d/sound.conf with the following entries: options snd-hda-intel model=no-primary-hp enable=1 index=0 Using such a line worked before on an MSI GS43VR 6RE Phantom Pro that also has the same (or a similar) ESS Sabre Audio DAC component. Expected behavior: When plugged into the microphone jack, the ESS Sabre DAC should be activated and sound should be routed to the headset. Observed anomaly: Sound comes out through the speakers instead. However, the line-out output works. In that case, when plugged into the line out, Audio works as expected. Platform information: DistroRelease: Ubuntu 16.04 Package: alsa-base 1.0.25+dfsg-0ubuntu5 Uname: Linux 4.14.0 x86_64 NonfreeKernelModules: nvidia_uvm nvidia_drm nvidia_modeset nvidia ApportVersion: 2.20.1-0ubuntu2.10 Architecture: amd64 AudioDevicesInUse: USER PID ACCESS COMMAND /dev/snd/controlC1: lin 2199 F.... pulseaudio /dev/snd/controlC0: lin 2199 F.... pulseaudio CurrentDesktop: GNOME InstallationDate: Installed on 2017-07-25 InstallationMedia: Ubuntu 16.04.2 LTS "Xenial Xerus" - Release amd64 (20170215.2) PackageArchitecture: all SourcePackage: alsa-driver Symptom: audio Symptom_AlsaPlaybackTest: ALSA playback test through plughw:PCH failed Symptom_Card: Built-in Audio - HDA Intel PCH Symptom_DevicesInUse: USER PID ACCESS COMMAND /dev/snd/controlC1: gdm 1812 F.... pulseaudio lin 2199 F.... pulseaudio /dev/snd/controlC0: gdm 1812 F.... pulseaudio lin 2199 F.... pulseaudio Symptom_Jack: Speaker, Internal Symptom_Type: No sound at all Title: [P7xxDM2(-G), Realtek ALC898, Speaker, Internal] No sound at all UpgradeStatus: No upgrade log present (probably fresh install) dmi.bios.date: 12/21/2016 dmi.bios.vendor: American Megatrends Inc. dmi.bios.version: 1.06.04 dmi.board.asset.tag: Tag 12345 dmi.board.name: P7xxDM2(-G) dmi.board.vendor: Notebook dmi.board.version: Not Applicable dmi.chassis.asset.tag: No Asset Tag dmi.chassis.type: 10 dmi.chassis.vendor: No Enclosure dmi.chassis.version: N/A dmi.modalias: dmi:bvnAmericanMegatrendsInc.:bvr1.06.04:bd12/21/2016:svnNotebook:pnP7xxDM2(-G):pvrNotApplicable:rvnNotebook:rnP7xxDM2(-G):rvrNotApplicable:cvnNoEnclosure:ct10:cvrN/A: dmi.product.family: Not Applicable dmi.product.name: P7xxDM2(-G) dmi.product.version: Not Applicable dmi.sys.vendor: Notebook See the attachments below for the alsa-info.sh output, etc. Regards, Dennis.

2 4

[alsa-devel] [PATCH] ALSA: hda - Reduce the suspend time consumption for ALC256
by Takashi Iwai 19 Jan '18

19 Jan '18

ALC256 has its own quirk to override the shutup call, and it contains the COEF update for pulling down the headset jack control. Currently, the COEF update is called after clearing the headphone pin, and this seems triggering a stall of the codec communication, and results in a long delay over a second at suspend. A quick resolution is to swap the calls: at first with the COEF update, then clear the headphone pin. Fixes: 4a219ef8f370 ("ALSA: hda/realtek - Add ALC256 HP depop function") Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=198503 Reported-by: Paul Menzel <pmenzel(a)molgen.mpg.de> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 0004e282a837..23475888192b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3154,11 +3154,13 @@ static void alc256_shutup(struct hda_codec *codec) if (hp_pin_sense) msleep(85); + /* 3k pull low control for Headset jack. */ + /* NOTE: call this before clearing the pin, otherwise codec stalls */ + alc_update_coef_idx(codec, 0x46, 0, 3 << 12); + snd_hda_codec_write(codec, hp_pin, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); - alc_update_coef_idx(codec, 0x46, 0, 3 << 12); /* 3k pull low control for Headset jack. */ - if (hp_pin_sense) msleep(100); -- 2.15.1

1 0

Re: [alsa-devel] ASoC updates for v4.16
by Takashi Iwai 19 Jan '18

19 Jan '18

On Fri, 19 Jan 2018 13:16:40 +0100, Mark Brown wrote: > > The following changes since commit 5954c4a1455c3bc42acb2c286744eae1aaa00918: > > ASoC: rt5645: add fallback case for jack detection support (2018-01-12 12:27:54 +0000) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.16-3 > > for you to fetch changes up to 8f05b9c65d817dd288da5f1c6ecc134b66f8a190: > > Merge remote-tracking branches 'asoc/topic/wm8400', 'asoc/topic/wm8903', 'asoc/topic/wm8994', 'asoc/topic/wm8997' and 'asoc/topic/wm8998' into asoc-next (2018-01-18 11:56:34 +0000) > > ---------------------------------------------------------------- > ASoC: Updates for v4.16 > > Some final updates for the merge window, this brings in some > improvements to the ACPI GPIO handling for Intel and a bunch of fixes. Thanks, pulled now. Takashi

1 0

[alsa-devel] [GIT PULL]: Geminilake audio fw update
by Vinod Koul 19 Jan '18

19 Jan '18

Hi, Please pull to receive update to GLK fw consisting of few updates and fixes to this firmware. The following changes since commit 65b1c68c63f974d72610db38dfae49861117cae2: wl18xx: update firmware file 8.9.0.0.76 (2018-01-04 10:06:01 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/firmware.git glk for you to fetch changes up to 6ac6d57bdeb354a11b21a3ee5a00f6852cb57fea: linux-firmware: intel: Update Geminilake audio firmware (2018-01-08 15:56:55 +0530) ---------------------------------------------------------------- Pradeep Tewani (1): linux-firmware: intel: Update Geminilake audio firmware WHENCE | 4 +++- intel/dsp_fw_glk.bin | 2 +- intel/dsp_fw_glk_v2768.bin | Bin 0 -> 505608 bytes 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 intel/dsp_fw_glk_v2768.bin Thanks -- ~Vinod

2 1

[alsa-devel] [PATCH 4/6] alsa-lib:pcm: fix the hw_ptr update until the boundary available.
by sutar.mounesh＠gmail.com 19 Jan '18

19 Jan '18

From: mahendran.k <mahendran.kuppusamy(a)in.bosch.com> For long time test case, the slave_hw_ptr will exceed the boundary and wraparound the slave_hw_ptr. This slave boundary wraparound will cause the rate->hw_ptr to wraparound irrespective of the rate->boundary availability and due to that the available size goes wrong. Hence, To get the correct available size, - Its necessary to increment the rate->hw_ptr upto the rate->boundary and then wraparound the rate->hw_ptr. - While handling fraction part of slave period, rounded value will be introduced by input_frames(). To eliminate rounding issue on rate->hw_ptr, subtract last rounded value from rate->hw_ptr and add new rounded value of present slave_hw_ptr fraction part to rate->hw_ptr. Signed-off-by: mahendran.k <mahendran.kuppusamy(a)in.bosch.com> Signed-off-by: Mounesh Sutar <mounesh_sutar(a)mentor.com> diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 1f830dd..5bee77c 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -50,7 +50,7 @@ typedef struct _snd_pcm_rate snd_pcm_rate_t; struct _snd_pcm_rate { snd_pcm_generic_t gen; - snd_pcm_uframes_t appl_ptr, hw_ptr; + snd_pcm_uframes_t appl_ptr, hw_ptr, last_slave_hw_ptr; snd_pcm_uframes_t last_commit_ptr; snd_pcm_uframes_t orig_avail_min; snd_pcm_sw_params_t sw_params; @@ -563,14 +563,28 @@ static inline void snd_pcm_rate_sync_hwptr0(snd_pcm_t *pcm, snd_pcm_uframes_t sl { snd_pcm_rate_t *rate = pcm->private_data; + snd_pcm_sframes_t slave_hw_ptr_diff = slave_hw_ptr - rate->last_slave_hw_ptr; + snd_pcm_sframes_t last_slave_hw_ptr_frac; + if (pcm->stream != SND_PCM_STREAM_PLAYBACK) return; - /* FIXME: boundary overlap of slave hw_ptr isn't evaluated here! - * e.g. if slave rate is small... - */ - rate->hw_ptr = - (slave_hw_ptr / rate->gen.slave->period_size) * pcm->period_size + - rate->ops.input_frames(rate->obj, slave_hw_ptr % rate->gen.slave->period_size); + + if (slave_hw_ptr_diff < 0) + slave_hw_ptr_diff += rate->gen.slave->boundary; /* slave boundary wraparound */ + else if (slave_hw_ptr_diff == 0) + return; + last_slave_hw_ptr_frac = rate->last_slave_hw_ptr % rate->gen.slave->period_size; + /* While handling fraction part fo slave period, rounded value will be introduced by input_frames(). + * To eliminate rounding issue on rate->hw_ptr, subtract last rounded value from rate->hw_ptr and + * add new rounded value of present slave_hw_ptr fraction part to rate->hw_ptr. Hence, + * rate->hw_ptr += [ (no. of updated slave periods * pcm rate period size) - + * fractional part of last_slave_hw_ptr rounded value + + * fractional part of updated slave hw ptr's rounded value ] */ + rate->hw_ptr += ( + (((last_slave_hw_ptr_frac + slave_hw_ptr_diff) / rate->gen.slave->period_size) * pcm->period_size) - + rate->ops.input_frames(rate->obj, last_slave_hw_ptr_frac) + + rate->ops.input_frames(rate->obj, (last_slave_hw_ptr_frac + slave_hw_ptr_diff) % rate->gen.slave->period_size)); + rate->last_slave_hw_ptr = slave_hw_ptr; rate->hw_ptr %= pcm->boundary; } @@ -635,6 +649,7 @@ static int snd_pcm_rate_prepare(snd_pcm_t *pcm) return err; *pcm->hw.ptr = 0; *pcm->appl.ptr = 0; + rate->last_slave_hw_ptr = 0; err = snd_pcm_rate_init(pcm); if (err < 0) return err; @@ -650,6 +665,7 @@ static int snd_pcm_rate_reset(snd_pcm_t *pcm) return err; *pcm->hw.ptr = 0; *pcm->appl.ptr = 0; + rate->last_slave_hw_ptr = 0; err = snd_pcm_rate_init(pcm); if (err < 0) return err; -- 1.7.9.5

3 2

[alsa-devel] [PATCH 1/4] ASoC: max98373: Changed SPDX header in C++ comments style
by Ryan Lee 18 Jan '18

18 Jan '18

Signed-off-by: Ryan Lee <ryans.lee(a)maximintegrated.com> --- Changelog: Changed SPDX header in C comment-style to C++ comment-style sound/soc/codecs/max98373.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index 9af0d98..e040b03 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2017, Maxim Integrated */ #include <linux/acpi.h> -- 2.7.4

3 10

[alsa-devel] [PATCH] ASoC: soc-core: add missing EXPORT_SYMBOL_GPL() for snd_soc_rtdcom_lookup
by Kuninori Morimoto 18 Jan '18

18 Jan '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reported-by: Atsushi Nemoto <anemo(a)mba.ocn.ne.jp> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 971574c..10f808e 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -366,6 +366,7 @@ struct snd_soc_component *snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd, return NULL; } +EXPORT_SYMBOL_GPL(snd_soc_rtdcom_lookup); struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card, const char *dai_link, int stream) -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: use seq_file to dump the contents of dai_list, platoform_list and codec_list
by Peng Donglin 18 Jan '18

18 Jan '18

Now the debugfs files dais/codecs/platforms have a size limit PAGE_SIZE and the user can not see the whole contents of dai_list/platform_list/codec_list when they are larger than this limit. This patch uses seq_file instead to make sure dais/platforms/codecs show the full contents of dai_list/platform_list/codec_list. Signed-off-by: Peng Donglin <dolinux.peng(a)gmail.com> --- sound/soc/soc-core.c | 111 +++++++++++++++++---------------------------------- 1 file changed, 37 insertions(+), 74 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c0edac8..7b58211 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -349,120 +349,84 @@ static void soc_init_codec_debugfs(struct snd_soc_component *component) "ASoC: Failed to create codec register debugfs file\n"); } -static ssize_t codec_list_read_file(struct file *file, char __user *user_buf, - size_t count, loff_t *ppos) +static int codec_list_seq_show(struct seq_file *m, void *v) { - char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); - ssize_t len, ret = 0; struct snd_soc_codec *codec; - if (!buf) - return -ENOMEM; - mutex_lock(&client_mutex); - list_for_each_entry(codec, &codec_list, list) { - len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", - codec->component.name); - if (len >= 0) - ret += len; - if (ret > PAGE_SIZE) { - ret = PAGE_SIZE; - break; - } - } + list_for_each_entry(codec, &codec_list, list) + seq_printf(m, "%s\n", codec->component.name); mutex_unlock(&client_mutex); - if (ret >= 0) - ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); - - kfree(buf); + return 0; +} - return ret; +static int codec_list_seq_open(struct inode *inode, struct file *file) +{ + return single_open(file, codec_list_seq_show, NULL); } static const struct file_operations codec_list_fops = { - .read = codec_list_read_file, - .llseek = default_llseek,/* read accesses f_pos */ + .open = codec_list_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, }; -static ssize_t dai_list_read_file(struct file *file, char __user *user_buf, - size_t count, loff_t *ppos) +static int dai_list_seq_show(struct seq_file *m, void *v) { - char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); - ssize_t len, ret = 0; struct snd_soc_component *component; struct snd_soc_dai *dai; - if (!buf) - return -ENOMEM; - mutex_lock(&client_mutex); - list_for_each_entry(component, &component_list, list) { - list_for_each_entry(dai, &component->dai_list, list) { - len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", - dai->name); - if (len >= 0) - ret += len; - if (ret > PAGE_SIZE) { - ret = PAGE_SIZE; - break; - } - } - } + list_for_each_entry(component, &component_list, list) + list_for_each_entry(dai, &component->dai_list, list) + seq_printf(m, "%s\n", dai->name); mutex_unlock(&client_mutex); - ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); - - kfree(buf); + return 0; +} - return ret; +static int dai_list_seq_open(struct inode *inode, struct file *file) +{ + return single_open(file, dai_list_seq_show, NULL); } static const struct file_operations dai_list_fops = { - .read = dai_list_read_file, - .llseek = default_llseek,/* read accesses f_pos */ + .open = dai_list_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, }; -static ssize_t platform_list_read_file(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) +static int platform_list_seq_show(struct seq_file *m, void *v) { - char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); - ssize_t len, ret = 0; struct snd_soc_platform *platform; - if (!buf) - return -ENOMEM; - mutex_lock(&client_mutex); - list_for_each_entry(platform, &platform_list, list) { - len = snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", - platform->component.name); - if (len >= 0) - ret += len; - if (ret > PAGE_SIZE) { - ret = PAGE_SIZE; - break; - } - } + list_for_each_entry(platform, &platform_list, list) + seq_printf(m, "%s\n", platform->component.name); mutex_unlock(&client_mutex); - ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); - - kfree(buf); + return 0; +} - return ret; +static int platform_list_seq_open(struct inode *inode, struct file *file) +{ + return single_open(file, platform_list_seq_show, NULL); } static const struct file_operations platform_list_fops = { - .read = platform_list_read_file, - .llseek = default_llseek,/* read accesses f_pos */ + .open = platform_list_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, }; static void soc_init_card_debugfs(struct snd_soc_card *card) @@ -491,7 +455,6 @@ static void soc_cleanup_card_debugfs(struct snd_soc_card *card) debugfs_remove_recursive(card->debugfs_card_root); } - static void snd_soc_debugfs_init(void) { snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL); -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: Intel: remove select on non-existing SND_SOC_INTEL_COMMON
by Corentin Labbe 18 Jan '18

18 Jan '18

SND_SST_ATOM_HIFI2_PLATFORM_PCI select SND_SOC_INTEL_COMMON which do not exists anymore. So remove this select. Fixes: c6059879be29 ("ASoC: Intel: Fix Kconfig with top-level selector") Signed-off-by: Corentin Labbe <clabbe.montjoie(a)gmail.com> --- sound/soc/intel/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index b0bd1938b71e..f2c9e8c5970a 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -77,7 +77,6 @@ config SND_SST_ATOM_HIFI2_PLATFORM_PCI depends on X86 && PCI select SND_SST_IPC_PCI select SND_SOC_COMPRESS - select SND_SOC_INTEL_COMMON help If you have a Intel Medfield or Merrifield/Edison platform, then enable this option by saying Y or m. Distros will typically not -- 2.13.6

3 2

[alsa-devel] [PATCH] ASoC: sgtl5000: Do not print error on probe deferral
by Fabio Estevam 18 Jan '18

18 Jan '18

When the MCLK is not yet available when the codec is probed, probe deferral will happen and in this case we should not print an error message. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/codecs/sgtl5000.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index f2bb4fe..633cdcf 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1332,10 +1332,13 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, sgtl5000->mclk = devm_clk_get(&client->dev, NULL); if (IS_ERR(sgtl5000->mclk)) { ret = PTR_ERR(sgtl5000->mclk); - dev_err(&client->dev, "Failed to get mclock: %d\n", ret); /* Defer the probe to see if the clk will be provided later */ if (ret == -ENOENT) ret = -EPROBE_DEFER; + + if (ret != -EPROBE_DEFER) + dev_err(&client->dev, "Failed to get mclock: %d\n", + ret); goto disable_regs; } -- 2.7.4

2 3

[alsa-devel] [PATCH] ASoC: bcm2835: fix hw_params error when device is in prepared state
by Matthias Reichl 18 Jan '18

18 Jan '18

If bcm2835 is configured as bitclock master calling hw_params() after prepare() fails with EBUSY. This also makes it impossible to use bcm2835 in full duplex mode. The error is caused by the split clock setup: clk_set_rate is called in hw_params, clk_prepare_enable in prepare. As hw_params doesn't check if the clock was already enabled clk_set_rate fails with EBUSY. Fix this by moving clock startup from prepare to hw_params and let hw_params properly deal with an already set up or enabled clock. Signed-off-by: Matthias Reichl <hias(a)horus.com> --- sound/soc/bcm/bcm2835-i2s.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index 2e449d7173fc..d5f73a8ab893 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -130,6 +130,7 @@ struct bcm2835_i2s_dev { struct regmap *i2s_regmap; struct clk *clk; bool clk_prepared; + int clk_rate; }; static void bcm2835_i2s_start_clock(struct bcm2835_i2s_dev *dev) @@ -419,10 +420,19 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, } /* Clock should only be set up here if CPU is clock master */ - if (bit_clock_master) { - ret = clk_set_rate(dev->clk, bclk_rate); - if (ret) - return ret; + if (bit_clock_master && + (!dev->clk_prepared || dev->clk_rate != bclk_rate)) { + if (dev->clk_prepared) + bcm2835_i2s_stop_clock(dev); + + if (dev->clk_rate != bclk_rate) { + ret = clk_set_rate(dev->clk, bclk_rate); + if (ret) + return ret; + dev->clk_rate = bclk_rate; + } + + bcm2835_i2s_start_clock(dev); } /* Setup the frame format */ @@ -618,8 +628,6 @@ static int bcm2835_i2s_prepare(struct snd_pcm_substream *substream, struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai); uint32_t cs_reg; - bcm2835_i2s_start_clock(dev); - /* * Clear both FIFOs if the one that should be started * is not empty at the moment. This should only happen -- 2.11.0

2 1

[alsa-devel] Applied "IIO: ADC: stm32-dfsdm: remove unused variable again" to the asoc tree
by Mark Brown 18 Jan '18

18 Jan '18

The patch IIO: ADC: stm32-dfsdm: remove unused variable again 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 166a5a33d5a7bfa62c039eb10e69589b09fd0557 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd(a)arndb.de> Date: Thu, 18 Jan 2018 12:17:47 +0100 Subject: [PATCH] IIO: ADC: stm32-dfsdm: remove unused variable again The merge between commit abaca806fd13 ("IIO: ADC: stm32-dfsdm: code optimization") and commit 2353758bc2d4 ("IIO: ADC: stm32-dfsdm: avoid unused-variable warning") left one variable behind that is no longer needed and can be removed, as shown by the gcc warning: drivers/iio/adc/stm32-dfsdm-core.c: In function 'stm32_dfsdm_probe': drivers/iio/adc/stm32-dfsdm-core.c:245:29: error: unused variable 'of_id' [-Werror=unused-variable] Fixes: d84b4c7c706f ("Merge branch 'topic/iio' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-st-dfsdm") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/iio/adc/stm32-dfsdm-core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c index 84277bcc465f..6290332cfd3f 100644 --- a/drivers/iio/adc/stm32-dfsdm-core.c +++ b/drivers/iio/adc/stm32-dfsdm-core.c @@ -242,7 +242,6 @@ MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match); static int stm32_dfsdm_probe(struct platform_device *pdev) { struct dfsdm_priv *priv; - const struct of_device_id *of_id; const struct stm32_dfsdm_dev_data *dev_data; struct stm32_dfsdm *dfsdm; int ret; -- 2.15.1

1 0

[alsa-devel] [PATCH] ALSA: usb-audio: Support changing input on Sound Blaster E1
by Ian Douglas Scott 18 Jan '18

18 Jan '18

The E1 has two headphone jacks, one of which can be set as a microphone input. In the default mode, it uses the built-in microphone as an input. By sending a special command, the second headphone jack is instead used as an input. This might work with the E3 as well, but I don't have one of those to test it. Signed-off-by: Ian Douglas Scott <ian(a)iandouglasscott.com> --- sound/usb/mixer_quirks.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index e1e7ce9ab217..a91a0b75f6db 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -27,6 +27,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <linux/hid.h> #include <linux/init.h> #include <linux/slab.h> #include <linux/usb.h> @@ -1721,6 +1722,80 @@ static int snd_microii_controls_create(struct usb_mixer_interface *mixer) return 0; } +static int snd_soundblaster_e1_switch_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + ucontrol->value.integer.value[0] = kcontrol->private_value; + return 0; +} + +static int snd_soundblaster_e1_switch_update(struct usb_mixer_interface *mixer, + unsigned char state) +{ + struct snd_usb_audio *chip = mixer->chip; + int err; + unsigned char buff[2]; + + buff[0] = 0x02; + buff[1] = state ? 0x02 : 0x00; + + err = snd_usb_lock_shutdown(chip); + if (err < 0) + return err; + err = snd_usb_ctl_msg(chip->dev, + usb_sndctrlpipe(chip->dev, 0), + HID_REQ_SET_REPORT, + USB_TYPE_CLASS | USB_RECIP_INTERFACE + | USB_DIR_OUT, + 0x0202, 3, + buff, 2); + snd_usb_unlock_shutdown(chip); + return err; +} + +static int snd_soundblaster_e1_switch_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct usb_mixer_elem_list *list = snd_kcontrol_chip(kcontrol); + unsigned char value = ucontrol->value.integer.value[0]; + + kcontrol->private_value = value; + return snd_soundblaster_e1_switch_update(list->mixer, value); +} + +static int snd_soundblaster_e1_switch_resume(struct usb_mixer_elem_list *list) +{ + return snd_soundblaster_e1_switch_update(list->mixer, + list->kctl->private_value); +} + +static int snd_soundblaster_e1_switch_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + static const char *const texts[2] = { + "Mic", "Aux" + }; + + return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(texts), texts); +} + +static struct snd_kcontrol_new snd_soundblaster_e1_input_switch = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Input Source", + .info = snd_soundblaster_e1_switch_info, + .get = snd_soundblaster_e1_switch_get, + .put = snd_soundblaster_e1_switch_put, + .private_value = 0, +}; + +static int snd_soundblaster_e1_switch_create(struct usb_mixer_interface *mixer) +{ + return add_single_ctl_with_resume(mixer, 0, + snd_soundblaster_e1_switch_resume, + &snd_soundblaster_e1_input_switch, + NULL); +} + int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) { int err = 0; @@ -1802,6 +1877,10 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) case USB_ID(0x1235, 0x800c): /* Focusrite Scarlett 18i20 */ err = snd_scarlett_controls_create(mixer); break; + + case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */ + err = snd_soundblaster_e1_switch_create(mixer); + break; } return err; -- 2.15.1

2 3

[alsa-devel] Bad PCM stream after a suspend/resume cycle
by Mirza Krak 18 Jan '18

18 Jan '18

Hi. I have a quite simple problem really (simple test-case at least). Following describes the test case: $ aplay test.wav # While the .wav is playing suspend the system $ systemctl suspend # When system is resumed I get the following error on my aplay command aplay: pcm_write:2030: write error: File descriptor in bad state I was expecting for the playback to resume. I did some debugging using "aplay" and what I can see that happens before the EBADFD error is that the "writei_func()" returns a positive value once which results in a call to "snd_pcm_wait()" and on the next "writei_func()" call -EBADFD is returned. I would expect a -ESTRPIPE error which should then result in that the PCM stream to be "resumed" (according to documentation at least). I have tried "forcing" a call to "suspend()" on the first write error in aplay after system is resumed and it actually works, kinda. The playback is resumed even-though the "snd_pcm_resume()" call returns an error. I have not worked much with the sound subsystem before and I am having a hard time following all the call paths to see who/what is to blame for this behavior. Maybe it expected to work like this? And I do not know if this is only on my SoC or if this is a generic sound problem. Information about my system: Using a RK3288 SoC (RK3288-FireFly board) with 4.14.13 Linux kernel (latest stable). alsa-lib version 1.1.4.1 Playback using I2S $ cat /proc/asound/cards 0 [I2S ]: I2S - I2S I2S $ cat /proc/asound/card0/pcm0p/info card: 0 device: 0 subdevice: 0 stream: PLAYBACK id: Audio es8328-hifi-analog-0 name: subname: subdevice #0 class: 0 subclass: 0 subdevices_count: 1 subdevices_avail: 1 Let me know if there is additional information that I need to provide. -- Med Vänliga Hälsningar / Best Regards Mirza Krak

2 7

[alsa-devel] [PATCH v5 00/17] ASoC: fsl_ssi: Clean up - program flow level
by Nicolin Chen 17 Jan '18

17 Jan '18

[ Maciej, could you please send your Tested-by/Reviewed-by for AC97 once you confirm this series? And Caleb, this version does not need a test for non-AC97 cases. Thanks both! ] ==Change log== v5 * Reworked the series by taking suggestions from Maciej for AC97 + Fixed SSI lockup issue by changing cleanup sequence in PATCH-13 + Moved fsl_ssi_hw_clean() after unregistering the CODEC device in PATCH-13 + Set NULL as the parent of CODEC platform device to fix a NULL pointer dereference bug in PATCH-16 * Updated comments of three variables/pointers in struct fsl_ssi to describe them more accurately in PATCH-16 v4 * Reworked the series by taking suggestions from Maciej + Added TXBIT0 bit back to play safe in PATCH-14 + Made bool synchronous exclusive with AC97 mode in PATCH-16 v3 * Reworked the series by taking suggestions from Maciej + Added PATCH-01 to make RX and TX more clearly defined + Replaced "bool dir" with "int dir" in PATCH-04 + Replaced "!dir" with "int adir" in PATCH-05 + Put CBM_CFS behind the baudclk check to keep the same program flow in PATCH-14 + Removed all cpu_dai_drv changes in PATCH-15 v2 * Reworked the series by taking suggestions from Maciej + Added PATCH-01 to keep all ssi->i2s_net updated + Replaced bool tx with bool dir in PATCH-03 and PATCH-06 + Moved all initial register configurations from dai probe() to platform probe() so as to let AC97 CODEC successfully probe. * Added Tested-by from Caleb for TDM test cases. ==Background== The fsl_ssi driver was designed for PPC originally and then it has been updated to support different modes for i.MX Series, including SDMA, I2S Master mode, AC97 and older i.MXs with FIQ, by different contributors for different use cases in different coding styles. Additionally, in order to fix/work-around hardware bugs and design flaws, the driver made a lot of compromise so now its program flow looks very complicated and it's getting hard to maintain or update. So I am going to clean up the driver on both coding style level and program flow level. ==Introduction== This series of patches is the second set to clean up fsl_ssi driver in the program flow level. Any patch here may impact a fundamental test case like playback or record. ==Verification== This series of patches require fully tested. I have done such tests on i.MX6SoloX with WM8962 using imx_v6_v7_defconfig as: - Playback via I2S Master and Slave mode - Record via I2S Master and Slave mode - Simultaneous playback and record via I2S Master and Slave mode - Background playback with foreground record (starting at different time) via I2S Master and Slave mode - Background record with foreground playback (starting at different time) via I2S Master and Slave mode * All tests above by hacking offline_config to true in imx51. Caleb has tested v1-v4 with TDM lookback tests on i.MX6. Example of uncovered tests: AC97, PowerPC and FIQ. Nicolin Chen (17): ASoC: fsl_ssi: Redefine RX and TX macros ASoC: fsl_ssi: Keep ssi->i2s_net updated ASoC: fsl_ssi: Clean up set_dai_tdm_slot() ASoC: fsl_ssi: Maintain a mask of active streams ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro ASoC: fsl_ssi: Clear FIFO directly in fsl_ssi_config() ASoC: fsl_ssi: Clean up helper functions of trigger() ASoC: fsl_ssi: Add DAIFMT define for AC97 ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals() ASoC: fsl_ssi: Set xFEN0 and xFEN1 together ASoC: fsl_ssi: Use snd_soc_init_dma_data instead ASoC: fsl_ssi: Move one-time configurations to probe() ASoC: fsl_ssi: Setup AC97 in fsl_ssi_hw_init() ASoC: fsl_ssi: Clean up _fsl_ssi_set_dai_fmt() ASoC: fsl_ssi: Add bool synchronous to mark synchronous mode ASoC: fsl_ssi: Move DT related code to a separate probe() ASoC: fsl_ssi: Use ssi->streams instead of reading register sound/soc/fsl/fsl_ssi.c | 756 +++++++++++++++++++++++++----------------------- sound/soc/fsl/fsl_ssi.h | 3 - 2 files changed, 395 insertions(+), 364 deletions(-) -- 2.7.4

3 21

[alsa-devel] [PATCH V3 0/2] ARM: dts: bcm283x: Fix probing of bcm2835-i2s
by Stefan Wahren 17 Jan '18

17 Jan '18

This small series fixes the probing of bcm2835-i2s, which is broken since 517e7a1537a ("ASoC: bcm2835: move to use the clock framework"). Changes in V3: * split up patch into dt-binding and functional part Changes in V2: * add Fixes, Reviewed-by and Tested-by tags Stefan Wahren (2): dt-bindings: bcm283x: Fix register ranges of bcm2835-i2s ARM: dts: bcm283x: Fix probing of bcm2835-i2s Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt | 4 ++-- Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt | 9 ++++----- arch/arm/boot/dts/bcm283x.dtsi | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) -- 2.7.4

2 4

[alsa-devel] [PATCH v2 1/2] ASoC: sgtl5000: Do not print error on probe deferral
by Fabio Estevam 17 Jan '18

17 Jan '18

When the MCLK is not yet available when the codec is probed, probe deferral will happen and in this case we should not print an error message. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- Changes since v1: - Correcty mark this patch as 1/2 sound/soc/codecs/sgtl5000.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index f2bb4fe..633cdcf 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1332,10 +1332,13 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, sgtl5000->mclk = devm_clk_get(&client->dev, NULL); if (IS_ERR(sgtl5000->mclk)) { ret = PTR_ERR(sgtl5000->mclk); - dev_err(&client->dev, "Failed to get mclock: %d\n", ret); /* Defer the probe to see if the clk will be provided later */ if (ret == -ENOENT) ret = -EPROBE_DEFER; + + if (ret != -EPROBE_DEFER) + dev_err(&client->dev, "Failed to get mclock: %d\n", + ret); goto disable_regs; } -- 2.7.4

1 1

[alsa-devel] [PATCH -next] slimbus: qcom: remove redundant dev_err call in qcom_slim_probe()
by Wei Yongjun 17 Jan '18

17 Jan '18

There is a error message within devm_ioremap_resource already, so remove the dev_err call to avoid redundant error message. Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- drivers/slimbus/qcom-ctrl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index ffb46f9..2f671dd 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -529,10 +529,8 @@ static int qcom_slim_probe(struct platform_device *pdev) slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl"); ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem); - if (IS_ERR(ctrl->base)) { - dev_err(&pdev->dev, "IOremap failed\n"); + if (IS_ERR(ctrl->base)) return PTR_ERR(ctrl->base); - } sctrl->set_laddr = qcom_set_laddr; sctrl->xfer_msg = qcom_xfer_msg;

1 0

[alsa-devel] [PATCH] ASoC: Intel: remove second duplicated assignment to pointer 'res'
by Colin King 17 Jan '18

17 Jan '18

From: Colin Ian King <colin.king(a)canonical.com> The second assignment to res is identical to the previous assignment so it is redundant and can be removed. Cleans up clang warning: sound/soc/intel/skylake/skl-topology.c:191:25: warning: Value stored to 'res' during its initialization is never read Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/intel/skylake/skl-topology.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 28bc16a8e09a..73af6e19ebbd 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -190,7 +190,6 @@ skl_tplg_free_pipe_mcps(struct skl *skl, struct skl_module_cfg *mconfig) u8 res_idx = mconfig->res_idx; struct skl_module_res *res = &mconfig->module->resources[res_idx]; - res = &mconfig->module->resources[res_idx]; skl->resource.mcps -= res->cps; } -- 2.15.1

2 1

[alsa-devel] Update ALC215 depop optimize
by Kailang 17 Jan '18

17 Jan '18

Hi Takashi, Attach was the update patch for ALC215 depop. This depop method was same as ALC225. BR, Kailang

2 1

[alsa-devel] ALC215/ALC285/ALC289 headset mode support
by Kailang 17 Jan '18

17 Jan '18

Hi Takashi, Attach patch was for ALC215/ALC285/ALC289 headset mode support. Many thanks. BR, Kailang

2 1

[alsa-devel] Silencing plops / click sounds on start / stop of playing audio when snd_hda_intel.power_save=1
by Hans de Goede 17 Jan '18

17 Jan '18

Hi All, For Fedora 28 we plan to ship the kernel with snd_hda_intel.power_save defaulting to 1: https://fedoraproject.org/wiki/Changes/ImprovedLaptopBatteryLife We've had an update for F27 in updates-testing for a while which made the same change for F27, but we've received several bug reports about plops / click sounds on start / stop of playing audio: https://bugzilla.redhat.com/show_bug.cgi?id=1525104 I know others have probably already tried fixing this, but I'm wondering if there are any ideas how to fix this / things to try? Ideas of my own: 1) Mute the speakers / headphone output in the mixer before activating power-saving. Question how hard would it be to make this happen? 2) Put a delay between various steps involved in turning things off / on. Regards, Hans

2 2

[alsa-devel] [bug report] ASoC: snd_soc_component_driver has snd_compr_ops
by Dan Carpenter 17 Jan '18

17 Jan '18

Hello Kuninori Morimoto, The patch 9e7e3738ab0e: "ASoC: snd_soc_component_driver has snd_compr_ops" from Oct 11, 2017, leads to the following static checker warning: sound/soc/soc-compress.c:109 soc_compr_open() warn: 'cstream->runtime->private_data' double freed sound/soc/soc-compress.c 91 return 0; 92 93 machine_err: 94 for_each_rtdcom(rtd, rtdcom) { 95 component = rtdcom->component; 96 97 /* ignore duplication for now */ 98 if (platform && (component == &platform->component)) 99 continue; 100 101 if (!component->driver->compr_ops || 102 !component->driver->compr_ops->free) 103 continue; 104 105 component->driver->compr_ops->free(cstream); ^^^^^^^^^^^^^^^ This is in a loop so is the really right? We end up freeing cstream over and over? 106 } 107 108 if (platform && platform->driver->compr_ops && platform->driver->compr_ops->free) 109 platform->driver->compr_ops->free(cstream); ^^^^^^^^^^^^^ This second call is what triggers the warning. 110 plat_err: 111 if (cpu_dai->driver->cops && cpu_dai->driver->cops->shutdown) 112 cpu_dai->driver->cops->shutdown(cstream, cpu_dai); 113 out: 114 mutex_unlock(&rtd->pcm_mutex); 115 return ret; 116 } regards, dan carpenter

2 2

[alsa-devel] [PATCH] ALSA: usb-audio: Add a quirk for Nura's first gen headset
by Martin Peres 16 Jan '18

16 Jan '18

The capture interface does not work, and the playback interface actually supports only 48kHz unlike what is advertised (44.1, 32, 22, 16, 8). The only unknown here is if there are other devices that use the same product ID, but given that this ID is currently unknown, I would assume it is specially allocated for the nura headset. Signed-off-by: Martin Peres <martin.peres(a)free.fr> --- sound/usb/quirks-table.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 8a59d4782a0f..50252046b01d 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3277,4 +3277,52 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), } }, +{ + /* + * Nura's first gen headphones use Cambridge Silicon Radio's vendor + * ID, but it looks like the product ID actually is only for Nura. + * The capture interface does not work at all (even on Windows), + * and only the 48 kHz sample rate works for the playback interface. + */ + USB_DEVICE(0x0a12, 0x1243), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_STANDARD_MIXER, + }, + /* Capture */ + { + .ifnum = 1, + .type = QUIRK_IGNORE_INTERFACE, + }, + /* Playback */ + { + .ifnum = 2, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .channels = 2, + .iface = 2, + .altsetting = 1, + .altset_idx = 1, + .attributes = UAC_EP_CS_ATTR_FILL_MAX | + UAC_EP_CS_ATTR_SAMPLE_RATE, + .endpoint = 0x03, + .ep_attr = USB_ENDPOINT_XFER_ISOC, + .rates = SNDRV_PCM_RATE_48000, + .rate_min = 48000, + .rate_max = 48000, + .nr_rates = 1, + .rate_table = (unsigned int[]) { + 48000 + } + } + }, + } + } +}, + #undef USB_DEVICE_VENDOR_SPEC -- 2.15.1

2 3

[alsa-devel] [PATCH] ASoC: au1x: Fix timeout tests in au1xac97c_ac97_read()
by Dan Carpenter 16 Jan '18

16 Jan '18

The loop timeout doesn't work because it's a post op and ends with "tmo" set to -1. I changed it from a post-op to a pre-op and I changed the initial the starting value from 5 to 6 so we still iterate 5 times. I left the other as it was because it's a large number. Fixes: b3c70c9ea62a ("ASoC: Alchemy AC97C/I2SC audio support") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c index 29a97d52e8ad..66d6c52e7761 100644 --- a/sound/soc/au1x/ac97c.c +++ b/sound/soc/au1x/ac97c.c @@ -91,8 +91,8 @@ static unsigned short au1xac97c_ac97_read(struct snd_ac97 *ac97, do { mutex_lock(&ctx->lock); - tmo = 5; - while ((RD(ctx, AC97_STATUS) & STAT_CP) && tmo--) + tmo = 6; + while ((RD(ctx, AC97_STATUS) & STAT_CP) && --tmo) udelay(21); /* wait an ac97 frame time */ if (!tmo) { pr_debug("ac97rd timeout #1\n"); @@ -105,7 +105,7 @@ static unsigned short au1xac97c_ac97_read(struct snd_ac97 *ac97, * poll, Forrest, poll... */ tmo = 0x10000; - while ((RD(ctx, AC97_STATUS) & STAT_CP) && tmo--) + while ((RD(ctx, AC97_STATUS) & STAT_CP) && --tmo) asm volatile ("nop"); data = RD(ctx, AC97_CMDRESP);

3 3

[alsa-devel] Applied "IIO: ADC: stm32-dfsdm: code optimization" to the asoc tree
by Mark Brown 16 Jan '18

16 Jan '18

The patch IIO: ADC: stm32-dfsdm: code optimization 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 abaca806fd13afd069e04e883de8ec75924b0598 Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Date: Mon, 15 Jan 2018 09:57:39 +0100 Subject: [PATCH] IIO: ADC: stm32-dfsdm: code optimization Use of_device_get_match_data to optimize the source code. No check is needed on dev_data as match table is defined in driver. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Acked-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/iio/adc/stm32-dfsdm-adc.c | 9 +-------- drivers/iio/adc/stm32-dfsdm-core.c | 8 +------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c index 5e871404f565..3fe9b34ac6af 100644 --- a/drivers/iio/adc/stm32-dfsdm-adc.c +++ b/drivers/iio/adc/stm32-dfsdm-adc.c @@ -1087,18 +1087,11 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev) struct device_node *np = dev->of_node; const struct stm32_dfsdm_dev_data *dev_data; struct iio_dev *iio; - const struct of_device_id *of_id; char *name; int ret, irq, val; - of_id = of_match_node(stm32_dfsdm_adc_match, np); - if (!of_id->data) { - dev_err(&pdev->dev, "Data associated to device is missing\n"); - return -EINVAL; - } - - dev_data = (const struct stm32_dfsdm_dev_data *)of_id->data; + dev_data = of_device_get_match_data(dev); iio = devm_iio_device_alloc(dev, sizeof(*adc)); if (!iio) { dev_err(dev, "%s: Failed to allocate IIO\n", __func__); diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c index 6cd655f8239b..6290332cfd3f 100644 --- a/drivers/iio/adc/stm32-dfsdm-core.c +++ b/drivers/iio/adc/stm32-dfsdm-core.c @@ -242,7 +242,6 @@ MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match); static int stm32_dfsdm_probe(struct platform_device *pdev) { struct dfsdm_priv *priv; - const struct of_device_id *of_id; const struct stm32_dfsdm_dev_data *dev_data; struct stm32_dfsdm *dfsdm; int ret; @@ -253,13 +252,8 @@ static int stm32_dfsdm_probe(struct platform_device *pdev) priv->pdev = pdev; - of_id = of_match_node(stm32_dfsdm_of_match, pdev->dev.of_node); - if (!of_id->data) { - dev_err(&pdev->dev, "Data associated to device is missing\n"); - return -EINVAL; - } + dev_data = of_device_get_match_data(&pdev->dev); - dev_data = (const struct stm32_dfsdm_dev_data *)of_id->data; dfsdm = &priv->dfsdm; dfsdm->fl_list = devm_kcalloc(&pdev->dev, dev_data->num_filters, sizeof(*dfsdm->fl_list), GFP_KERNEL); -- 2.15.1

1 0

[alsa-devel] Applied "IIO: ADC: stm32-dfsdm: fix static check warning" to the asoc tree
by Mark Brown 16 Jan '18

16 Jan '18

The patch IIO: ADC: stm32-dfsdm: fix static check warning 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 1175d0f9f4031ce02845f6f843f58a9caaee7817 Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Date: Mon, 15 Jan 2018 10:00:26 +0100 Subject: [PATCH] IIO: ADC: stm32-dfsdm: fix static check warning iio_priv does not return an error pointer, so check is not valid. Patch suppresses it. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Acked-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/iio/adc/stm32-dfsdm-adc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c index 3fe9b34ac6af..daa026d6a94f 100644 --- a/drivers/iio/adc/stm32-dfsdm-adc.c +++ b/drivers/iio/adc/stm32-dfsdm-adc.c @@ -1099,10 +1099,6 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev) } adc = iio_priv(iio); - if (IS_ERR(adc)) { - dev_err(dev, "%s: Failed to allocate ADC\n", __func__); - return PTR_ERR(adc); - } adc->dfsdm = dev_get_drvdata(dev->parent); iio->dev.parent = dev; -- 2.15.1

1 0

[alsa-devel] ASoC: fix regression by adding back .read/.write
by Kuninori Morimoto 16 Jan '18

16 Jan '18

Hi Mark As Tony mentioned in "PM regression in next" mail thread, below drivers need .read/.write back on codec driver. twl4030/twl6040 side will be fixed by Tony's patch, thus, I post for remains. sound/soc/codecs/cx20442.c sound/soc/codecs/tlv320dac33.c sound/soc/codecs/twl4030.c sound/soc/codecs/twl6040.c sound/soc/codecs/uda1380.c Because of this, my posted codec/platform conversion patch-set will have conflict on above drivers. I'm happy to post v2 patch for these when you accepted that series. This .read/.write callback is implemented in Codec driver side only. We need it in Component side too. Last patch is for it. Best regards --- Kuninori Morimoto

2 8

[alsa-devel] [PATCH v2] ALSA: pcm: Fix trailing semicolon
by Luis de Bethencourt 16 Jan '18

16 Jan '18

The trailing semicolon is an empty statement that does no operation. Removing it since it doesn't do anything. Signed-off-by: Luis de Bethencourt <luisbg(a)kernel.org> --- Changes from v1: - Fix commit message sound/core/pcm_native.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 3f13e8da0812..51104df924e1 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3446,7 +3446,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_lib_default_mmap); int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_struct *area) { - struct snd_pcm_runtime *runtime = substream->runtime;; + struct snd_pcm_runtime *runtime = substream->runtime; area->vm_page_prot = pgprot_noncached(area->vm_page_prot); return vm_iomap_memory(area, runtime->dma_addr, runtime->dma_bytes); -- 2.15.1

2 1

[alsa-devel] [PATCH] ALSA: pcm: Fix trailing semicolon
by Luis de Bethencourt 16 Jan '18

16 Jan '18

From: Ubuntu <luisbg(a)kernel.org> The trailing semicolon is an empty statement that does no operation. Removing it since it doesn't do anything. Signed-off-by: Luis de Bethencourt <luisbg(a)kernel.org> --- Hi, After fixing the same thing in drivers/staging/rtl8723bs/, Joe Perches suggested I fix it treewide [0]. Best regards Luis [0] http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2018-Janu… [1] http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2018-Janu… sound/core/pcm_native.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 3f13e8da0812..51104df924e1 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3446,7 +3446,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_lib_default_mmap); int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_struct *area) { - struct snd_pcm_runtime *runtime = substream->runtime;; + struct snd_pcm_runtime *runtime = substream->runtime; area->vm_page_prot = pgprot_noncached(area->vm_page_prot); return vm_iomap_memory(area, runtime->dma_addr, runtime->dma_bytes); -- 2.15.1

2 2

[alsa-devel] Sound Blaster Z - Sound from front case port, but not back
by Frederique 16 Jan '18

16 Jan '18

I am using a Sound Blaster Z on Debian. The back microphone port works as expected. I can only manage to get audio out of the card by connecting the case audio header to the sound card, and then using the case front audio port and having the headphone port option enabled in alsamixer. It is an inconvenience as now I have to use an extension cable to route things around (microphone cable at the back, audio cable to the front), having a headset. Does anyone know a solution to this? How hard can it be to make the back audio part do the same thing as the front audio port?

1 0

[alsa-devel] [PATCH v7 00/17] Add support for Cirrus Logic CS47L35/L85/L90/L91 codecs
by Richard Fitzgerald 16 Jan '18

16 Jan '18

IMPORTANT: These patches have to be submitted as an atomic block because of build interdependencies so you'll need to agree who is going to take them all through a branch. The Cirrus Logic CS47L35, CS47L85, CS47L90/91 codecs are complex audio SoC devices. In addition to the core audio capability they have onboard GPIO, regulators, DSPs and interrupt controller and a large register map space accessed over SPI or I2C. This family of codecs is based around common IP blocks and they are managed by a set of common drivers referred to as "Madera". Patches still waiting for review/ack: #7-8 regulator #9 irqchip #14-17 ASoC Richard Fitzgerald (17): mfd: madera: Add register definitions for Cirrus Logic Madera codecs mfd: madera: Add DT bindings for Cirrus Logic Madera codecs mfd: madera: Add common support for Cirrus Logic Madera codecs mfd: madera: Register map tables for Cirrus Logic CS47L35 mfd: madera: Register map tables for Cirrus Logic CS47L85 mfd: madera: Register map tables for Cirrus Logic CS47L90/91 regulator: arizona-micsupp: Add support for Cirrus Logic Madera codecs regulator: arizona-ldo1: Add support for Cirrus Logic Madera codecs irqchip: Add driver for Cirrus Logic Madera codecs pinctrl: madera: Add DT bindings for Cirrus Logic Madera codecs pinctrl: madera: Add driver for Cirrus Logic Madera codecs gpio: madera: Support Cirrus Logic Madera class codecs ASoC: madera: Add DT bindings for Cirrus Logic Madera codecs ASoC: madera: Add common support for Cirrus Logic Madera codecs ASoC: cs47l35: Add codec driver for Cirrus Logic CS47L35 ASoC: cs47l85: Add codec driver for Cirrus Logic CS47L85 ASoC: cs47l90: Add codec driver for Cirrus Logic CS47L90 Documentation/devicetree/bindings/mfd/madera.txt | 102 + .../bindings/pinctrl/cirrus,madera-pinctrl.txt | 99 + .../bindings/regulator/arizona-regulator.txt | 3 +- Documentation/devicetree/bindings/sound/madera.txt | 67 + MAINTAINERS | 23 + drivers/gpio/Kconfig | 6 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-madera.c | 196 + drivers/irqchip/Kconfig | 3 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-madera.c | 301 ++ drivers/mfd/Kconfig | 48 + drivers/mfd/Makefile | 13 + drivers/mfd/cs47l35-tables.c | 1610 +++++++ drivers/mfd/cs47l85-tables.c | 3010 +++++++++++++ drivers/mfd/cs47l90-tables.c | 2675 ++++++++++++ drivers/mfd/madera-core.c | 599 +++ drivers/mfd/madera-i2c.c | 140 + drivers/mfd/madera-spi.c | 139 + drivers/mfd/madera.h | 44 + drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/cirrus/Kconfig | 15 + drivers/pinctrl/cirrus/Makefile | 11 + drivers/pinctrl/cirrus/pinctrl-cs47l35.c | 46 + drivers/pinctrl/cirrus/pinctrl-cs47l85.c | 60 + drivers/pinctrl/cirrus/pinctrl-cs47l90.c | 58 + drivers/pinctrl/cirrus/pinctrl-madera.c | 1074 +++++ drivers/pinctrl/cirrus/pinctrl-madera.h | 40 + drivers/regulator/Kconfig | 15 +- drivers/regulator/arizona-ldo1.c | 82 +- drivers/regulator/arizona-micsupp.c | 71 +- include/dt-bindings/sound/madera.h | 27 + include/linux/irqchip/irq-madera-pdata.h | 23 + include/linux/irqchip/irq-madera.h | 98 + include/linux/mfd/madera/core.h | 196 + include/linux/mfd/madera/pdata.h | 61 + include/linux/mfd/madera/registers.h | 3916 +++++++++++++++++ include/sound/madera-pdata.h | 61 + sound/soc/codecs/Kconfig | 23 + sound/soc/codecs/Makefile | 8 + sound/soc/codecs/cs47l35.c | 1671 ++++++++ sound/soc/codecs/cs47l85.c | 2677 ++++++++++++ sound/soc/codecs/cs47l90.c | 2651 ++++++++++++ sound/soc/codecs/madera.c | 4439 ++++++++++++++++++++ sound/soc/codecs/madera.h | 470 +++ 46 files changed, 26865 insertions(+), 10 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/madera.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt create mode 100644 Documentation/devicetree/bindings/sound/madera.txt create mode 100644 drivers/gpio/gpio-madera.c create mode 100644 drivers/irqchip/irq-madera.c create mode 100644 drivers/mfd/cs47l35-tables.c create mode 100644 drivers/mfd/cs47l85-tables.c create mode 100644 drivers/mfd/cs47l90-tables.c create mode 100644 drivers/mfd/madera-core.c create mode 100644 drivers/mfd/madera-i2c.c create mode 100644 drivers/mfd/madera-spi.c create mode 100644 drivers/mfd/madera.h create mode 100644 drivers/pinctrl/cirrus/Kconfig create mode 100644 drivers/pinctrl/cirrus/Makefile create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l35.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l85.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l90.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-madera.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-madera.h create mode 100644 include/dt-bindings/sound/madera.h create mode 100644 include/linux/irqchip/irq-madera-pdata.h create mode 100644 include/linux/irqchip/irq-madera.h create mode 100644 include/linux/mfd/madera/core.h create mode 100644 include/linux/mfd/madera/pdata.h create mode 100644 include/linux/mfd/madera/registers.h create mode 100644 include/sound/madera-pdata.h create mode 100644 sound/soc/codecs/cs47l35.c create mode 100644 sound/soc/codecs/cs47l85.c create mode 100644 sound/soc/codecs/cs47l90.c create mode 100644 sound/soc/codecs/madera.c create mode 100644 sound/soc/codecs/madera.h -- 2.11.0

3 19

[alsa-devel] [PATCH] sound/pci/hda: depends on instead of select for INPUT
by Randy Dunlap 15 Jan '18

15 Jan '18

From: Randy Dunlap <rdunlap(a)infradead.org> Drivers should not 'select' a subsystem. Instead they should depend on it. If the subsystem is disabled, the user probably did that for a purpose and one driver shouldn't be changing that. This also makes all sound/ drivers consistent w.r.t depending on INPUT instead of selecting it. Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org (moderated for non-subscribers) --- sound/pci/hda/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- lnx-415-rc8.orig/sound/pci/hda/Kconfig +++ lnx-415-rc8/sound/pci/hda/Kconfig @@ -87,8 +87,8 @@ config SND_HDA_PATCH_LOADER config SND_HDA_CODEC_REALTEK tristate "Build Realtek HD-audio codec support" + depends on INPUT select SND_HDA_GENERIC - select INPUT help Say Y or M here to include Realtek HD-audio codec support in snd-hda-intel driver, such as ALC880.

2 4

[alsa-devel] [PATCH] ALSA: seq: Process queue tempo/ppq change in a shot
by Takashi Iwai 15 Jan '18

15 Jan '18

The SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO ioctl sets the tempo and the ppq in a single call, while the current implementation updates each value one by one. This is a bit racy, and also suboptimal from the performance POV, as each call does re-acquire the lock and invokes the update of ALSA timer resolution. This patch reorganizes the code slightly so that we change both the tempo and the ppq in a shot. The skew value can be put into the same lock, but this is rather a rarely used feature and completely independent from the temp/ppq (it's evaluated only in the interrupt), so it's left as it was. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/seq_queue.c | 4 +--- sound/core/seq/seq_timer.c | 13 ++++++++----- sound/core/seq/seq_timer.h | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c index 79e0c5604ef8..0428e9061b47 100644 --- a/sound/core/seq/seq_queue.c +++ b/sound/core/seq/seq_queue.c @@ -497,9 +497,7 @@ int snd_seq_queue_timer_set_tempo(int queueid, int client, return -EPERM; } - result = snd_seq_timer_set_tempo(q->timer, info->tempo); - if (result >= 0) - result = snd_seq_timer_set_ppq(q->timer, info->ppq); + result = snd_seq_timer_set_tempo_ppq(q->timer, info->tempo, info->ppq); if (result >= 0 && info->skew_base > 0) result = snd_seq_timer_set_skew(q->timer, info->skew_value, info->skew_base); diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c index b80985fbc334..23167578231f 100644 --- a/sound/core/seq/seq_timer.c +++ b/sound/core/seq/seq_timer.c @@ -191,14 +191,15 @@ int snd_seq_timer_set_tempo(struct snd_seq_timer * tmr, int tempo) return 0; } -/* set current ppq */ -int snd_seq_timer_set_ppq(struct snd_seq_timer * tmr, int ppq) +/* set current tempo and ppq in a shot */ +int snd_seq_timer_set_tempo_ppq(struct snd_seq_timer *tmr, int tempo, int ppq) { + int changed; unsigned long flags; if (snd_BUG_ON(!tmr)) return -EINVAL; - if (ppq <= 0) + if (tempo <= 0 || ppq <= 0) return -EINVAL; spin_lock_irqsave(&tmr->lock, flags); if (tmr->running && (ppq != tmr->ppq)) { @@ -208,9 +209,11 @@ int snd_seq_timer_set_ppq(struct snd_seq_timer * tmr, int ppq) pr_debug("ALSA: seq: cannot change ppq of a running timer\n"); return -EBUSY; } - + changed = (tempo != tmr->tempo) || (ppq != tmr->ppq); + tmr->tempo = tempo; tmr->ppq = ppq; - snd_seq_timer_set_tick_resolution(tmr); + if (changed) + snd_seq_timer_set_tick_resolution(tmr); spin_unlock_irqrestore(&tmr->lock, flags); return 0; } diff --git a/sound/core/seq/seq_timer.h b/sound/core/seq/seq_timer.h index 9506b661fe5b..62f390671096 100644 --- a/sound/core/seq/seq_timer.h +++ b/sound/core/seq/seq_timer.h @@ -131,7 +131,7 @@ int snd_seq_timer_stop(struct snd_seq_timer *tmr); int snd_seq_timer_start(struct snd_seq_timer *tmr); int snd_seq_timer_continue(struct snd_seq_timer *tmr); int snd_seq_timer_set_tempo(struct snd_seq_timer *tmr, int tempo); -int snd_seq_timer_set_ppq(struct snd_seq_timer *tmr, int ppq); +int snd_seq_timer_set_tempo_ppq(struct snd_seq_timer *tmr, int tempo, int ppq); int snd_seq_timer_set_position_tick(struct snd_seq_timer *tmr, snd_seq_tick_time_t position); int snd_seq_timer_set_position_time(struct snd_seq_timer *tmr, snd_seq_real_time_t position); int snd_seq_timer_set_skew(struct snd_seq_timer *tmr, unsigned int skew, unsigned int base); -- 2.15.1

1 0

[alsa-devel] [PATCH 1/4] ASoC: codecs: tas5720: add basic support for TAS5722 devices
by Andrew F. Davis 15 Jan '18

15 Jan '18

From: Andreas Dannenberg <dannenberg(a)ti.com> The TI TAS5722 digital amplifier is very similar to the TAS5720 from an overall and register map perspective. Therefore the existing driver can be extended easily to support this additional device. This commit allows TAS5722 devices to be used in a "subset" type of fashion, without exposing any of the additional features they offer. Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- .../devicetree/bindings/sound/tas5720.txt | 4 ++- sound/soc/codecs/tas5720.c | 38 ++++++++++++++++++---- sound/soc/codecs/tas5720.h | 1 + 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/tas5720.txt b/Documentation/devicetree/bindings/sound/tas5720.txt index 40d94f82beb3..7481653fe8e3 100644 --- a/Documentation/devicetree/bindings/sound/tas5720.txt +++ b/Documentation/devicetree/bindings/sound/tas5720.txt @@ -6,10 +6,12 @@ audio playback. For more product information please see the links below: http://www.ti.com/product/TAS5720L http://www.ti.com/product/TAS5720M +http://www.ti.com/product/TAS5722L Required properties: -- compatible : "ti,tas5720" +- compatible : "ti,tas5720", + "ti,tas5722" - reg : I2C slave address - dvdd-supply : phandle to a 3.3-V supply for the digital circuitry - pvdd-supply : phandle to a supply used for the Class-D amp and the analog diff --git a/sound/soc/codecs/tas5720.c b/sound/soc/codecs/tas5720.c index a736a2a6976c..5def54d1336d 100644 --- a/sound/soc/codecs/tas5720.c +++ b/sound/soc/codecs/tas5720.c @@ -36,6 +36,11 @@ /* Define how often to check (and clear) the fault status register (in ms) */ #define TAS5720_FAULT_CHECK_INTERVAL 200 +enum tas572x_type { + TAS5720, + TAS5722, +}; + static const char * const tas5720_supply_names[] = { "dvdd", /* Digital power supply. Connect to 3.3-V supply. */ "pvdd", /* Class-D amp and analog power supply (connected). */ @@ -47,6 +52,7 @@ struct tas5720_data { struct snd_soc_codec *codec; struct regmap *regmap; struct i2c_client *tas5720_client; + enum tas572x_type devtype; struct regulator_bulk_data supplies[TAS5720_NUM_SUPPLIES]; struct delayed_work fault_check_work; unsigned int last_fault; @@ -264,7 +270,7 @@ static void tas5720_fault_check_work(struct work_struct *work) static int tas5720_codec_probe(struct snd_soc_codec *codec) { struct tas5720_data *tas5720 = snd_soc_codec_get_drvdata(codec); - unsigned int device_id; + unsigned int device_id, expected_device_id; int ret; tas5720->codec = codec; @@ -276,6 +282,11 @@ static int tas5720_codec_probe(struct snd_soc_codec *codec) return ret; } + /* + * Take a liberal approach to checking the device ID to allow the + * driver to be used even if the device ID does not match, however + * issue a warning if there is a mismatch. + */ ret = regmap_read(tas5720->regmap, TAS5720_DEVICE_ID_REG, &device_id); if (ret < 0) { dev_err(codec->dev, "failed to read device ID register: %d\n", @@ -283,13 +294,22 @@ static int tas5720_codec_probe(struct snd_soc_codec *codec) goto probe_fail; } - if (device_id != TAS5720_DEVICE_ID) { - dev_err(codec->dev, "wrong device ID. expected: %u read: %u\n", - TAS5720_DEVICE_ID, device_id); - ret = -ENODEV; - goto probe_fail; + switch (tas5720->devtype) { + case TAS5720: + expected_device_id = TAS5720_DEVICE_ID; + break; + case TAS5722: + expected_device_id = TAS5722_DEVICE_ID; + break; + default: + dev_err(codec->dev, "unexpected private driver data\n"); + return -EINVAL; } + if (device_id != expected_device_id) + dev_warn(codec->dev, "wrong device ID. expected: %u read: %u\n", + expected_device_id, device_id); + /* Set device to mute */ ret = snd_soc_update_bits(codec, TAS5720_DIGITAL_CTRL2_REG, TAS5720_MUTE, TAS5720_MUTE); @@ -552,6 +572,8 @@ static int tas5720_probe(struct i2c_client *client, return -ENOMEM; data->tas5720_client = client; + data->devtype = id->driver_data; + data->regmap = devm_regmap_init_i2c(client, &tas5720_regmap_config); if (IS_ERR(data->regmap)) { ret = PTR_ERR(data->regmap); @@ -592,7 +614,8 @@ static int tas5720_remove(struct i2c_client *client) } static const struct i2c_device_id tas5720_id[] = { - { "tas5720", 0 }, + { "tas5720", TAS5720 }, + { "tas5722", TAS5722 }, { } }; MODULE_DEVICE_TABLE(i2c, tas5720_id); @@ -600,6 +623,7 @@ MODULE_DEVICE_TABLE(i2c, tas5720_id); #if IS_ENABLED(CONFIG_OF) static const struct of_device_id tas5720_of_match[] = { { .compatible = "ti,tas5720", }, + { .compatible = "ti,tas5722", }, { }, }; MODULE_DEVICE_TABLE(of, tas5720_of_match); diff --git a/sound/soc/codecs/tas5720.h b/sound/soc/codecs/tas5720.h index 3d077c779b12..bef802afcc69 100644 --- a/sound/soc/codecs/tas5720.h +++ b/sound/soc/codecs/tas5720.h @@ -32,6 +32,7 @@ /* TAS5720_DEVICE_ID_REG */ #define TAS5720_DEVICE_ID 0x01 +#define TAS5722_DEVICE_ID 0x12 /* TAS5720_POWER_CTRL_REG */ #define TAS5720_DIG_CLIP_MASK GENMASK(7, 2) -- 2.15.0

2 10

[alsa-devel] ALSA device with slave clock
by Jussi Laako 15 Jan '18

15 Jan '18

Hi, I've been fighting with some devices for the case where ALSA device is a clock slave. I'm also working on some patches/quirks to make some of these things work. I have couple of questions in this domain I didn't find documented: 1) How is application supposed to use ALSA capture device when it doesn't know the sampling rate? For example with ASIO on Windows application sets sampling rate to 0 to indicate slave and then starts the device and retrieves the rate using ASIOGetSampleRate(). There are typically also reset request messages when the rate changes. 2) Some USB devices have indicator for lock status between set sampling rate and detected input rate. One such device I have is Motu 8D (UAC2 device): Simple mixer control 'Internal Clock Validity',0 Capabilities: pswitch pswitch-joined Playback channels: Mono Mono: Playback [on] As long as the status is valid, I can set sampling rate to the same, or something else. When the status becomes invalid due to rate mismatch, ALSA fails to set any of the sampling rates, even correct one and there's an error message in dmesg: "usb 3-14: clock source 1 is not valid, cannot use". So the clock source cannot be made valid again by changing sampling rate once it has become invalid, because it is currently invalid... 3) What is the correct way to deal with clock slave device from both driver and application perspective? So that application can retrieve the current sampling rate, instead of setting one... UAC2 has provisions for this, but this doesn't seem to be supported by the current driver. I have also some hardware where I would like to do the same with I2S - where clock generator is outside of the SoC and the SoC is just a slave (for example S/PDIF or AES/EBU input to a SoC where clock is generated from the input stream using PLL). Best regards, - Jussi

2 1

[alsa-devel] ASoC: How to write new (atmel) driver?
by Ladislav Michl 14 Jan '18

14 Jan '18

Hi there! I've got new at91sam9g20 board with max9867 codec (*), so I wanted to get inspiration from other drivers in sound/soc/atmel. Indeed, there are three of them: atmel_wm8904.c sam9g20_wm8731.c sam9x5_wm8731.c Now, looking at sound/soc/tegra, sound/soc/mediatek, etc. most drivers seems to be created by copy, modify (mostly find&replace), commit. There are so many of them, that it is probably impossible to fix them all (consider for example patch bellow to be done several times for different drivers) (**) So is sound/soc/generic preferred solution these days? Btw, generic drivers are calling of_node_put before they are done dealing with that node. And if above is preferred solution what about all those already created drivers? Fix them all or covert to generic one by introducing DT fixups for all those over the time created DT properties? At least for atmel drivers that seems to be doable as atmel_ssc_dai needs to be modified to get it work under generic framework and keeping old interface would needlesly complicate things - unless I miss something obvious of course :) (*) for now I wrote driver using copy&modify, but that does not seem to be the right solution anymore (**) almost two decades ago I rather wrote OSS driver for the very same reasons, but now OSS is gone... diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c index 9db08826b32a..11e2c37a2e42 100644 --- a/sound/soc/atmel/sam9x5_wm8731.c +++ b/sound/soc/atmel/sam9x5_wm8731.c @@ -78,7 +78,6 @@ static const struct snd_soc_dapm_widget sam9x5_dapm_widgets[] = { static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; - struct device_node *codec_np, *cpu_np; struct snd_soc_card *card; struct snd_soc_dai_link *dai; struct sam9x5_drvdata *priv; @@ -122,23 +121,20 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) goto out; } - codec_np = of_parse_phandle(np, "atmel,audio-codec", 0); - if (!codec_np) { + dai->codec_of_node = of_parse_phandle(np, "atmel,audio-codec", 0); + if (!dai->codec_of_node) { dev_err(&pdev->dev, "atmel,audio-codec node missing\n"); ret = -EINVAL; goto out; } - dai->codec_of_node = codec_np; - - cpu_np = of_parse_phandle(np, "atmel,ssc-controller", 0); - if (!cpu_np) { + dai->cpu_of_node = of_parse_phandle(np, "atmel,ssc-controller", 0); + if (!dai->cpu_of_node) { dev_err(&pdev->dev, "atmel,ssc-controller node missing\n"); ret = -EINVAL; - goto out; + goto out_put_codec; } - dai->cpu_of_node = cpu_np; - dai->platform_of_node = cpu_np; + dai->platform_of_node = dai->cpu_of_node; priv->ssc_id = of_alias_get_id(cpu_np, "ssc"); @@ -146,12 +142,9 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) if (ret != 0) { dev_err(&pdev->dev, "Failed to set SSC %d for audio: %d\n", ret, priv->ssc_id); - goto out; + goto out_put_cpu; } - of_node_put(codec_np); - of_node_put(cpu_np); - ret = snd_soc_register_card(card); if (ret) { dev_err(&pdev->dev, "Platform device allocation failed\n"); @@ -164,6 +157,10 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) out_put_audio: atmel_ssc_put_audio(priv->ssc_id); +out_put_cpu: + of_node_put(dai->cpu_of_node); +out_put_codec: + of_node_put(dai->codec_of_node); out: return ret; }

1 1

Re: [alsa-devel] [PATCH] ASoC: sgtl5000: fix powerup/down of micbias-voltage
by Fischer, Christian 13 Jan '18

13 Jan '18

Hi Mark, > Has your board connected the bias to the microphone widget it defines? > Unless your board says that the bias is in use on a given board it won't be enabled. Thanks for this tip! The problem is that the machine-driver mxs-sgtl5000 don't support audio-routing. I've prepared a patch that will be submitted this noon. Regards, Christian

2 3

[alsa-devel] [PATCH] ASoC: mxs-sgtl5000: add audio-routing support
by Christian Fischer 12 Jan '18

12 Jan '18

Add dapm_widgets to machine-driver (from imx-sgtl5000). If the "audio-routing"-property is present at probing the dapm-widgets getting linked to the card. Signed-off-by: Christian Fischer <fischerc(a)swissphone.de> --- .../bindings/sound/mxs-audio-sgtl5000.txt | 33 +++++++++++++++++++--- sound/soc/mxs/mxs-sgtl5000.c | 20 +++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt b/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt index 601c518..4eb980b 100644 --- a/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt @@ -1,10 +1,31 @@ * Freescale MXS audio complex with SGTL5000 codec Required properties: -- compatible: "fsl,mxs-audio-sgtl5000" -- model: The user-visible name of this sound complex -- saif-controllers: The phandle list of the MXS SAIF controller -- audio-codec: The phandle of the SGTL5000 audio codec +- compatible : "fsl,mxs-audio-sgtl5000" +- model : The user-visible name of this sound complex +- saif-controllers : The phandle list of the MXS SAIF controller +- audio-codec : The phandle of the SGTL5000 audio codec +- audio-routing : A list of the connections between audio components. + Each entry is a pair of strings, the first being the + connection's sink, the second being the connection's + source. Valid names could be power supplies, SGTL5000 + pins, and the jacks on the board: + + Power supplies: + * Mic Bias + + SGTL5000 pins: + * MIC_IN + * LINE_IN + * HP_OUT + * LINE_OUT + + Board connectors: + * Mic Jack + * Line In Jack + * Headphone Jack + * Line Out Jack + * Ext Spk Example: @@ -14,4 +35,8 @@ sound { model = "imx28-evk-sgtl5000"; saif-controllers = <&saif0 &saif1>; audio-codec = <&sgtl5000>; + audio-routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; }; diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 2ed3240..b593f76 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -93,6 +93,14 @@ static struct snd_soc_dai_link mxs_sgtl5000_dai[] = { }, }; +static const struct snd_soc_dapm_widget mxs_sgtl5000_dapm_widgets[] = { + SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_LINE("Line In Jack", NULL), + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_SPK("Line Out Jack", NULL), + SND_SOC_DAPM_SPK("Ext Spk", NULL), +}; + static struct snd_soc_card mxs_sgtl5000 = { .name = "mxs_sgtl5000", .owner = THIS_MODULE, @@ -141,6 +149,18 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) card->dev = &pdev->dev; + if (of_find_property(np, "audio-routing", NULL)) { + card->dapm_widgets = mxs_sgtl5000_dapm_widgets; + card->num_dapm_widgets = ARRAY_SIZE(mxs_sgtl5000_dapm_widgets); + + ret = snd_soc_of_parse_audio_routing(card, "audio-routing"); + if (ret) { + dev_err(&pdev->dev, "failed to parse audio-routing (%d)\n", + ret); + return ret; + } + } + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", -- 2.7.4

2 1

[alsa-devel] [PATCH v4] ASoC: Intel - Convert to use acpi_dev_get_first_match_name()
by Andy Shevchenko 12 Jan '18

12 Jan '18

Instead of home grown snd_soc_acpi_find_name_from_hid() use acpi_dev_get_first_match_name(). Tested-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- - rebase on top of topic/intel branch of ASoC tree; The patch has dependency on Pierre's "ASoC: Intel: bytcht_es8316: fix HID handling" submitted earlier and pushed AFAICS to sound.git/topic/intel. include/sound/soc-acpi.h | 7 ------- sound/soc/intel/boards/bytcht_da7213.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/soc-acpi.c | 33 --------------------------------- 8 files changed, 6 insertions(+), 46 deletions(-) diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index 83320af8def2..082224275f52 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -31,16 +31,9 @@ struct snd_soc_acpi_package_context { #define SND_ACPI_I2C_ID_LEN (4 + ACPI_ID_LEN + 3 + 1) #if IS_ENABLED(CONFIG_ACPI) -/* translation fron HID to I2C name, needed for DAI codec_name */ -const char *snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]); bool snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN], struct snd_soc_acpi_package_context *ctx); #else -static inline const char * -snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]) -{ - return NULL; -} static inline bool snd_soc_acpi_find_package_from_hid(const u8 hid[ACPI_ID_LEN], struct snd_soc_acpi_package_context *ctx) diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c index 6219c04d4731..2179dedb28ad 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -243,7 +243,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev) } /* fixup codec name based on HID */ - i2c_name = snd_soc_acpi_find_name_from_hid(mach->id); + i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); if (i2c_name) { snprintf(codec_name, sizeof(codec_name), "%s%s", "i2c-", i2c_name); diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 079f35cd4eaf..305e7f4fe55a 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -258,7 +258,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) } /* fixup codec name based on HID */ - i2c_name = snd_soc_acpi_find_name_from_hid(mach->id); + i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); if (i2c_name) { snprintf(codec_name, sizeof(codec_name), "%s%s", "i2c-", i2c_name); diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 4548f75498d0..b6a1cfeec830 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -762,7 +762,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) } /* fixup codec name based on HID */ - i2c_name = snd_soc_acpi_find_name_from_hid(mach->id); + i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); if (i2c_name) { snprintf(byt_rt5640_codec_name, sizeof(byt_rt5640_codec_name), "%s%s", "i2c-", i2c_name); diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 5a6b7dedb773..456526a93dd5 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -539,7 +539,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) } /* fixup codec name based on HID */ - i2c_name = snd_soc_acpi_find_name_from_hid(mach->id); + i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); if (i2c_name) { snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name), "%s%s", "i2c-", i2c_name); diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index cef6a8c31c8d..976ea6bf9539 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -566,7 +566,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) } /* fixup codec name based on HID */ - i2c_name = snd_soc_acpi_find_name_from_hid(mach->id); + i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); if (i2c_name) { snprintf(cht_rt5645_codec_name, sizeof(cht_rt5645_codec_name), "%s%s", "i2c-", i2c_name); diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index 1f3d38dc4fcb..c14a52d2f714 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -396,7 +396,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) /* fixup codec name based on HID */ if (mach) { - i2c_name = snd_soc_acpi_find_name_from_hid(mach->id); + i2c_name = acpi_dev_get_first_match_name(mach->id, NULL, -1); if (i2c_name) { snprintf(drv->codec_name, sizeof(drv->codec_name), "i2c-%s", i2c_name); diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index 7f43c9bf3d09..3d7e1ff79139 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -16,39 +16,6 @@ #include <sound/soc-acpi.h> -static acpi_status snd_soc_acpi_find_name(acpi_handle handle, u32 level, - void *context, void **ret) -{ - struct acpi_device *adev; - const char *name = NULL; - - if (acpi_bus_get_device(handle, &adev)) - return AE_OK; - - if (adev->status.present && adev->status.functional) { - name = acpi_dev_name(adev); - *(const char **)ret = name; - return AE_CTRL_TERMINATE; - } - - return AE_OK; -} - -const char *snd_soc_acpi_find_name_from_hid(const u8 hid[ACPI_ID_LEN]) -{ - const char *name = NULL; - acpi_status status; - - status = acpi_get_devices(hid, snd_soc_acpi_find_name, NULL, - (void **)&name); - - if (ACPI_FAILURE(status) || name[0] == '\0') - return NULL; - - return name; -} -EXPORT_SYMBOL_GPL(snd_soc_acpi_find_name_from_hid); - struct snd_soc_acpi_mach * snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) { -- 2.15.1

2 1

[alsa-devel] [PATCH 0/3] ASoC: Intel: ACPI-related fixes
by Pierre-Louis Bossart 12 Jan '18

12 Jan '18

Here are 3 patches that were provided earlier on the mailing list or in Bugzilla entries, I rebased and ported them on top of the latest ACPI/KConfig fixes. Jeremy Cline (1): ASoC: Replace snd_soc_acpi_check_hid with acpi_dev_present Pierre-Louis Bossart (2): ASoC: acpi: fix machine driver selection based on quirk ASoC: Intel: bytcht_es8316: fix HID handling include/sound/soc-acpi.h | 3 --- sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/bytcht_es8316.c | 26 ++++++++++++++++++++++- sound/soc/soc-acpi.c | 38 ++++------------------------------ 4 files changed, 30 insertions(+), 38 deletions(-) -- 2.14.1

3 13

[alsa-devel] [PATCH v3 0/2] ASoC: Intel: ACPI-related fixes
by Pierre-Louis Bossart 12 Jan '18

12 Jan '18

The first two patches in the v2 series were merged, but these last two were not. As agreed with Andy and Vinod, there will be a follow-up patch to replace snd_soc_acpi_find_name_from_hid() with acpi_dev_get_dev_name(), as well as the introduction of a helper for the search loops. Changes since v2: rename constant per Vinod's suggestion removed redundant comment on name Changes since v1: cleaned-up quirk handling, fixed merge mistake added Andy's Reviewed-by tag on patch 2 added 4th patch to add new constant dependent on ACPI_ID_LEN Pierre-Louis Bossart (2): ASoC: Intel: bytcht_es8316: fix HID handling ASoC: acpi: remove hard-coded i2c-device name length include/sound/soc-acpi.h | 3 +++ sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/bytcht_da7213.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 26 +++++++++++++++++++++++++- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 4 ++-- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- 8 files changed, 35 insertions(+), 7 deletions(-) -- 2.14.1

4 7

[alsa-devel] [PATCH] ASoC: cs42l73: Remove trailing semicolon
by Luis de Bethencourt 12 Jan '18

12 Jan '18

The trailing semicolon is an empty statement that does no operation. Removing it since it doesn't do anything. Signed-off-by: Luis de Bethencourt <luisbg(a)kernel.org> --- Hi, After fixing the same thing in drivers/staging/rtl8723bs/, Joe Perches suggested I fix it treewide [0]. Best regards Luis [0] http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2018-Janu… [1] http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2018-Janu… sound/soc/codecs/cs42l73.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index dde37e569ade..aebaa97490b6 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1355,7 +1355,7 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client, ret = regmap_read(cs42l73->regmap, CS42L73_REVID, &reg); if (ret < 0) { dev_err(&i2c_client->dev, "Get Revision ID failed\n"); - return ret;; + return ret; } dev_info(&i2c_client->dev, -- 2.15.1

2 1

[alsa-devel] [PATCH v3 0/3] ACPI, ASoC, gpio: Add and use acpi_dev_get_first_match_name()
by Andy Shevchenko 12 Jan '18

12 Jan '18

It appears that at least one current user (patch 3) and upcoming one (patch 2) need to get device name by ACPI HID. Here we introduce acpi_dev_get_first_match_name() based on code done for acpi_dev_present() and reuse it where appropriate. The series has been tested on Intel Edison with non-ACPI and ACPI enabled versions of U-Boot, while patches 1 and 3 were tested by Pierre. Since patch 1 and cross subsystem nature of the series I think the best way is to push this (patches 1 and 2) via Rafael's linux-pm tree. Taking into consideration that patch 3 requires not-yet-applied work from Pierre, I left it for reference, in particular to show the LOC statistics. Changelog v3: - add Pierre's tag (I dared to do this for both patches 1 and 3) - address comment about function name (patch 1) - add a reference to the first user (patch 1) - consolidate pin control device possible names in one place (patch 2) - rebase ASoC patch on not-yet-applied series from Pierre (patch 3), and - thus reordered to make it last in the series (patch 3) Andy Shevchenko (3): ACPI / utils: Introduce acpi_dev_get_first_match_name() gpio: merrifield: Add support of ACPI enabled platforms ASoC: Intel - Convert to use acpi_dev_get_first_match_name() drivers/acpi/utils.c | 41 +++++++++++++++++++++++++++------ drivers/gpio/gpio-merrifield.c | 11 ++++++++- include/acpi/acpi_bus.h | 3 +++ include/linux/acpi.h | 6 +++++ include/sound/soc-acpi.h | 7 ------ sound/soc/intel/boards/bytcht_da7213.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- sound/soc/soc-acpi.c | 33 -------------------------- 12 files changed, 59 insertions(+), 54 deletions(-) -- 2.15.1

7 21

[alsa-devel] [GIT PULL] ASoC updates for v4.16
by Mark Brown 12 Jan '18

12 Jan '18

The following changes since commit ba6c29592545635f7c476cbef0db0c4f39495f23: ASoC: TSCS42xx: Add support for Tempo Semiconductor's TSCS42xx audio CODEC (2018-01-05 12:37:41 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.16-2 for you to fetch changes up to 4ac71d1b68365915bcde14d0ff8fda186ad377ac: Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8997' and 'asoc/topic/wm8998' into asoc-next (2018-01-12 12:29:46 +0000) ---------------------------------------------------------------- ASoC: Updates for v4.16 Some more updates for v4.16, the big things here are the ST DFSDM driver and the IIO patches required to support that and even more in the neverending series of code quality improvements for x86, including Pierre's work to improve the Kconfig. The unused SN95031 driver and associated board support are also removed, they haven't been buildable for a considerable time without anyone noticing. ---------------------------------------------------------------- Aaron Ma (1): Input: elantech - add new icbody type 15 Al Viro (2): sget(): handle failures of register_shrinker() fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'" Alejandro Mery (3): ARM: davinci: Use platform_device_register_full() to create pdev for dm365's eDMA ARM: davinci: Add dma_mask to dm365's eDMA device ARM: davinci: fix mmc entries in dm365's dma_slave_map Alexey Brodkin (2): ARC: Fix detection of dual-issue enabled ARC: [plat-hsdk] Switch DisplayLink driver from fbdev to DRM Aliaksei Karaliou (2): xfs: quota: fix missed destroy of qi_tree_lock xfs: quota: check result of register_shrinker() Andrea Arcangeli (1): userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails Andrew Morton (1): kernel/exit.c: export abort() to modules Andrey Ryabinin (1): x86/mm: Set MODULES_END to 0xffffffffff000000 Anshuman Khandual (1): mm/mprotect: add a cond_resched() inside change_pmd_range() Anthony Kim (1): Input: hideep - fix compile error due to missing include file Antoine Tenart (3): crypto: inside-secure - free requests even if their handling failed crypto: inside-secure - fix request allocations in invalidation path crypto: inside-secure - do not use areq->result for partial results Ard Biesheuvel (1): efi/capsule-loader: Reinstate virtual capsule mapping Arnaud Pouliquen (12): docs: driver-api: add iio hw consumer section IIO: hw_consumer: add devm_iio_hw_consumer_alloc IIO: inkern: API for manipulating channel attributes IIO: Add DT bindings for sigma delta adc modulator IIO: ADC: add sigma delta modulator support IIO: add DT bindings for stm32 DFSDM filter IIO: ADC: add stm32 DFSDM core support IIO: ADC: add STM32 DFSDM sigma delta ADC support IIO: ADC: add stm32 DFSDM support for PDM microphone IIO: consumer: allow to set buffer sizes ASoC: add bindings for stm32 DFSDM filter ASoC: stm32: add DFSDM DAI support Arnd Bergmann (13): Merge tag 'v4.15-rockchip-dts32fixes-1' of ssh://gitolite.kernel.org/.../mmind/linux-rockchip into fixes Merge tag 'v4.15-rockchip-dts64fixes-1' of ssh://gitolite.kernel.org/.../mmind/linux-rockchip into fixes Merge tag 'at91-ab-4.15-dt-fixes' of ssh://gitolite.kernel.org/.../abelloni/linux into fixes Merge tag 'davinci-fixes-for-v4.15' of ssh://gitolite.kernel.org/.../nsekhar/linux-davinci into fixes ARM: dts: ls1021a: fix incorrect clock references ARM: dts: tango4: remove bogus interrupt-controller property crypto: chelsio - select CRYPTO_GF128MUL Merge tag 'renesas-fixes-for-v4.15' of ssh://gitolite.kernel.org/.../horms/renesas into fixes Merge tag 'sunxi-fixes-for-4.15' of ssh://gitolite.kernel.org/.../sunxi/linux into fixes ASoC: ux500: add MODULE_LICENSE tag ASoC: stm32: select IIO_BUFFER IIO: ADC: stm32-dfsdm: avoid unused-variable warning IIO: ADC: stm32-dfsdm: avoid unused-variable warning Baoquan He (1): mm/sparse.c: wrong allocation for mem_section Bard Liao (1): ASoC: mt8173: remove unnecessary micbias widget in route Bogdan Mirea (2): arm64: dts: renesas: salvator-x: Remove renesas, no-ether-link property arm64: dts: renesas: ulcb: Remove renesas, no-ether-link property Boris Brezillon (1): mtd: nand: pxa3xx: Fix READOOB implementation Chen-Yu Tsai (1): ARM: dts: sunxi: Convert to CCU index macros for HDMI controller Chris Mason (1): btrfs: fix refcount_t usage when deleting btrfs_delayed_nodes Christian Borntraeger (2): KVM: s390: fix cmma migration for multiple memory slots KVM: s390: prevent buffer overrun on memory hotplug during migration Christophe JAILLET (2): ASoC: Intel: sst: Fix the return value of 'sst_send_byte_stream_mrfld()' ASoC: Intel: sst: Fix some style Colin Ian King (1): ASoC: TSCS42xx: make functions pll_event and dac_event static Dan Carpenter (1): afs: Potential uninitialized variable in afs_extract_data() Darrick J. Wong (1): xfs: fix s_maxbytes overflow problems Dave Airlie (4): Merge tag 'omapdrm-4.15-fixes' of git://git.kernel.org/.../tomba/linux into drm-fixes Merge branch 'drm-armada-fixes-4.15' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-fixes Merge branch 'drm-fixes-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'drm-intel-fixes-2018-01-04' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Dave Young (2): x86/efi: Fix kernel param add_efi_memmap regression mm: check pfn_valid first in zero_resv_unavail David Howells (3): fscache: Fix the default for fscache_maybe_release_page() afs: Fix unlink afs: Fix missing error handling in afs_write_end() David Lechner (1): ARM: dts: da850-lego-ev3: Fix battery voltage gpio David Woodhouse (1): x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm Dhinakaran Pandiyan (1): drm/i915/psr: Fix register name mess up. Dmitry Torokhov (1): Input: elants_i2c - do not clobber interrupt trigger on x86 Eric Biggers (3): crypto: chacha20poly1305 - validate the digest size crypto: pcrypt - fix freeing pcrypt instances capabilities: fix buffer overread on very short xattr Eric W. Biederman (1): pid: Handle failure to allocate the first pid in a pid namespace Eugeniy Paltsev (4): ARC: [plat-hsdk]: Set initial core pll output frequency ARC: [plat-hsdk]: Get rid of core pll frequency set in platform code ARC: [plat-axs103]: Set initial core pll output frequency ARC: [plat-axs103] refactor the quad core DT quirk code Guenter Roeck (1): ASoC: fsl_ssi: Fix build error Hans Verkuil (1): omapdrm/dss/hdmi4_cec: fix interrupt handling Heiko Carstens (1): s390/sclp: disable FORTIFY_SOURCE for early sclp code Heiko Stuebner (3): ARM: dts: rockchip: add cpu0-regulator on rk3066a-marsboard arm64: dts: rockchip: fix trailing 0 in rk3328 tsadc interrupts arm64: dts: rockchip: limit rk3328-rock64 gmac speed to 100MBit for now Helge Deller (6): parisc: Show unhashed hardware inventory parisc: Show initial kernel memory layout unhashed parisc: Show unhashed HPA of Dino chip parisc: Show unhashed EISA EEPROM address parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel parisc: qemu idle sleep support Icenowy Zheng (1): arm64: allwinner: a64: add Ethernet PHY regulator for several boards Jacek Anaszewski (1): leds: core: Fix regression caused by commit 2b83ff96f51d Jagan Teki (1): arm64: allwinner: a64-sopine: Fix to use dcdc1 regulator instead of vcc3v3 James Hogan (1): lib/mpi: Fix umul_ppmm() for MIPS64r6 Jan Engelhardt (1): crypto: n2 - cure use after free Javier Martinez Canillas (1): ARM: dts: exynos: Enable Mixer node for Exynos5800 Peach Pi machine Jean-Philippe Brucker (1): iommu/arm-smmu-v3: Don't free page table ops twice Jeffy Chen (1): mailmap: update Mark Yao's email address Jeremy Cline (1): ASoC: Replace snd_soc_acpi_check_hid with acpi_dev_present Jim Mattson (1): kvm: vmx: Scrub hardware GPRs at VM-exit Joel Stanley (1): ARM: dts: aspeed-g4: Correct VUART IRQ number John Johansen (1): apparmor: fix regression in mount mediation when feature set is pinned John Keeping (1): ASoC: rockchip: i2s: fix playback after runtime resume John Sperbeck (1): powerpc/mm: Fix SEGV on mapped region to return SEGV_ACCERR Jonathan Cameron (1): crypto: af_alg - Fix race around ctx->rcvused by making it atomic_t Josh Poimboeuf (2): x86/dumpstack: Fix partial register dumps x86/dumpstack: Print registers for first stack frame Kees Cook (1): exec: Weaken dumpability for secureexec Keyon Jie (1): ASoC: Intel: bytcr-rt5651: add quirk for IN3P which may also be used Klaus Goger (1): arm64: dts: rockchip: remove vdd_log from rk3399-puma Lars-Peter Clausen (1): iio: Add hardware consumer buffer support Linus Torvalds (26): Merge branch 'for-linus' of git://git.kernel.org/.../jmorris/linux-security Merge branch 'afs-fixes' of git://git.kernel.org/.../dhowells/linux-fs Merge branch 'for-linus' of git://git.kernel.org/.../ebiederm/user-namespace Merge branch 'x86-pti-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'armsoc-fixes' of git://git.kernel.org/.../arm/arm-soc Merge tag 'drm-fixes-for-v4.15-rc7' of git://people.freedesktop.org/~airlied/linux Merge branch 'akpm' (patches from Andrew) Merge branch 'linus' of git://git.kernel.org/.../herbert/crypto-2.6 Merge tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/.../xen/tip Merge branch 'for-linus' of git://git.kernel.org/.../s390/linux Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-pti-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'mfd-fixes-4.15-1' of git://git.kernel.org/.../lee/mfd Merge tag 'xfs-4.15-fixes-10' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux Merge tag 'for-4.15-rc7-tag' of git://git.kernel.org/.../kdave/linux Merge tag 'arc-4.15-rc7' of git://git.kernel.org/.../vgupta/arc Merge tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge tag 'powerpc-4.15-6' of git://git.kernel.org/.../powerpc/linux Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs Merge tag 'for-linus-20180107' of git://git.infradead.org/linux-mtd Merge tag 'led_fixes_for_4.15-rc7' of git://git.kernel.org/.../j.anaszewski/linux-leds Merge tag 'apparmor-pr-2018-01-07' of git://git.kernel.org/.../jj/linux-apparmor Merge branch 'parisc-4.15-3' of git://git.kernel.org/.../deller/parisc-linux Linux 4.15-rc7 Lucas De Marchi (1): drm/i915: Apply Display WA #1183 on skl, kbl, and cfl Mark Brown (29): Merge branch 'fix/intel' of https://git.kernel.org/.../broonie/sound into asoc-intel Merge branch 'topic/iio' of https://git.kernel.org/.../broonie/sound into asoc-st-dfsdm Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus Merge remote-tracking branch 'asoc/fix/mtk' into asoc-linus Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/intel' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm186x' into asoc-next Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/amd', 'asoc/topic/atmel', 'asoc/topic/codecs' and 'asoc/topic/compress' into asoc-next Merge remote-tracking branches 'asoc/topic/cq93vc', 'asoc/topic/cs35l32', 'asoc/topic/cs35l34' and 'asoc/topic/cs42l52' into asoc-next Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42l73', 'asoc/topic/cs47l24', 'asoc/topic/cx20442' and 'asoc/topic/da7213' into asoc-next Merge remote-tracking branches 'asoc/topic/da7218', 'asoc/topic/dai-drv', 'asoc/topic/davinci', 'asoc/topic/disconnect' and 'asoc/topic/ep93xx' into asoc-next Merge remote-tracking branches 'asoc/topic/eukrea-tlv320', 'asoc/topic/fsl', 'asoc/topic/fsl-ssi' and 'asoc/topic/fsl_asrc' into asoc-next Merge remote-tracking branches 'asoc/topic/hdac_hdmi', 'asoc/topic/hisilicon', 'asoc/topic/iio' and 'asoc/topic/max98373' into asoc-next Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/max98927', 'asoc/topic/mc13783', 'asoc/topic/msm8916' and 'asoc/topic/mt8173' into asoc-next Merge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/nau8540', 'asoc/topic/nau8824', 'asoc/topic/nau8825' and 'asoc/topic/nuc900' into asoc-next Merge remote-tracking branch 'asoc/topic/rl6231' into asoc-next Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5645', 'asoc/topic/samsung' and 'asoc/topic/si476x' into asoc-next Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spdif', 'asoc/topic/st-dfsdm', 'asoc/topic/stm32' and 'asoc/topic/sun4i-i2s' into asoc-next Merge remote-tracking branches 'asoc/topic/sunxi', 'asoc/topic/symmetry', 'asoc/topic/tas5720', 'asoc/topic/tas6424' and 'asoc/topic/tfa9879' into asoc-next Merge remote-tracking branches 'asoc/topic/tlv320aic31xx', 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/tlv320dac33' and 'asoc/topic/ts3a227e' into asoc-next Merge remote-tracking branches 'asoc/topic/tscs42xx', 'asoc/topic/twl4030', 'asoc/topic/twl6040' and 'asoc/topic/uda1380' into asoc-next Merge remote-tracking branches 'asoc/topic/uniphier', 'asoc/topic/utils', 'asoc/topic/ux500', 'asoc/topic/wm0010' and 'asoc/topic/wm2000' into asoc-next Merge remote-tracking branches 'asoc/topic/wm5102', 'asoc/topic/wm5110', 'asoc/topic/wm8350', 'asoc/topic/wm8400' and 'asoc/topic/wm8903' into asoc-next Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8997' and 'asoc/topic/wm8998' into asoc-next Markus Heiser (1): docs: fix, intel_guc_loader.c has been moved to intel_guc_fw.c Martin Schwidefsky (1): s390: fix preemption race in disable_sacf_uaccess Masahiro Yamada (1): arm64: dts: uniphier: fix gpio-ranges property of PXs3 SoC Matt Fleming (1): MAINTAINERS: Remove Matt Fleming as EFI co-maintainer Matthew Wilcox (1): mm/debug.c: provide useful debugging information for VM_BUG Matthias Kaehlcke (2): ASoC: rockchip: i2s: Support mono capture ASoC: codecs: dmic: Make number of channels configurable Maxime Ripard (1): ARM: dts: sun8i: a711: Reinstate the PMIC compatible Nick Desaulniers (1): x86/process: Define cpu_tss_rw in same section as declaration Nikolay Borisov (1): btrfs: Fix flush bio leak Ofer Heifetz (1): crypto: inside-secure - per request invalidation Oleg Nesterov (1): kernel/acct.c: fix the acct->needcheck check in check_free_space() Oleksandr Andrushchenko (1): Input: xen-kbdfront - do not advertise multi-touch pressure support Olof Johansson (1): Input: joystick/analog - riscv has get_cycles() Peter Rosin (1): ARM: dts: at91: disable the nxp,se97b SMBUS timeout on the TSE-850 Peter Zijlstra (1): x86/events/intel/ds: Use the proper cache flush method for mapping ds buffers Pierre-Louis Bossart (13): ASoC: acpi: fix machine driver selection based on quirk ASoC: acpi: add missing includes for non-ACPI platforms ASoC: Intel: bytcr_rt5651: fix Kiano DMI quirk ASoC: Intel: bytcr-rt5651: enable MinnowBoard Turbot quirks ASoC: Intel: bytcr-rt5651: add support for Line In ASoC: Intel: Fix Kconfig with top-level selector ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI dependencies ASoC: Intel: document what Kconfig options do ASoC: Intel: Fix nested/unnecessary Kconfig dependencies ASoC: Intel: boards: align Kconfig dependencies for Haswell/Broadwell ASoC: Intel: boards: align Kconfig configurations for HiFi2 ASoC: Intel: boards: align/fix SKL/BXT/KBL Kconfigs ASoC: rt5645: add fallback case for jack detection support Radim Krčmář (1): Merge tag 'kvm-s390-master-4.15-2' of git://git.kernel.org/.../kvms390/linux Randy Dunlap (1): documentation/gpu/i915: fix docs build error after file rename Rob Herring (1): ARM: dts: rockchip: fix rk3288 iep-IOMMU interrupts property cells Robin Murphy (1): iommu/arm-smmu-v3: Cope with duplicated Stream IDs Russell King (5): drm/armada: fix leak of crtc structure drm/armada: fix SRAM powerdown drm/armada: fix UV swap code drm/armada: improve efficiency of armada_drm_plane_calc_addrs() drm/armada: fix YUV planar format framebuffer offsets Ryan Lee (3): ASoC: max98373: Added missing blank lines ASoC: max98373: Added TDM off if parameters are all zeroes ASoC: max98373: Modified control names for TLV controls Sebastian Ott (1): s390/pci: handle insufficient resources during dma tlb flush Sergey Matyukevich (1): arm64: dts: orange-pi-zero-plus2: fix sdcard detect Sergey Senozhatsky (2): arc: do not use __print_symbol() mm/zsmalloc.c: include fs.h Sinan Kaya (1): mfd: rtsx: Release IRQ during shutdown Stefan Brüns (1): sunxi-rsb: Include OF based modalias in device uevent Stefan Haberland (1): s390/dasd: fix wrongly assigned configuration data Steven Eckhoff (1): ASoC: TSCS42xx: Fix control names Tetsuo Handa (1): mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed. Thomas Gleixner (7): x86/pti: Enable PTI by default x86/pti: Make sure the user/kernel PTEs match x86/pti: Switch to kernel CR3 at early in entry_SYSCALL_compat() x86/mm: Map cpu_entry_area at the same place on 4/5 level x86/kaslr: Fix the vaddr_end mess x86/tlb: Drop the _GPL from the cpu_tlbstate export x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN Tom Lendacky (1): x86/cpu, x86/pti: Do not enable PTI on AMD processors Ville Syrjälä (2): drm/i915: Disable DC states around GMBUS on GLK drm/i915: Put all non-blocking modesets onto an ordered wq Vineet Gupta (3): ARC: uaccess: dont use "l" gcc inline asm constraint modifier ARC: handle gcc generated __builtin_trap() ARC: handle gcc generated __builtin_trap for older compiler Vinod Koul (4): ASoC: Intel: kconfig: add some comments for if symbols ASoC: Intel: kconfig: drop boiler plate text from config items ASoC: Intel: remove mfld_machine ASoC: sn95031: remove this code Wei Yongjun (4): xen/pvcalls: use GFP_ATOMIC under spin lock ASoC: mediatek: mt2701: fix return value check in mt2701_afe_pcm_dev_probe() ASoC: stm32: fix a typo in stm32_adfsdm_probe() IIO: ADC: fix return value check in stm32_dfsdm_adc_probe() Xiongwei Song (1): drm/ttm: check the return value of kzalloc Yue Hin Lau (1): drm/amd/display: call set csc_default if enable adjustment is false Zhen Lei (1): Input: ims-pcu - fix typo in the error message kbuild test robot (1): IIO: ADC: stm32_dfsdm_stop_filter() can be static .mailmap | 1 + .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 16 + Documentation/admin-guide/kernel-parameters.rst | 1 + Documentation/admin-guide/kernel-parameters.txt | 18 +- Documentation/admin-guide/thunderbolt.rst | 2 +- Documentation/arm64/silicon-errata.txt | 1 + Documentation/cgroup-v2.txt | 7 + Documentation/core-api/genericirq.rst | 16 +- Documentation/devicetree/bindings/arm/ccn.txt | 2 +- .../devicetree/bindings/arm/omap/crossbar.txt | 2 +- .../bindings/arm/tegra/nvidia,tegra20-mc.txt | 2 +- .../devicetree/bindings/clock/axi-clkgen.txt | 2 +- .../bindings/clock/brcm,bcm2835-aux-clock.txt | 2 +- .../devicetree/bindings/clock/exynos4-clock.txt | 2 +- .../devicetree/bindings/clock/exynos5250-clock.txt | 2 +- .../devicetree/bindings/clock/exynos5410-clock.txt | 2 +- .../devicetree/bindings/clock/exynos5420-clock.txt | 2 +- .../devicetree/bindings/clock/exynos5440-clock.txt | 2 +- .../bindings/clock/ti-keystone-pllctrl.txt | 2 +- .../devicetree/bindings/clock/zx296702-clk.txt | 4 +- .../devicetree/bindings/crypto/fsl-sec4.txt | 4 +- .../bindings/devfreq/event/rockchip-dfi.txt | 2 +- .../devicetree/bindings/display/atmel,lcdc.txt | 4 +- .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 +- Documentation/devicetree/bindings/dma/zxdma.txt | 2 +- Documentation/devicetree/bindings/eeprom/at25.txt | 13 +- .../devicetree/bindings/gpio/gpio-altera.txt | 2 +- .../devicetree/bindings/gpio/gpio-pca953x.txt | 2 +- Documentation/devicetree/bindings/hwmon/jc42.txt | 4 + .../devicetree/bindings/i2c/i2c-jz4780.txt | 2 +- .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 128 ++ .../devicetree/bindings/iio/pressure/hp03.txt | 2 +- .../bindings/input/touchscreen/bu21013.txt | 2 +- .../bindings/interrupt-controller/arm,gic.txt | 4 +- .../interrupt-controller/img,meta-intc.txt | 2 +- .../bindings/interrupt-controller/img,pdc-intc.txt | 2 +- .../interrupt-controller/st,spear3xx-shirq.txt | 2 +- .../devicetree/bindings/mailbox/altera-mailbox.txt | 6 +- .../bindings/mailbox/brcm,iproc-pdc-mbox.txt | 2 +- .../devicetree/bindings/media/exynos5-gsc.txt | 2 +- .../devicetree/bindings/media/mediatek-vcodec.txt | 2 +- .../devicetree/bindings/media/rcar_vin.txt | 2 +- .../devicetree/bindings/media/samsung-fimc.txt | 2 +- .../devicetree/bindings/media/sh_mobile_ceu.txt | 2 +- .../devicetree/bindings/media/video-interfaces.txt | 10 +- .../bindings/memory-controllers/ti/emif.txt | 2 +- .../bindings/mfd/ti-keystone-devctrl.txt | 2 +- .../devicetree/bindings/misc/brcm,kona-smc.txt | 2 +- .../devicetree/bindings/mmc/brcm,kona-sdhci.txt | 2 +- .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 2 +- .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 4 +- Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 6 +- .../devicetree/bindings/mtd/jedec,spi-nor.txt | 2 - Documentation/devicetree/bindings/mtd/mtk-nand.txt | 2 +- .../devicetree/bindings/net/altera_tse.txt | 4 +- Documentation/devicetree/bindings/net/mdio.txt | 2 +- .../devicetree/bindings/net/socfpga-dwmac.txt | 2 +- Documentation/devicetree/bindings/nios2/nios2.txt | 2 +- .../devicetree/bindings/pci/altera-pcie.txt | 2 +- .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 2 +- .../devicetree/bindings/pci/hisilicon-pcie.txt | 2 +- .../devicetree/bindings/phy/sun4i-usb-phy.txt | 2 +- .../bindings/pinctrl/brcm,cygnus-pinmux.txt | 2 +- .../devicetree/bindings/pinctrl/pinctrl-atlas7.txt | 4 +- .../devicetree/bindings/pinctrl/pinctrl-sirf.txt | 2 +- .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +- .../devicetree/bindings/regulator/regulator.txt | 2 +- .../devicetree/bindings/serial/efm32-uart.txt | 2 +- .../bindings/serio/allwinner,sun4i-ps2.txt | 2 +- .../bindings/soc/ti/keystone-navigator-qmss.txt | 2 +- .../devicetree/bindings/sound/adi,axi-i2s.txt | 2 +- .../devicetree/bindings/sound/adi,axi-spdif-tx.txt | 2 +- Documentation/devicetree/bindings/sound/ak4613.txt | 2 +- Documentation/devicetree/bindings/sound/ak4642.txt | 2 +- Documentation/devicetree/bindings/sound/da7218.txt | 2 +- Documentation/devicetree/bindings/sound/da7219.txt | 2 +- Documentation/devicetree/bindings/sound/dmic.txt | 2 + .../devicetree/bindings/sound/max98371.txt | 2 +- .../devicetree/bindings/sound/max98373.txt | 40 + .../devicetree/bindings/sound/max9867.txt | 2 +- .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 266 ++-- .../devicetree/bindings/sound/nau8825.txt | 4 +- .../devicetree/bindings/sound/pcm186x.txt | 42 + .../devicetree/bindings/sound/renesas,fsi.txt | 2 +- .../devicetree/bindings/sound/renesas,rsnd.txt | 15 +- .../devicetree/bindings/sound/rockchip-spdif.txt | 2 +- .../devicetree/bindings/sound/simple-card.txt | 3 + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 8 +- .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 + .../devicetree/bindings/sound/st,stm32-sai.txt | 12 +- .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + .../devicetree/bindings/sound/tas5720.txt | 4 +- .../devicetree/bindings/sound/tfa9879.txt | 8 +- .../devicetree/bindings/sound/ti,tas6424.txt | 20 + .../devicetree/bindings/sound/tlv320aic31xx.txt | 9 +- .../devicetree/bindings/sound/tlv320aic3x.txt | 10 +- .../devicetree/bindings/sound/uniphier,evea.txt | 26 + .../devicetree/bindings/spi/efm32-spi.txt | 2 +- .../devicetree/bindings/spi/fsl-imx-cspi.txt | 18 +- .../devicetree/bindings/thermal/thermal.txt | 12 +- Documentation/devicetree/bindings/ufs/ufs-qcom.txt | 4 +- .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 2 +- .../devicetree/bindings/usb/am33xx-usb.txt | 2 + Documentation/devicetree/bindings/usb/ehci-st.txt | 2 +- Documentation/devicetree/bindings/usb/ohci-st.txt | 2 +- .../bindings/watchdog/ingenic,jz4740-wdt.txt | 2 +- Documentation/driver-api/dmaengine/client.rst | 2 +- Documentation/driver-api/iio/hw-consumer.rst | 51 + Documentation/driver-api/iio/index.rst | 1 + Documentation/driver-api/pci.rst | 3 - Documentation/filesystems/overlayfs.txt | 34 + Documentation/gpu/i915.rst | 5 +- Documentation/locking/crossrelease.txt | 874 ------------ Documentation/media/dvb-drivers/frontends.rst | 30 + Documentation/media/dvb-drivers/index.rst | 1 + Documentation/printk-formats.txt | 31 +- Documentation/scsi/scsi_mid_low_api.txt | 6 +- Documentation/sysctl/vm.txt | 7 - Documentation/virtual/kvm/api.txt | 15 +- Documentation/vm/zswap.txt | 22 +- Documentation/x86/x86_64/mm.txt | 37 +- MAINTAINERS | 75 +- Makefile | 5 +- arch/alpha/include/uapi/asm/Kbuild | 2 + arch/arc/boot/dts/axc003.dtsi | 8 + arch/arc/boot/dts/axc003_idu.dtsi | 8 + arch/arc/boot/dts/hsdk.dts | 8 + arch/arc/configs/hsdk_defconfig | 5 +- arch/arc/include/asm/uaccess.h | 5 +- arch/arc/include/uapi/asm/Kbuild | 1 + arch/arc/kernel/setup.c | 2 +- arch/arc/kernel/stacktrace.c | 2 +- arch/arc/kernel/traps.c | 14 + arch/arc/kernel/troubleshoot.c | 3 + arch/arc/plat-axs10x/axs10x.c | 18 +- arch/arc/plat-hsdk/platform.c | 42 - arch/arm/boot/dts/am33xx.dtsi | 2 + arch/arm/boot/dts/am4372.dtsi | 6 +- arch/arm/boot/dts/am437x-cm-t43.dts | 4 +- arch/arm/boot/dts/armada-385-db-ap.dts | 1 + arch/arm/boot/dts/armada-385-linksys.dtsi | 1 + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 + arch/arm/boot/dts/armada-388-gp.dts | 2 + arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- arch/arm/boot/dts/at91-tse850-3.dts | 1 + arch/arm/boot/dts/bcm-nsp.dtsi | 4 +- arch/arm/boot/dts/bcm283x.dtsi | 1 + arch/arm/boot/dts/bcm958623hr.dts | 4 - arch/arm/boot/dts/bcm958625hr.dts | 4 - arch/arm/boot/dts/da850-lego-ev3.dts | 4 +- arch/arm/boot/dts/dm814x.dtsi | 2 + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 + arch/arm/boot/dts/imx53.dtsi | 9 - arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 3 +- arch/arm/boot/dts/logicpd-som-lv.dtsi | 17 +- arch/arm/boot/dts/ls1021a-qds.dts | 2 +- arch/arm/boot/dts/ls1021a-twr.dts | 2 +- arch/arm/boot/dts/meson.dtsi | 18 +- arch/arm/boot/dts/nspire.dtsi | 1 + arch/arm/boot/dts/omap3-beagle-xm.dts | 1 + arch/arm/boot/dts/omap3-beagle.dts | 1 + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 + arch/arm/boot/dts/omap3-evm-common.dtsi | 1 + arch/arm/boot/dts/omap3-gta04.dtsi | 1 + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 1 + arch/arm/boot/dts/omap3-igep0030-common.dtsi | 1 + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 1 + arch/arm/boot/dts/omap3-overo-base.dtsi | 1 + arch/arm/boot/dts/omap3-pandora-common.dtsi | 1 + arch/arm/boot/dts/omap3-tao3530.dtsi | 1 + arch/arm/boot/dts/omap3.dtsi | 1 + arch/arm/boot/dts/omap4-droid4-xt894.dts | 1 + arch/arm/boot/dts/omap4-duovero.dtsi | 1 + arch/arm/boot/dts/omap4-panda-common.dtsi | 1 + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 1 + arch/arm/boot/dts/omap4.dtsi | 5 +- arch/arm/boot/dts/omap5-board-common.dtsi | 2 + arch/arm/boot/dts/omap5-cm-t54.dts | 2 + arch/arm/boot/dts/omap5.dtsi | 1 + arch/arm/boot/dts/r8a7790.dtsi | 1 + arch/arm/boot/dts/r8a7792.dtsi | 1 + arch/arm/boot/dts/r8a7793.dtsi | 1 + arch/arm/boot/dts/r8a7794.dtsi | 1 + arch/arm/boot/dts/rk3066a-marsboard.dts | 4 + arch/arm/boot/dts/rk3288.dtsi | 2 +- arch/arm/boot/dts/sun4i-a10.dtsi | 4 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 4 +- arch/arm/boot/dts/sun6i-a31.dtsi | 4 +- arch/arm/boot/dts/sun7i-a20.dtsi | 4 +- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 + arch/arm/boot/dts/tango4-common.dtsi | 1 - arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 6 +- arch/arm/include/asm/kvm_arm.h | 3 +- arch/arm/include/asm/kvm_host.h | 5 + arch/arm/include/asm/pgtable-3level.h | 1 - arch/arm/include/uapi/asm/Kbuild | 1 + arch/arm/kernel/entry-header.S | 4 +- arch/arm/kernel/traps.c | 1 - arch/arm/lib/csumpartialcopyuser.S | 4 + arch/arm/mach-davinci/dm365.c | 29 +- arch/arm/mach-meson/platsmp.c | 2 +- arch/arm/mach-omap2/cm_common.c | 6 +- arch/arm/mach-omap2/omap-secure.c | 21 + arch/arm/mach-omap2/omap-secure.h | 4 + arch/arm/mach-omap2/omap_device.c | 10 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 1 + arch/arm/mach-omap2/pm.h | 4 - arch/arm/mach-omap2/pm34xx.c | 13 +- arch/arm/mach-omap2/prcm-common.h | 1 + arch/arm/mach-omap2/prm33xx.c | 12 - arch/arm/mach-omap2/sleep34xx.S | 26 +- arch/arm64/Kconfig | 12 +- arch/arm64/Makefile | 3 - arch/arm64/boot/dts/Makefile | 2 +- .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 1 + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 1 + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 3 +- .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 11 +- .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 +- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 1 - arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 2 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 11 - .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 1 - .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 1 - .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 3 +- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 4 +- arch/arm64/include/asm/assembler.h | 10 + arch/arm64/include/asm/cacheflush.h | 2 +- arch/arm64/include/asm/cpufeature.h | 3 + arch/arm64/include/asm/cputype.h | 2 + arch/arm64/include/asm/efi.h | 4 +- arch/arm64/include/asm/kvm_arm.h | 3 +- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/mmu_context.h | 46 +- arch/arm64/include/asm/module.h | 46 +- arch/arm64/include/asm/perf_event.h | 2 + arch/arm64/include/asm/pgtable.h | 42 +- arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 + arch/arm64/kernel/Makefile | 3 - arch/arm64/kernel/cpu-reset.S | 1 + arch/arm64/kernel/cpu_ops.c | 6 +- arch/arm64/kernel/cpufeature.c | 3 +- arch/arm64/kernel/efi-entry.S | 2 + arch/arm64/kernel/fpsimd.c | 57 +- arch/arm64/kernel/ftrace-mod.S | 18 - arch/arm64/kernel/ftrace.c | 14 +- arch/arm64/kernel/head.S | 1 + arch/arm64/kernel/hw_breakpoint.c | 2 +- arch/arm64/kernel/module-plts.c | 50 +- arch/arm64/kernel/module.lds | 1 + arch/arm64/kernel/perf_event.c | 6 - arch/arm64/kernel/process.c | 9 + arch/arm64/kernel/relocate_kernel.S | 1 + arch/arm64/kvm/debug.c | 21 + arch/arm64/kvm/handle_exit.c | 57 +- arch/arm64/kvm/hyp-init.S | 1 + arch/arm64/kvm/hyp/debug-sr.c | 3 + arch/arm64/kvm/hyp/switch.c | 37 +- arch/arm64/mm/context.c | 28 +- arch/arm64/mm/dump.c | 2 +- arch/arm64/mm/fault.c | 5 +- arch/arm64/mm/init.c | 3 +- arch/arm64/mm/pgd.c | 2 +- arch/blackfin/include/uapi/asm/Kbuild | 1 + arch/c6x/include/uapi/asm/Kbuild | 1 + arch/cris/include/uapi/asm/Kbuild | 1 + arch/frv/include/uapi/asm/Kbuild | 2 + arch/h8300/include/uapi/asm/Kbuild | 1 + arch/hexagon/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/Kbuild | 1 + arch/m32r/include/uapi/asm/Kbuild | 1 + arch/m32r/kernel/traps.c | 1 - arch/m68k/configs/stmark2_defconfig | 1 - arch/m68k/include/uapi/asm/Kbuild | 1 + arch/m68k/kernel/vmlinux-nommu.lds | 2 + arch/m68k/kernel/vmlinux-std.lds | 2 + arch/m68k/kernel/vmlinux-sun3.lds | 2 + arch/metag/include/uapi/asm/Kbuild | 1 + arch/microblaze/include/asm/mmu_context_mm.h | 1 + arch/microblaze/include/uapi/asm/Kbuild | 1 + arch/mips/include/asm/Kbuild | 1 - arch/mips/include/asm/pgtable.h | 2 +- arch/mips/include/asm/serial.h | 22 + arch/mips/include/uapi/asm/Kbuild | 1 + arch/mips/kvm/mips.c | 7 +- arch/mn10300/include/uapi/asm/Kbuild | 1 + arch/nios2/include/uapi/asm/Kbuild | 1 + arch/openrisc/include/uapi/asm/Kbuild | 1 + arch/parisc/boot/compressed/misc.c | 4 +- arch/parisc/include/asm/ldcw.h | 2 + arch/parisc/include/asm/thread_info.h | 5 + arch/parisc/include/uapi/asm/Kbuild | 1 + arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/entry.S | 25 +- arch/parisc/kernel/hpmc.S | 1 + arch/parisc/kernel/pacache.S | 9 +- arch/parisc/kernel/process.c | 39 + arch/parisc/kernel/unwind.c | 1 - arch/parisc/lib/delay.c | 2 - arch/parisc/mm/init.c | 10 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 1 - arch/powerpc/include/asm/kvm_ppc.h | 1 + arch/powerpc/include/asm/machdep.h | 1 + arch/powerpc/include/asm/mmu_context.h | 5 +- arch/powerpc/include/asm/setup.h | 1 + arch/powerpc/include/uapi/asm/Kbuild | 1 + arch/powerpc/kernel/cpu_setup_power.S | 2 + arch/powerpc/kernel/fadump.c | 22 - arch/powerpc/kernel/misc_64.S | 2 + arch/powerpc/kernel/process.c | 14 +- arch/powerpc/kernel/setup-common.c | 27 + arch/powerpc/kvm/book3s_64_mmu_hv.c | 37 +- arch/powerpc/kvm/book3s_hv.c | 3 +- arch/powerpc/kvm/book3s_xive.c | 7 +- arch/powerpc/kvm/powerpc.c | 7 +- arch/powerpc/mm/fault.c | 7 +- arch/powerpc/mm/hash_native_64.c | 15 +- arch/powerpc/net/bpf_jit_comp64.c | 6 +- arch/powerpc/perf/core-book3s.c | 12 +- arch/powerpc/perf/imc-pmu.c | 17 +- arch/powerpc/platforms/ps3/setup.c | 15 + arch/powerpc/platforms/pseries/setup.c | 1 + arch/powerpc/sysdev/fsl_msi.c | 4 +- arch/powerpc/xmon/xmon.c | 10 +- arch/riscv/include/asm/Kbuild | 1 + arch/riscv/include/asm/asm.h | 12 +- arch/riscv/include/asm/atomic.h | 103 +- arch/riscv/include/asm/barrier.h | 36 +- arch/riscv/include/asm/bitops.h | 2 +- arch/riscv/include/asm/bug.h | 6 +- arch/riscv/include/asm/cacheflush.h | 30 +- arch/riscv/include/asm/io.h | 18 +- arch/riscv/include/asm/mmu.h | 4 + arch/riscv/include/asm/mmu_context.h | 45 + arch/riscv/include/asm/pgtable.h | 58 +- arch/riscv/include/asm/spinlock.h | 11 +- arch/riscv/include/asm/timex.h | 3 +- arch/riscv/include/asm/tlbflush.h | 7 +- arch/riscv/include/asm/vdso-syscalls.h | 28 + arch/riscv/include/asm/vdso.h | 4 + arch/riscv/include/uapi/asm/Kbuild | 1 + arch/riscv/kernel/head.S | 3 - arch/riscv/kernel/riscv_ksyms.c | 3 + arch/riscv/kernel/setup.c | 16 +- arch/riscv/kernel/smp.c | 55 + arch/riscv/kernel/sys_riscv.c | 33 +- arch/riscv/kernel/syscall_table.c | 2 + arch/riscv/kernel/vdso/Makefile | 7 +- arch/riscv/kernel/vdso/clock_getres.S | 26 + arch/riscv/kernel/vdso/clock_gettime.S | 26 + arch/riscv/kernel/vdso/flush_icache.S | 31 + arch/riscv/kernel/vdso/getcpu.S | 26 + arch/riscv/kernel/vdso/gettimeofday.S | 26 + arch/riscv/kernel/vdso/vdso.lds.S | 7 +- arch/riscv/lib/delay.c | 1 + arch/riscv/mm/Makefile | 1 + arch/riscv/mm/cacheflush.c | 23 + arch/riscv/mm/ioremap.c | 2 +- arch/s390/Kbuild | 1 + arch/s390/Makefile | 5 +- arch/s390/appldata/Makefile | 1 + arch/s390/appldata/appldata_base.c | 1 + arch/s390/appldata/appldata_mem.c | 1 + arch/s390/appldata/appldata_net_sum.c | 1 + arch/s390/appldata/appldata_os.c | 1 + arch/s390/boot/compressed/vmlinux.scr | 1 + arch/s390/boot/install.sh | 5 +- arch/s390/crypto/aes_s390.c | 7 +- arch/s390/crypto/arch_random.c | 6 +- arch/s390/crypto/crc32-vx.c | 1 + arch/s390/crypto/des_s390.c | 7 +- arch/s390/crypto/ghash_s390.c | 1 + arch/s390/crypto/paes_s390.c | 6 +- arch/s390/crypto/prng.c | 1 + arch/s390/crypto/sha.h | 7 +- arch/s390/crypto/sha1_s390.c | 7 +- arch/s390/crypto/sha256_s390.c | 7 +- arch/s390/crypto/sha512_s390.c | 7 +- arch/s390/crypto/sha_common.c | 7 +- arch/s390/hypfs/Makefile | 1 + arch/s390/hypfs/inode.c | 2 +- arch/s390/include/asm/Kbuild | 1 + arch/s390/include/asm/alternative.h | 1 + arch/s390/include/asm/ap.h | 5 +- arch/s390/include/asm/bugs.h | 1 + arch/s390/include/asm/cpu_mf.h | 5 +- arch/s390/include/asm/elf.h | 15 +- arch/s390/include/asm/kprobes.h | 15 +- arch/s390/include/asm/kvm_host.h | 5 +- arch/s390/include/asm/kvm_para.h | 7 +- arch/s390/include/asm/livepatch.h | 8 +- arch/s390/include/asm/mmu_context.h | 2 +- arch/s390/include/asm/perf_event.h | 1 + arch/s390/include/asm/pgtable.h | 2 +- arch/s390/include/asm/ptrace.h | 11 +- arch/s390/include/asm/segment.h | 1 + arch/s390/include/asm/switch_to.h | 27 +- arch/s390/include/asm/syscall.h | 5 +- arch/s390/include/asm/sysinfo.h | 5 +- arch/s390/include/asm/topology.h | 1 + arch/s390/include/asm/vga.h | 1 + arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/bpf_perf_event.h | 9 + arch/s390/include/uapi/asm/kvm.h | 4 - arch/s390/include/uapi/asm/kvm_para.h | 4 - arch/s390/include/uapi/asm/kvm_perf.h | 4 - arch/s390/include/uapi/asm/perf_regs.h | 1 + arch/s390/include/uapi/asm/ptrace.h | 125 +- arch/s390/include/uapi/asm/sthyi.h | 1 + arch/s390/include/uapi/asm/virtio-ccw.h | 6 +- arch/s390/include/uapi/asm/vmcp.h | 1 + arch/s390/include/uapi/asm/zcrypt.h | 14 - arch/s390/kernel/alternative.c | 1 + arch/s390/kernel/compat_linux.c | 1 + arch/s390/kernel/debug.c | 2 +- arch/s390/kernel/dis.c | 10 +- arch/s390/kernel/dumpstack.c | 1 + arch/s390/kernel/entry.S | 15 +- arch/s390/kernel/ipl.c | 1 + arch/s390/kernel/kprobes.c | 15 +- arch/s390/kernel/lgr.c | 1 + arch/s390/kernel/module.c | 15 +- arch/s390/kernel/nmi.c | 1 + arch/s390/kernel/perf_cpum_cf.c | 5 +- arch/s390/kernel/perf_cpum_sf.c | 5 +- arch/s390/kernel/perf_event.c | 5 +- arch/s390/kernel/perf_regs.c | 1 + arch/s390/kernel/ptrace.c | 8 + arch/s390/kernel/setup.c | 1 + arch/s390/kernel/smp.c | 1 + arch/s390/kernel/stacktrace.c | 1 + arch/s390/kernel/sthyi.c | 5 +- arch/s390/kernel/syscalls.S | 6 +- arch/s390/kernel/time.c | 1 + arch/s390/kernel/topology.c | 1 + arch/s390/kernel/vdso.c | 5 +- arch/s390/kernel/vdso32/clock_getres.S | 5 +- arch/s390/kernel/vdso32/clock_gettime.S | 5 +- arch/s390/kernel/vdso32/gettimeofday.S | 5 +- arch/s390/kernel/vdso64/clock_getres.S | 5 +- arch/s390/kernel/vdso64/clock_gettime.S | 5 +- arch/s390/kernel/vdso64/gettimeofday.S | 5 +- arch/s390/kernel/vdso64/note.S | 1 + arch/s390/kernel/vtime.c | 1 + arch/s390/kvm/Makefile | 5 +- arch/s390/kvm/diag.c | 5 +- arch/s390/kvm/gaccess.h | 5 +- arch/s390/kvm/guestdbg.c | 5 +- arch/s390/kvm/intercept.c | 5 +- arch/s390/kvm/interrupt.c | 5 +- arch/s390/kvm/irq.h | 5 +- arch/s390/kvm/kvm-s390.c | 27 +- arch/s390/kvm/kvm-s390.h | 5 +- arch/s390/kvm/priv.c | 18 +- arch/s390/kvm/sigp.c | 5 +- arch/s390/kvm/vsie.c | 5 +- arch/s390/lib/uaccess.c | 2 +- arch/s390/mm/cmm.c | 1 + arch/s390/mm/gmap.c | 1 + arch/s390/mm/mmap.c | 16 +- arch/s390/mm/pgalloc.c | 2 - arch/s390/mm/pgtable.c | 1 + arch/s390/net/Makefile | 1 + arch/s390/net/bpf_jit_comp.c | 11 +- arch/s390/numa/Makefile | 1 + arch/s390/pci/Makefile | 1 + arch/s390/pci/pci.c | 1 + arch/s390/pci/pci_debug.c | 1 + arch/s390/pci/pci_dma.c | 22 +- arch/s390/pci/pci_insn.c | 4 + arch/s390/tools/gen_opcode_table.c | 1 + arch/score/include/uapi/asm/Kbuild | 1 + arch/sh/include/uapi/asm/Kbuild | 1 + arch/sparc/include/asm/pgtable_64.h | 2 +- arch/sparc/include/uapi/asm/Kbuild | 1 + arch/sparc/lib/Makefile | 2 +- arch/sparc/lib/hweight.S | 4 +- arch/sparc/mm/fault_32.c | 2 +- arch/sparc/mm/fault_64.c | 2 +- arch/sparc/net/bpf_jit_comp_64.c | 6 +- arch/tile/include/asm/pgtable.h | 1 - arch/tile/include/uapi/asm/Kbuild | 1 + arch/um/include/asm/Kbuild | 1 + arch/um/include/asm/mmu_context.h | 3 +- arch/um/kernel/trap.c | 2 +- arch/unicore32/include/asm/mmu_context.h | 5 +- arch/unicore32/include/uapi/asm/Kbuild | 1 + arch/unicore32/kernel/traps.c | 1 - arch/x86/Kconfig | 3 +- arch/x86/Kconfig.debug | 1 + arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/compressed/head_64.S | 16 +- arch/x86/boot/compressed/misc.c | 16 + arch/x86/boot/compressed/pagetable.c | 3 + arch/x86/boot/compressed/pgtable_64.c | 28 + arch/x86/boot/genimage.sh | 32 +- arch/x86/crypto/salsa20_glue.c | 7 - arch/x86/entry/calling.h | 145 ++ arch/x86/entry/entry_32.S | 14 +- arch/x86/entry/entry_64.S | 237 +++- arch/x86/entry/entry_64_compat.S | 32 +- arch/x86/entry/vdso/vclock_gettime.c | 2 +- arch/x86/entry/vsyscall/vsyscall_64.c | 38 +- arch/x86/events/intel/core.c | 5 +- arch/x86/events/intel/ds.c | 146 +- arch/x86/events/perf_event.h | 23 +- arch/x86/include/asm/alternative.h | 4 +- arch/x86/include/asm/asm.h | 2 + arch/x86/include/asm/cpu_entry_area.h | 81 ++ arch/x86/include/asm/cpufeature.h | 2 + arch/x86/include/asm/cpufeatures.h | 5 +- arch/x86/include/asm/desc.h | 14 +- arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/espfix.h | 7 +- arch/x86/include/asm/fixmap.h | 7 +- arch/x86/include/asm/hypervisor.h | 25 +- arch/x86/include/asm/intel_ds.h | 36 + arch/x86/include/asm/invpcid.h | 53 + arch/x86/include/asm/irqdomain.h | 2 +- arch/x86/include/asm/irqflags.h | 3 + arch/x86/include/asm/kdebug.h | 1 + arch/x86/include/asm/kmemcheck.h | 1 - arch/x86/include/asm/kvm_emulate.h | 2 - arch/x86/include/asm/kvm_host.h | 19 +- arch/x86/include/asm/mmu.h | 4 +- arch/x86/include/asm/mmu_context.h | 113 +- arch/x86/include/asm/paravirt.h | 9 + arch/x86/include/asm/pgalloc.h | 11 + arch/x86/include/asm/pgtable.h | 38 +- arch/x86/include/asm/pgtable_32_types.h | 15 +- arch/x86/include/asm/pgtable_64.h | 92 ++ arch/x86/include/asm/pgtable_64_types.h | 59 +- arch/x86/include/asm/processor-flags.h | 5 + arch/x86/include/asm/processor.h | 82 +- arch/x86/include/asm/pti.h | 14 + arch/x86/include/asm/segment.h | 12 + arch/x86/include/asm/stacktrace.h | 3 + arch/x86/include/asm/suspend_32.h | 8 +- arch/x86/include/asm/suspend_64.h | 19 +- arch/x86/include/asm/switch_to.h | 13 +- arch/x86/include/asm/thread_info.h | 2 +- arch/x86/include/asm/tlbflush.h | 347 +++-- arch/x86/include/asm/trace/irq_vectors.h | 16 +- arch/x86/include/asm/traps.h | 1 - arch/x86/include/asm/unwind.h | 20 +- arch/x86/include/asm/vsyscall.h | 1 + arch/x86/include/uapi/asm/Kbuild | 1 + arch/x86/include/uapi/asm/processor-flags.h | 7 +- arch/x86/kernel/apic/apic.c | 2 + arch/x86/kernel/apic/apic_flat_64.c | 2 +- arch/x86/kernel/apic/apic_noop.c | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/msi.c | 8 +- arch/x86/kernel/apic/probe_32.c | 2 +- arch/x86/kernel/apic/vector.c | 24 +- arch/x86/kernel/apic/x2apic_cluster.c | 2 +- arch/x86/kernel/asm-offsets.c | 10 + arch/x86/kernel/asm-offsets_32.c | 9 +- arch/x86/kernel/asm-offsets_64.c | 4 + arch/x86/kernel/cpu/amd.c | 7 +- arch/x86/kernel/cpu/common.c | 103 +- arch/x86/kernel/cpu/microcode/amd.c | 4 + arch/x86/kernel/cpu/microcode/intel.c | 13 - arch/x86/kernel/doublefault.c | 36 +- arch/x86/kernel/dumpstack.c | 98 +- arch/x86/kernel/dumpstack_32.c | 6 + arch/x86/kernel/dumpstack_64.c | 12 + arch/x86/kernel/head_64.S | 30 +- arch/x86/kernel/ioport.c | 2 +- arch/x86/kernel/irq.c | 12 - arch/x86/kernel/irq_64.c | 4 +- arch/x86/kernel/ldt.c | 198 ++- arch/x86/kernel/machine_kexec_32.c | 4 +- arch/x86/kernel/paravirt_patch_64.c | 2 - arch/x86/kernel/process.c | 21 +- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 14 +- arch/x86/kernel/setup.c | 5 +- arch/x86/kernel/smpboot.c | 21 +- arch/x86/kernel/stacktrace.c | 8 +- arch/x86/kernel/tls.c | 11 +- arch/x86/kernel/traps.c | 77 +- arch/x86/kernel/unwind_orc.c | 88 +- arch/x86/kernel/vmlinux.lds.S | 17 + arch/x86/kvm/cpuid.h | 2 +- arch/x86/kvm/emulate.c | 93 +- arch/x86/kvm/ioapic.c | 34 +- arch/x86/kvm/lapic.c | 12 +- arch/x86/kvm/mmu.c | 8 +- arch/x86/kvm/svm.c | 30 +- arch/x86/kvm/vmx.c | 95 +- arch/x86/kvm/x86.c | 139 +- arch/x86/lib/delay.c | 4 +- arch/x86/lib/x86-opcode-map.txt | 13 +- arch/x86/mm/Makefile | 9 +- arch/x86/mm/cpu_entry_area.c | 166 +++ arch/x86/mm/debug_pagetables.c | 80 +- arch/x86/mm/dump_pagetables.c | 141 +- arch/x86/mm/extable.c | 6 +- arch/x86/mm/fault.c | 4 +- arch/x86/mm/init.c | 82 +- arch/x86/mm/init_32.c | 6 + arch/x86/mm/ioremap.c | 4 +- arch/x86/mm/kasan_init_64.c | 23 +- arch/x86/mm/kaslr.c | 32 +- arch/x86/mm/kmemcheck/error.c | 1 - arch/x86/mm/kmemcheck/error.h | 1 - arch/x86/mm/kmemcheck/opcode.c | 1 - arch/x86/mm/kmemcheck/opcode.h | 1 - arch/x86/mm/kmemcheck/pte.c | 1 - arch/x86/mm/kmemcheck/pte.h | 1 - arch/x86/mm/kmemcheck/selftest.c | 1 - arch/x86/mm/kmemcheck/selftest.h | 1 - arch/x86/mm/kmemcheck/shadow.h | 1 - arch/x86/mm/kmmio.c | 12 +- arch/x86/mm/mem_encrypt.c | 4 +- arch/x86/mm/pgtable.c | 5 +- arch/x86/mm/pgtable_32.c | 1 + arch/x86/mm/pti.c | 388 ++++++ arch/x86/mm/tlb.c | 64 +- arch/x86/pci/broadcom_bus.c | 2 +- arch/x86/pci/fixup.c | 27 +- arch/x86/platform/efi/efi_64.c | 5 +- arch/x86/platform/efi/quirks.c | 13 +- arch/x86/platform/uv/tlb_uv.c | 2 +- arch/x86/platform/uv/uv_irq.c | 2 +- arch/x86/platform/uv/uv_nmi.c | 4 +- arch/x86/power/cpu.c | 112 +- arch/x86/xen/apic.c | 2 +- arch/x86/xen/enlighten.c | 81 ++ arch/x86/xen/enlighten_pv.c | 42 +- arch/x86/xen/mmu_pv.c | 14 +- arch/x86/xen/setup.c | 6 +- arch/x86/xen/xen-asm_64.S | 14 + arch/xtensa/include/uapi/asm/Kbuild | 1 + block/bio.c | 4 +- block/blk-map.c | 38 +- block/blk-sysfs.c | 5 +- block/blk-throttle.c | 8 +- block/blk-wbt.c | 7 +- block/bounce.c | 6 +- block/genhd.c | 9 +- block/kyber-iosched.c | 37 +- crypto/af_alg.c | 44 +- crypto/algif_aead.c | 66 +- crypto/algif_skcipher.c | 31 +- crypto/asymmetric_keys/pkcs7_parser.c | 4 +- crypto/asymmetric_keys/pkcs7_trust.c | 2 +- crypto/asymmetric_keys/pkcs7_verify.c | 9 +- crypto/asymmetric_keys/public_key.c | 7 +- crypto/asymmetric_keys/x509_cert_parser.c | 2 + crypto/asymmetric_keys/x509_public_key.c | 8 +- crypto/chacha20poly1305.c | 6 +- crypto/hmac.c | 6 +- crypto/mcryptd.c | 23 +- crypto/pcrypt.c | 19 +- crypto/rsa_helper.c | 2 +- crypto/salsa20_generic.c | 7 - crypto/shash.c | 5 +- crypto/skcipher.c | 11 +- drivers/Makefile | 1 + drivers/acpi/apei/erst.c | 2 +- drivers/acpi/cppc_acpi.c | 25 +- drivers/acpi/device_pm.c | 2 +- drivers/acpi/device_sysfs.c | 4 + drivers/acpi/ec.c | 69 +- drivers/acpi/internal.h | 1 + drivers/acpi/nfit/core.c | 9 +- drivers/acpi/scan.c | 21 + drivers/android/binder.c | 84 +- drivers/ata/ahci_mtk.c | 6 +- drivers/ata/ahci_qoriq.c | 12 + drivers/ata/libata-core.c | 12 +- drivers/ata/pata_pdc2027x.c | 16 +- drivers/atm/ambassador.c | 2 +- drivers/atm/fore200e.c | 4 +- drivers/atm/lanai.c | 8 +- drivers/atm/suni.c | 2 +- drivers/auxdisplay/Kconfig | 1 + drivers/base/Kconfig | 25 +- drivers/base/cacheinfo.c | 13 + drivers/base/isa.c | 10 +- drivers/base/power/main.c | 15 + drivers/base/power/runtime.c | 3 +- drivers/block/null_blk.c | 9 +- drivers/bus/arm-cci.c | 7 +- drivers/bus/arm-ccn.c | 25 +- drivers/bus/sunxi-rsb.c | 1 + drivers/char/ipmi/ipmi_si_intf.c | 44 +- drivers/char/ipmi/ipmi_si_parisc.c | 2 + drivers/char/ipmi/ipmi_si_pci.c | 7 +- drivers/clk/clk.c | 8 +- drivers/clk/sunxi/clk-sun9i-mmc.c | 12 + drivers/cpufreq/Kconfig | 2 + drivers/cpufreq/cpufreq_governor.c | 19 +- drivers/cpufreq/imx6q-cpufreq.c | 11 +- drivers/cpufreq/mediatek-cpufreq.c | 4 + drivers/crypto/chelsio/Kconfig | 1 + drivers/crypto/inside-secure/safexcel.c | 1 + drivers/crypto/inside-secure/safexcel_cipher.c | 85 +- drivers/crypto/inside-secure/safexcel_hash.c | 89 +- drivers/crypto/n2_core.c | 3 + drivers/dax/device.c | 12 + drivers/dma/at_hdmac.c | 4 +- drivers/dma/dma-jz4740.c | 4 +- drivers/dma/dmatest.c | 55 +- drivers/dma/fsl-edma.c | 28 +- drivers/dma/ioat/init.c | 2 +- drivers/firmware/arm_scpi.c | 216 +-- drivers/firmware/efi/capsule-loader.c | 45 +- drivers/firmware/efi/efi.c | 5 +- drivers/firmware/efi/esrt.c | 17 +- drivers/firmware/efi/runtime-map.c | 10 +- drivers/firmware/google/vpd.c | 48 +- drivers/firmware/qemu_fw_cfg.c | 3 +- drivers/gpio/gpio-74x164.c | 4 +- drivers/gpio/gpio-bcm-kona.c | 3 +- drivers/gpio/gpio-brcmstb.c | 4 +- drivers/gpio/gpio-davinci.c | 2 +- drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpio/gpio-reg.c | 4 +- drivers/gpio/gpio-tegra.c | 4 +- drivers/gpio/gpio-xgene-sb.c | 2 +- drivers/gpio/gpiolib-acpi.c | 2 +- drivers/gpio/gpiolib-devprop.c | 17 +- drivers/gpio/gpiolib-of.c | 3 +- drivers/gpio/gpiolib.c | 27 +- drivers/gpio/gpiolib.h | 3 +- drivers/gpu/drm/amd/acp/Makefile | 21 + drivers/gpu/drm/amd/amdgpu/Makefile | 22 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 47 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 +- drivers/gpu/drm/amd/amdgpu/cik.c | 111 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 16 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/Makefile | 22 +- drivers/gpu/drm/amd/amdkfd/kfd_module.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 4 +- .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 18 + drivers/gpu/drm/amd/display/Makefile | 21 + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 21 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 44 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 51 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 1 + drivers/gpu/drm/amd/display/dc/Makefile | 21 + drivers/gpu/drm/amd/display/dc/basics/Makefile | 21 + .../gpu/drm/amd/display/dc/basics/log_helpers.c | 5 + drivers/gpu/drm/amd/display/dc/bios/Makefile | 21 + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 4 +- drivers/gpu/drm/amd/display/dc/calcs/Makefile | 21 + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 9 + drivers/gpu/drm/amd/display/dc/core/dc.c | 15 +- drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 22 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 104 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 106 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 56 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 9 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 22 + drivers/gpu/drm/amd/display/dc/dce/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 10 +- .../drm/amd/display/dc/dce/dce_stream_encoder.c | 3 + drivers/gpu/drm/amd/display/dc/dce100/Makefile | 21 + .../drm/amd/display/dc/dce100/dce100_resource.c | 2 +- .../drm/amd/display/dc/dce100/dce100_resource.h | 23 + drivers/gpu/drm/amd/display/dc/dce110/Makefile | 21 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 58 +- .../drm/amd/display/dc/dce110/dce110_resource.c | 14 +- .../display/dc/dce110/dce110_timing_generator.c | 8 +- .../display/dc/dce110/dce110_timing_generator_v.c | 23 + drivers/gpu/drm/amd/display/dc/dce112/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dce120/Makefile | 23 +- drivers/gpu/drm/amd/display/dc/dce80/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 21 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 9 +- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 2 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 6 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 6 +- .../amd/display/dc/dcn10/dcn10_timing_generator.c | 3 - drivers/gpu/drm/amd/display/dc/dml/Makefile | 21 + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 21 + drivers/gpu/drm/amd/display/dc/i2caux/Makefile | 21 + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 +- .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 22 + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 22 + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 7 - drivers/gpu/drm/amd/display/dc/irq/Makefile | 21 + drivers/gpu/drm/amd/display/dc/virtual/Makefile | 21 + .../gpu/drm/amd/display/modules/freesync/Makefile | 21 + drivers/gpu/drm/amd/lib/Makefile | 21 + drivers/gpu/drm/amd/powerplay/Makefile | 22 +- drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 22 +- .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 24 +- drivers/gpu/drm/amd/powerplay/inc/smu72.h | 24 +- drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h | 24 +- drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 22 +- drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 24 +- drivers/gpu/drm/arm/hdlcd_crtc.c | 3 +- drivers/gpu/drm/arm/hdlcd_drv.c | 9 +- drivers/gpu/drm/arm/malidp_crtc.c | 16 +- drivers/gpu/drm/arm/malidp_drv.c | 34 +- drivers/gpu/drm/arm/malidp_hw.c | 46 +- drivers/gpu/drm/arm/malidp_hw.h | 65 +- drivers/gpu/drm/arm/malidp_planes.c | 21 +- drivers/gpu/drm/armada/armada_crtc.c | 47 +- drivers/gpu/drm/armada/armada_crtc.h | 2 + drivers/gpu/drm/armada/armada_overlay.c | 38 +- drivers/gpu/drm/bridge/adv7511/adv7511.h | 13 +- drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 32 +- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 + drivers/gpu/drm/bridge/lvds-encoder.c | 48 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 25 + drivers/gpu/drm/bridge/tc358767.c | 73 +- drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_connector.c | 65 +- drivers/gpu/drm/drm_crtc_internal.h | 1 + drivers/gpu/drm/drm_edid.c | 64 +- drivers/gpu/drm/drm_fb_helper.c | 4 + drivers/gpu/drm/drm_lease.c | 26 +- drivers/gpu/drm/drm_mm.c | 8 +- drivers/gpu/drm/drm_mode_config.c | 5 + drivers/gpu/drm/drm_plane.c | 43 +- drivers/gpu/drm/drm_syncobj.c | 77 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 46 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 - drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 + drivers/gpu/drm/i915/gvt/cfg_space.c | 21 + drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- drivers/gpu/drm/i915/gvt/display.c | 3 + drivers/gpu/drm/i915/gvt/execlist.c | 6 + drivers/gpu/drm/i915/gvt/gtt.c | 6 +- drivers/gpu/drm/i915/gvt/handlers.c | 92 +- drivers/gpu/drm/i915/gvt/mmio.h | 2 + drivers/gpu/drm/i915/gvt/scheduler.c | 55 +- drivers/gpu/drm/i915/gvt/scheduler.h | 3 + drivers/gpu/drm/i915/i915_drv.c | 3 + drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_gem.c | 40 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 6 +- drivers/gpu/drm/i915/i915_gemfs.c | 3 +- drivers/gpu/drm/i915/i915_reg.h | 5 +- drivers/gpu/drm/i915/i915_sw_fence.c | 3 +- drivers/gpu/drm/i915/intel_breadcrumbs.c | 23 +- drivers/gpu/drm/i915/intel_cdclk.c | 35 +- drivers/gpu/drm/i915/intel_ddi.c | 5 + drivers/gpu/drm/i915/intel_display.c | 70 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_fbdev.c | 10 +- drivers/gpu/drm/i915/intel_hdmi.c | 3 +- drivers/gpu/drm/i915/intel_i2c.c | 4 +- drivers/gpu/drm/i915/intel_lpe_audio.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 13 - drivers/gpu/drm/i915/intel_psr.c | 16 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 + drivers/gpu/drm/i915/intel_uncore.c | 13 + drivers/gpu/drm/i915/intel_uncore.h | 1 + drivers/gpu/drm/imx/imx-drm-core.c | 11 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 5 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 11 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 6 +- drivers/gpu/drm/nouveau/nouveau_ttm.c | 39 +- drivers/gpu/drm/nouveau/nouveau_vmm.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c | 9 +- drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 7 + drivers/gpu/drm/omapdrm/displays/Kconfig | 1 + drivers/gpu/drm/omapdrm/dss/dpi.c | 4 +- drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 48 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 23 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 3 +- drivers/gpu/drm/radeon/cik.c | 24 - drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 3 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 20 + drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- drivers/gpu/drm/ttm/ttm_page_alloc.c | 139 +- drivers/gpu/drm/vc4/vc4_bo.c | 3 +- drivers/gpu/drm/vc4/vc4_gem.c | 4 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +- drivers/gpu/drm/vc4/vc4_irq.c | 7 + drivers/hid/hid-core.c | 2 +- drivers/hid/hid-cp2112.c | 15 +- drivers/hid/hid-holtekff.c | 8 +- drivers/hv/channel.c | 10 +- drivers/hv/channel_mgmt.c | 7 +- drivers/hv/vmbus_drv.c | 2 + drivers/hwmon/hwmon.c | 21 +- drivers/hwmon/jc42.c | 21 + drivers/hwmon/pmbus/pmbus_core.c | 21 +- drivers/hwtracing/stm/ftrace.c | 6 +- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/busses/i2c-i801.c | 3 + drivers/i2c/busses/i2c-piix4.c | 2 +- drivers/i2c/busses/i2c-stm32.h | 3 +- drivers/i2c/busses/i2c-stm32f4.c | 3 +- drivers/i2c/busses/i2c-stm32f7.c | 3 +- drivers/i2c/i2c-boardinfo.c | 2 + drivers/iio/adc/Kconfig | 37 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/cpcap-adc.c | 2 +- drivers/iio/adc/meson_saradc.c | 52 +- drivers/iio/adc/sd_adc_modulator.c | 68 + drivers/iio/adc/stm32-dfsdm-adc.c | 1216 +++++++++++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 308 +++++ drivers/iio/adc/stm32-dfsdm.h | 310 +++++ drivers/iio/buffer/Kconfig | 10 + drivers/iio/buffer/Makefile | 1 + drivers/iio/buffer/industrialio-buffer-cb.c | 11 + drivers/iio/buffer/industrialio-hw-consumer.c | 247 ++++ drivers/iio/health/max30102.c | 2 +- drivers/iio/industrialio-core.c | 4 +- drivers/iio/inkern.c | 17 +- drivers/iio/proximity/sx9500.c | 9 + drivers/infiniband/Kconfig | 2 +- drivers/infiniband/core/cma.c | 3 +- drivers/infiniband/core/device.c | 4 +- drivers/infiniband/core/iwcm.c | 2 +- drivers/infiniband/core/nldev.c | 2 +- drivers/infiniband/core/security.c | 60 +- drivers/infiniband/core/umem.c | 2 +- drivers/infiniband/core/uverbs_cmd.c | 10 +- drivers/infiniband/core/verbs.c | 3 +- drivers/infiniband/hw/cxgb4/cq.c | 16 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 - drivers/infiniband/hw/cxgb4/qp.c | 94 +- drivers/infiniband/hw/cxgb4/t4.h | 6 + drivers/infiniband/hw/hfi1/hfi.h | 1 - drivers/infiniband/hw/hfi1/pcie.c | 30 +- drivers/infiniband/hw/hfi1/rc.c | 2 +- drivers/infiniband/hw/hns/hns_roce_alloc.c | 23 - drivers/infiniband/hw/hns/hns_roce_device.h | 4 +- drivers/infiniband/hw/hns/hns_roce_hem.c | 25 +- drivers/infiniband/hw/hns/hns_roce_hem.h | 1 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 22 +- drivers/infiniband/hw/i40iw/i40iw_cm.c | 31 +- drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 43 +- drivers/infiniband/hw/i40iw/i40iw_d.h | 6 +- drivers/infiniband/hw/mlx4/qp.c | 26 +- drivers/infiniband/hw/mlx5/cmd.c | 11 - drivers/infiniband/hw/mlx5/cmd.h | 2 - drivers/infiniband/hw/mlx5/main.c | 43 +- drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 + drivers/infiniband/hw/mlx5/mr.c | 1 + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 6 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 7 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 17 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 14 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 7 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 +- drivers/input/joystick/analog.c | 2 +- drivers/input/misc/ims-pcu.c | 2 +- drivers/input/misc/xen-kbdfront.c | 2 - drivers/input/mouse/elantech.c | 2 +- drivers/input/touchscreen/elants_i2c.c | 10 +- drivers/input/touchscreen/hideep.c | 3 +- drivers/iommu/amd_iommu.c | 2 +- drivers/iommu/arm-smmu-v3.c | 17 +- drivers/iommu/intel-iommu.c | 8 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 4 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 6 +- drivers/leds/led-core.c | 1 + drivers/md/bcache/alloc.c | 2 +- drivers/md/bcache/btree.c | 5 +- drivers/md/bcache/extents.c | 2 +- drivers/md/bcache/journal.c | 7 +- drivers/md/bcache/request.c | 13 +- drivers/md/dm-bufio.c | 8 +- drivers/md/dm-cache-target.c | 12 +- drivers/md/dm-mpath.c | 67 +- drivers/md/dm-snap.c | 48 +- drivers/md/dm-table.c | 5 +- drivers/md/dm-thin.c | 22 +- drivers/md/md.c | 4 +- drivers/md/raid1.c | 4 + drivers/md/raid10.c | 4 + drivers/md/raid5-cache.c | 22 +- drivers/md/raid5.c | 2 +- drivers/media/common/siano/smscoreapi.c | 66 +- drivers/media/dvb-core/dvb_ca_en50221.c | 68 +- drivers/media/dvb-core/dvb_frontend.c | 13 +- drivers/media/dvb-core/dvb_net.c | 15 +- drivers/media/dvb-frontends/af9013.h | 24 +- drivers/media/dvb-frontends/ascot2e.h | 9 + drivers/media/dvb-frontends/cxd2820r.h | 24 +- drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h | 12 +- drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 878 ++++++------ drivers/media/dvb-frontends/drx39xyj/drxj.c | 248 ++-- drivers/media/dvb-frontends/drx39xyj/drxj.h | 220 ++-- drivers/media/dvb-frontends/drxk.h | 13 +- drivers/media/dvb-frontends/drxk_hard.c | 32 +- drivers/media/dvb-frontends/dvb-pll.h | 13 +- drivers/media/dvb-frontends/helene.h | 30 +- drivers/media/dvb-frontends/horus3a.h | 9 + drivers/media/dvb-frontends/ix2505v.c | 6 +- drivers/media/dvb-frontends/ix2505v.h | 28 +- drivers/media/dvb-frontends/l64781.c | 2 +- drivers/media/dvb-frontends/m88ds3103.h | 155 +-- drivers/media/dvb-frontends/mb86a20s.h | 17 +- drivers/media/dvb-frontends/mn88472.h | 16 +- drivers/media/dvb-frontends/rtl2830.h | 1 - drivers/media/dvb-frontends/rtl2832.h | 1 - drivers/media/dvb-frontends/rtl2832_sdr.h | 6 +- drivers/media/dvb-frontends/sp887x.c | 6 +- drivers/media/dvb-frontends/stb6000.h | 11 +- drivers/media/dvb-frontends/stv0299.c | 2 +- drivers/media/dvb-frontends/tda10071.h | 1 - drivers/media/dvb-frontends/tda826x.h | 11 +- drivers/media/dvb-frontends/tua6100.c | 2 +- drivers/media/dvb-frontends/tua6100.h | 2 +- drivers/media/dvb-frontends/zd1301_demod.h | 13 +- drivers/media/dvb-frontends/zl10036.c | 8 +- drivers/media/dvb-frontends/zl10036.h | 16 +- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/et8ek8/Kconfig | 1 + drivers/media/i2c/imx274.c | 5 +- drivers/media/i2c/lm3560.c | 1 + drivers/media/i2c/m5mols/m5mols_capture.c | 5 + drivers/media/i2c/m5mols/m5mols_controls.c | 1 + drivers/media/i2c/m5mols/m5mols_core.c | 20 +- drivers/media/i2c/ov5647.c | 4 +- drivers/media/i2c/s5k6a3.c | 3 + drivers/media/i2c/s5k6aa.c | 5 + drivers/media/i2c/tvp514x.c | 12 +- drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 8 +- drivers/media/pci/solo6x10/solo6x10-enc.c | 2 +- drivers/media/pci/sta2x11/sta2x11_vip.c | 11 + drivers/media/pci/tw68/tw68-risc.c | 33 +- drivers/media/platform/davinci/vpif.c | 3 +- drivers/media/platform/davinci/vpif_capture.c | 27 +- drivers/media/platform/davinci/vpif_display.c | 16 +- drivers/media/platform/exynos4-is/fimc-capture.c | 3 + drivers/media/platform/exynos4-is/media-dev.c | 11 +- drivers/media/platform/exynos4-is/mipi-csis.c | 2 +- .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 1 + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 1 - .../media/platform/mtk-vcodec/venc/venc_h264_if.c | 4 +- .../media/platform/mtk-vcodec/venc/venc_vp8_if.c | 2 +- drivers/media/platform/mtk-vpu/mtk_vpu.c | 3 +- drivers/media/platform/pxa_camera.c | 9 +- drivers/media/platform/rcar_fdp1.c | 2 +- drivers/media/platform/rcar_jpu.c | 4 +- drivers/media/platform/s3c-camif/camif-core.c | 1 + drivers/media/platform/sh_veu.c | 2 +- drivers/media/platform/soc_camera/soc_scale_crop.c | 21 +- drivers/media/platform/sti/hva/hva-h264.c | 18 +- drivers/media/platform/ti-vpe/vpe.c | 2 +- drivers/media/platform/vim2m.c | 2 +- drivers/media/platform/vsp1/vsp1_dl.c | 1 + drivers/media/radio/radio-si476x.c | 18 +- drivers/media/radio/radio-wl1273.c | 2 +- drivers/media/rc/img-ir/img-ir-hw.c | 2 +- drivers/media/rc/imon.c | 40 +- drivers/media/rc/ir-jvc-decoder.c | 2 +- drivers/media/rc/ir-lirc-codec.c | 4 +- drivers/media/rc/ir-nec-decoder.c | 3 +- drivers/media/rc/ir-sanyo-decoder.c | 2 +- drivers/media/rc/ir-sharp-decoder.c | 2 +- drivers/media/rc/ir-xmp-decoder.c | 2 +- drivers/media/rc/rc-ir-raw.c | 2 +- drivers/media/rc/rc-main.c | 78 +- drivers/media/rc/sir_ir.c | 40 +- drivers/media/rc/st_rc.c | 6 +- drivers/media/rc/streamzap.c | 6 +- drivers/media/tuners/mt2063.c | 6 +- drivers/media/usb/dvb-usb/cinergyT2-fe.c | 2 +- drivers/media/usb/dvb-usb/dib0700_devices.c | 8 +- drivers/media/usb/dvb-usb/dibusb-common.c | 16 +- drivers/media/usb/dvb-usb/friio-fe.c | 2 +- drivers/media/usb/dvb-usb/friio.c | 2 +- drivers/media/usb/gspca/ov519.c | 2 +- drivers/media/usb/pwc/pwc-dec23.c | 7 +- drivers/media/usb/siano/smsusb.c | 4 +- drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 6 +- drivers/media/usb/usbtv/usbtv-core.c | 1 + drivers/media/v4l2-core/tuner-core.c | 4 +- drivers/media/v4l2-core/v4l2-async.c | 3 +- drivers/media/v4l2-core/v4l2-dv-timings.c | 10 +- drivers/media/v4l2-core/v4l2-fwnode.c | 10 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 2 + drivers/media/v4l2-core/videobuf-core.c | 2 +- drivers/media/v4l2-core/videobuf-dma-sg.c | 5 +- drivers/media/v4l2-core/videobuf2-core.c | 56 +- drivers/media/v4l2-core/videobuf2-memops.c | 2 +- drivers/media/v4l2-core/videobuf2-v4l2.c | 10 +- drivers/mfd/arizona-irq.c | 4 +- drivers/mfd/cros_ec_spi.c | 53 +- drivers/mfd/rtsx_pcr.c | 3 + drivers/mfd/twl4030-audio.c | 9 +- drivers/mfd/twl6040.c | 12 +- drivers/misc/cxl/pci.c | 12 +- drivers/misc/eeprom/at24.c | 41 +- drivers/misc/pti.c | 2 +- drivers/mmc/core/block.c | 67 +- drivers/mmc/core/bus.c | 3 + drivers/mmc/core/card.h | 2 + drivers/mmc/core/debugfs.c | 1 + drivers/mmc/core/mmc.c | 6 +- drivers/mmc/core/quirks.h | 8 + drivers/mmc/core/sd.c | 2 +- drivers/mmc/host/sdhci-msm.c | 14 + drivers/mmc/host/sdhci.c | 28 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/mtdsuper.c | 6 +- drivers/mtd/nand/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/gpio.c | 6 +- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 6 +- drivers/mtd/nand/pxa3xx_nand.c | 1 + drivers/net/bonding/bond_netlink.c | 2 +- drivers/net/can/flexcan.c | 9 +- drivers/net/can/peak_canfd/peak_canfd.c | 9 +- drivers/net/can/peak_canfd/peak_pciefd_main.c | 5 +- drivers/net/can/sja1000/peak_pci.c | 5 +- drivers/net/can/ti_hecc.c | 3 + drivers/net/can/usb/ems_usb.c | 2 + drivers/net/can/usb/esd_usb2.c | 2 + drivers/net/can/usb/kvaser_usb.c | 13 +- drivers/net/can/usb/mcba_usb.c | 4 +- drivers/net/can/usb/usb_8dev.c | 2 + drivers/net/dsa/bcm_sf2.c | 1 - drivers/net/dsa/bcm_sf2_cfp.c | 4 +- drivers/net/dsa/mv88e6xxx/chip.c | 34 +- drivers/net/dsa/mv88e6xxx/port.c | 1 + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 5 +- .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 16 +- drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 29 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 82 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 2 +- .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 5 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 17 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 29 +- .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 6 + .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 80 +- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 6 +- drivers/net/ethernet/aquantia/atlantic/ver.h | 6 +- drivers/net/ethernet/arc/emac.h | 2 + drivers/net/ethernet/arc/emac_main.c | 164 ++- drivers/net/ethernet/arc/emac_rockchip.c | 13 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 14 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 55 +- drivers/net/ethernet/broadcom/tg3.c | 21 +- drivers/net/ethernet/broadcom/tg3.h | 7 +- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 3 +- drivers/net/ethernet/freescale/fec_main.c | 6 + drivers/net/ethernet/freescale/gianfar.c | 11 +- drivers/net/ethernet/intel/e1000/e1000_hw.c | 6 +- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 +- drivers/net/ethernet/intel/e1000e/netdev.c | 9 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 - drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- drivers/net/ethernet/marvell/mvmdio.c | 3 +- drivers/net/ethernet/marvell/mvneta.c | 8 +- drivers/net/ethernet/marvell/mvpp2.c | 50 +- drivers/net/ethernet/marvell/skge.c | 1 - drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +- drivers/net/ethernet/mellanox/mlx4/en_port.c | 57 +- drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 2 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 1 - drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 9 +- drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 10 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 63 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 20 +- drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.c | 6 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 16 +- drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 56 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 75 +- drivers/net/ethernet/mellanox/mlx5/core/qp.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/rl.c | 22 +- drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 64 +- drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 1 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 18 + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 124 +- drivers/net/ethernet/netronome/nfp/bpf/main.c | 55 +- drivers/net/ethernet/netronome/nfp/bpf/main.h | 8 + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 15 +- drivers/net/ethernet/nvidia/forcedeth.c | 4 +- drivers/net/ethernet/qualcomm/emac/emac-phy.c | 7 +- drivers/net/ethernet/qualcomm/emac/emac.c | 6 +- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 1 + .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 8 +- drivers/net/ethernet/renesas/ravb_main.c | 27 +- drivers/net/ethernet/renesas/sh_eth.c | 41 +- drivers/net/ethernet/sfc/tx.c | 5 +- drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 5 +- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 3 +- drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +- drivers/net/ethernet/via/via-rhine.c | 4 +- drivers/net/ethernet/xilinx/Kconfig | 1 + drivers/net/hippi/rrunner.c | 2 +- drivers/net/ipvlan/ipvlan_core.c | 1 + drivers/net/phy/at803x.c | 4 - drivers/net/phy/marvell.c | 18 +- drivers/net/phy/marvell10g.c | 5 +- drivers/net/phy/mdio-xgene.c | 21 +- drivers/net/phy/mdio_bus.c | 1 + drivers/net/phy/meson-gxl.c | 74 +- drivers/net/phy/micrel.c | 7 +- drivers/net/phy/phy.c | 9 +- drivers/net/phy/phy_device.c | 10 +- drivers/net/phy/phylink.c | 3 + drivers/net/phy/sfp.c | 41 +- drivers/net/tap.c | 14 +- drivers/net/thunderbolt.c | 57 +- drivers/net/tun.c | 24 +- drivers/net/usb/qmi_wwan.c | 4 + drivers/net/usb/usbnet.c | 5 +- drivers/net/virtio_net.c | 2 +- drivers/net/vxlan.c | 23 +- drivers/net/wan/lmc/lmc_main.c | 13 +- drivers/net/wireless/ath/ath9k/channel.c | 2 +- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +- drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 4 + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 2 - drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 18 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 53 +- .../net/wireless/intel/iwlwifi/mvm/time-event.c | 24 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 13 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 6 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 + drivers/net/wireless/mac80211_hwsim.c | 3 +- drivers/net/wireless/st/cw1200/sta.c | 4 +- drivers/net/wireless/ti/wl1251/main.c | 2 +- drivers/net/wireless/ti/wlcore/cmd.c | 5 +- drivers/net/xen-netback/interface.c | 2 +- drivers/net/xen-netfront.c | 18 + drivers/nvdimm/btt.c | 201 ++- drivers/nvdimm/btt.h | 47 +- drivers/nvdimm/pfn_devs.c | 20 +- drivers/nvme/host/core.c | 30 +- drivers/nvme/host/fabrics.h | 30 + drivers/nvme/host/fc.c | 22 +- drivers/nvme/host/multipath.c | 2 +- drivers/nvme/host/nvme.h | 2 +- drivers/nvme/host/pci.c | 17 +- drivers/nvme/host/rdma.c | 266 ++-- drivers/nvme/target/fc.c | 9 +- drivers/nvme/target/loop.c | 25 +- drivers/nvmem/meson-mx-efuse.c | 4 +- drivers/of/dynamic.c | 4 +- drivers/of/of_mdio.c | 3 + drivers/of/overlay.c | 84 +- drivers/of/unittest.c | 1 - drivers/parisc/dino.c | 10 +- drivers/parisc/eisa_eeprom.c | 2 +- drivers/parisc/lba_pci.c | 33 + drivers/pci/host/pci-hyperv.c | 8 +- drivers/pci/host/pcie-rcar.c | 8 +- drivers/pci/pci-driver.c | 9 +- drivers/phy/motorola/phy-cpcap-usb.c | 2 +- drivers/phy/renesas/Kconfig | 2 + drivers/phy/rockchip/phy-rockchip-typec.c | 2 + drivers/phy/tegra/xusb.c | 58 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 16 + drivers/pinctrl/intel/pinctrl-denverton.c | 2 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 13 +- drivers/pinctrl/pinctrl-gemini.c | 2 +- drivers/pinctrl/pinctrl-single.c | 5 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 6 +- drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 6 +- drivers/platform/x86/asus-wireless.c | 1 + drivers/platform/x86/dell-laptop.c | 17 + drivers/platform/x86/dell-wmi.c | 2 + drivers/s390/Makefile | 1 + drivers/s390/block/Kconfig | 1 + drivers/s390/block/dasd.c | 11 +- drivers/s390/block/dasd_3990_erp.c | 10 + drivers/s390/block/dasd_devmap.c | 1 + drivers/s390/block/dasd_diag.c | 1 + drivers/s390/block/dasd_eckd.c | 17 +- drivers/s390/block/dasd_fba.c | 1 + drivers/s390/block/dasd_int.h | 2 +- drivers/s390/block/dcssblk.c | 1 + drivers/s390/block/scm_blk.c | 1 + drivers/s390/block/xpram.c | 1 + drivers/s390/char/Kconfig | 1 + drivers/s390/char/Makefile | 2 + drivers/s390/char/defkeymap.map | 1 + drivers/s390/char/fs3270.c | 1 + drivers/s390/char/hmcdrv_mod.c | 1 + drivers/s390/char/monreader.c | 1 + drivers/s390/char/monwriter.c | 1 + drivers/s390/char/raw3270.c | 1 + drivers/s390/char/sclp_async.c | 1 + drivers/s390/char/tape_34xx.c | 1 + drivers/s390/char/tape_3590.c | 1 + drivers/s390/char/tape_class.c | 1 + drivers/s390/char/tape_core.c | 1 + drivers/s390/char/tty3270.c | 1 + drivers/s390/char/vmlogrdr.c | 1 + drivers/s390/char/vmur.c | 1 + drivers/s390/char/zcore.c | 2 +- drivers/s390/cio/blacklist.h | 1 + drivers/s390/cio/ccwgroup.c | 1 + drivers/s390/cio/chp.c | 1 + drivers/s390/cio/chsc.c | 1 + drivers/s390/cio/chsc_sch.c | 1 + drivers/s390/cio/cio.c | 1 + drivers/s390/cio/cmf.c | 15 +- drivers/s390/cio/css.c | 3 +- drivers/s390/cio/device.c | 3 +- drivers/s390/cio/device_fsm.c | 1 + drivers/s390/cio/device_ops.c | 3 +- drivers/s390/cio/eadm_sch.c | 1 + drivers/s390/cio/isc.c | 1 + drivers/s390/cio/qdio_main.c | 8 +- drivers/s390/cio/qdio_setup.c | 1 + drivers/s390/cio/scm.c | 1 + drivers/s390/cio/vfio_ccw_drv.c | 1 + drivers/s390/crypto/ap_bus.c | 15 +- drivers/s390/crypto/ap_bus.h | 15 +- drivers/s390/crypto/pkey_api.c | 6 +- drivers/s390/crypto/zcrypt_api.c | 19 +- drivers/s390/crypto/zcrypt_api.h | 15 +- drivers/s390/crypto/zcrypt_card.c | 11 +- drivers/s390/crypto/zcrypt_cca_key.h | 15 +- drivers/s390/crypto/zcrypt_cex2a.c | 15 +- drivers/s390/crypto/zcrypt_cex2a.h | 15 +- drivers/s390/crypto/zcrypt_cex4.c | 1 + drivers/s390/crypto/zcrypt_error.h | 15 +- drivers/s390/crypto/zcrypt_msgtype50.c | 15 +- drivers/s390/crypto/zcrypt_msgtype50.h | 15 +- drivers/s390/crypto/zcrypt_msgtype6.c | 15 +- drivers/s390/crypto/zcrypt_msgtype6.h | 15 +- drivers/s390/crypto/zcrypt_pcixcc.c | 15 +- drivers/s390/crypto/zcrypt_pcixcc.h | 15 +- drivers/s390/crypto/zcrypt_queue.c | 11 +- drivers/s390/net/Kconfig | 1 + drivers/s390/net/ctcm_main.c | 1 + drivers/s390/net/fsm.c | 1 + drivers/s390/net/lcs.c | 15 +- drivers/s390/net/netiucv.c | 16 +- drivers/s390/net/qeth_core.h | 9 +- drivers/s390/net/qeth_core_main.c | 47 +- drivers/s390/net/qeth_core_sys.c | 1 + drivers/s390/net/qeth_l2_main.c | 5 +- drivers/s390/net/qeth_l3.h | 2 +- drivers/s390/net/qeth_l3_main.c | 44 +- drivers/s390/net/qeth_l3_sys.c | 75 +- drivers/s390/net/smsgiucv.c | 15 +- drivers/s390/net/smsgiucv_app.c | 1 + drivers/s390/scsi/Makefile | 1 + drivers/s390/scsi/zfcp_aux.c | 1 + drivers/s390/virtio/Makefile | 5 +- drivers/s390/virtio/virtio_ccw.c | 5 +- drivers/scsi/aacraid/aacraid.h | 2 + drivers/scsi/aacraid/commsup.c | 43 +- drivers/scsi/aacraid/linit.c | 5 +- drivers/scsi/aacraid/rx.c | 15 +- drivers/scsi/aacraid/src.c | 20 +- drivers/scsi/bfa/bfad_bsg.c | 6 +- drivers/scsi/bfa/bfad_im.c | 6 +- drivers/scsi/bfa/bfad_im.h | 10 + drivers/scsi/libfc/fc_lport.c | 4 + drivers/scsi/libsas/sas_expander.c | 10 +- drivers/scsi/lpfc/lpfc_mem.c | 2 +- drivers/scsi/osd/osd_initiator.c | 4 +- drivers/scsi/scsi_debugfs.c | 6 +- drivers/scsi/scsi_devinfo.c | 33 +- drivers/scsi/scsi_lib.c | 12 +- drivers/scsi/scsi_scan.c | 13 +- drivers/scsi/scsi_sysfs.c | 10 +- drivers/scsi/scsi_transport_spi.c | 12 +- drivers/scsi/sd.c | 4 +- drivers/scsi/storvsc_drv.c | 3 +- drivers/scsi/ufs/ufshcd.c | 7 +- drivers/soc/amlogic/meson-gx-socinfo.c | 4 +- drivers/spi/spi-armada-3700.c | 8 + drivers/spi/spi-atmel.c | 2 +- drivers/spi/spi-rspi.c | 4 +- drivers/spi/spi-sun4i.c | 2 +- drivers/spi/spi-xilinx.c | 11 + drivers/staging/android/ion/Kconfig | 2 +- drivers/staging/android/ion/ion.c | 4 +- drivers/staging/android/ion/ion_cma_heap.c | 15 +- drivers/staging/ccree/ssi_hash.c | 11 +- drivers/staging/comedi/drivers/ni_atmio.c | 5 + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 23 +- drivers/staging/lustre/lnet/lnet/lib-socket.c | 8 +- drivers/staging/lustre/lustre/llite/file.c | 2 +- drivers/staging/lustre/lustre/llite/llite_lib.c | 14 +- .../staging/media/atomisp/include/linux/atomisp.h | 34 +- .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 2 +- .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 2 +- .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.h | 16 +- .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 2 +- .../atomisp2/css2400/base/circbuf/src/circbuf.c | 26 +- .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 34 +- .../camera/pipe/interface/ia_css_pipe_util.h | 2 +- .../css2400/camera/util/interface/ia_css_util.h | 18 +- .../css_2401_csi2p_system/host/csi_rx_private.h | 2 +- .../css_2401_csi2p_system/host/ibuf_ctrl_private.h | 4 +- .../css2400/css_2401_csi2p_system/host/isys_irq.c | 2 +- .../css_2401_csi2p_system/host/isys_irq_private.h | 4 +- .../host/isys_stream2mmio_private.h | 4 +- .../css_2401_csi2p_system/host/pixelgen_private.h | 2 +- .../css_2401_csi2p_system/isys_dma_global.h | 4 +- .../css_2401_csi2p_system/pixelgen_global.h | 2 +- .../css2400/css_2401_csi2p_system/system_global.h | 8 +- .../atomisp/pci/atomisp2/css2400/css_api_version.h | 2 +- .../css2400/hive_isp_css_common/host/gp_timer.c | 2 +- .../hive_isp_css_include/host/csi_rx_public.h | 4 +- .../hive_isp_css_include/host/ibuf_ctrl_public.h | 4 +- .../css2400/hive_isp_css_include/host/isp_op1w.h | 98 +- .../css2400/hive_isp_css_include/host/isp_op2w.h | 78 +- .../host/isys_stream2mmio_public.h | 4 +- .../hive_isp_css_include/host/pixelgen_public.h | 4 +- .../hive_isp_css_include/host/ref_vector_func.h | 144 +- .../css2400/hive_isp_css_include/math_support.h | 2 +- .../css2400/hive_isp_css_include/string_support.h | 8 +- .../css2400/hive_isp_css_shared/host/tag.c | 4 +- .../media/atomisp/pci/atomisp2/css2400/ia_css.h | 2 +- .../media/atomisp/pci/atomisp2/css2400/ia_css_3a.h | 38 +- .../pci/atomisp2/css2400/ia_css_acc_types.h | 216 +-- .../atomisp/pci/atomisp2/css2400/ia_css_buffer.h | 32 +- .../atomisp/pci/atomisp2/css2400/ia_css_control.h | 22 +- .../pci/atomisp2/css2400/ia_css_device_access.h | 2 +- .../atomisp/pci/atomisp2/css2400/ia_css_dvs.h | 52 +- .../atomisp/pci/atomisp2/css2400/ia_css_env.h | 40 +- .../atomisp/pci/atomisp2/css2400/ia_css_err.h | 18 +- .../pci/atomisp2/css2400/ia_css_event_public.h | 68 +- .../atomisp/pci/atomisp2/css2400/ia_css_firmware.h | 14 +- .../atomisp/pci/atomisp2/css2400/ia_css_frac.h | 10 +- .../pci/atomisp2/css2400/ia_css_frame_format.h | 62 +- .../pci/atomisp2/css2400/ia_css_frame_public.h | 120 +- .../pci/atomisp2/css2400/ia_css_input_port.h | 32 +- .../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 112 +- .../atomisp/pci/atomisp2/css2400/ia_css_metadata.h | 24 +- .../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 10 +- .../atomisp/pci/atomisp2/css2400/ia_css_mmu.h | 4 +- .../atomisp/pci/atomisp2/css2400/ia_css_morph.h | 6 +- .../pci/atomisp2/css2400/ia_css_pipe_public.h | 128 +- .../atomisp/pci/atomisp2/css2400/ia_css_prbs.h | 12 +- .../pci/atomisp2/css2400/ia_css_properties.h | 6 +- .../atomisp/pci/atomisp2/css2400/ia_css_shading.h | 6 +- .../atomisp/pci/atomisp2/css2400/ia_css_stream.h | 4 +- .../pci/atomisp2/css2400/ia_css_stream_format.h | 90 +- .../pci/atomisp2/css2400/ia_css_stream_public.h | 148 +-- .../atomisp/pci/atomisp2/css2400/ia_css_timer.h | 30 +- .../atomisp/pci/atomisp2/css2400/ia_css_tpg.h | 8 +- .../atomisp/pci/atomisp2/css2400/ia_css_types.h | 258 ++-- .../atomisp/pci/atomisp2/css2400/ia_css_version.h | 6 +- .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h | 6 +- .../isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 6 +- .../isp/kernels/anr/anr_2/ia_css_anr2_types.h | 4 +- .../isp/kernels/anr/anr_2/ia_css_anr_param.h | 2 +- .../bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h | 2 +- .../css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h | 4 +- .../css2400/isp/kernels/bnlm/ia_css_bnlm_types.h | 36 +- .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 34 +- .../isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 20 +- .../conversion_1.0/ia_css_conversion_types.h | 8 +- .../isp/kernels/crop/crop_1.0/ia_css_crop_param.h | 2 +- .../isp/kernels/crop/crop_1.0/ia_css_crop_types.h | 2 +- .../isp/kernels/csc/csc_1.0/ia_css_csc_types.h | 8 +- .../isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 12 +- .../isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 10 +- .../isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 38 +- .../isp/kernels/de/de_1.0/ia_css_de_types.h | 10 +- .../css2400/isp/kernels/de/de_2/ia_css_de2_types.h | 10 +- .../isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 8 +- .../css2400/isp/kernels/dpc2/ia_css_dpc2_types.h | 6 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 2 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 2 +- .../isp/kernels/eed1_8/ia_css_eed1_8_types.h | 82 +- .../isp/kernels/fc/fc_1.0/ia_css_formats_types.h | 6 +- .../isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 14 +- .../isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 32 +- .../css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h | 14 +- .../css2400/isp/kernels/hdr/ia_css_hdr_types.h | 26 +- .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 2 +- .../yuv444_io_ls/ia_css_yuv444_io.host.c | 2 +- .../kernels/macc/macc1_5/ia_css_macc1_5_types.h | 16 +- .../isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 12 +- .../css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h | 12 +- .../isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 26 +- .../output/output_1.0/ia_css_output_param.h | 2 +- .../output/output_1.0/ia_css_output_types.h | 8 +- .../kernels/qplane/qplane_2/ia_css_qplane_types.h | 2 +- .../isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 2 +- .../isp/kernels/ref/ref_1.0/ia_css_ref_param.h | 2 +- .../isp/kernels/ref/ref_1.0/ia_css_ref_types.h | 2 +- .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 98 +- .../kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h | 2 +- .../css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 4 +- .../isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 42 +- .../kernels/sdis/common/ia_css_sdis_common_types.h | 104 +- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 20 +- .../isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h | 40 +- .../isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 38 +- .../isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 26 +- .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 10 +- .../isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 4 +- .../isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 4 +- .../isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 14 +- .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 2 +- .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 2 +- .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 20 +- .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 30 +- .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 28 +- .../isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 40 +- .../yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h | 2 +- .../atomisp/pci/atomisp2/css2400/memory_realloc.c | 2 +- .../runtime/binary/interface/ia_css_binary.h | 2 +- .../atomisp2/css2400/runtime/binary/src/binary.c | 2 +- .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 2 +- .../css2400/runtime/debug/interface/ia_css_debug.h | 30 +- .../css2400/runtime/debug/src/ia_css_debug.c | 10 +- .../pci/atomisp2/css2400/runtime/event/src/event.c | 4 +- .../atomisp2/css2400/runtime/eventq/src/eventq.c | 2 +- .../css2400/runtime/frame/interface/ia_css_frame.h | 22 +- .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 2 +- .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 2 +- .../css2400/runtime/inputfifo/src/inputfifo.c | 2 +- .../isp_param/interface/ia_css_isp_param_types.h | 6 +- .../css2400/runtime/isp_param/src/isp_param.c | 2 +- .../css2400/runtime/isys/interface/ia_css_isys.h | 6 +- .../css2400/runtime/isys/src/csi_rx_rmgr.c | 2 +- .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c | 2 +- .../css2400/runtime/isys/src/isys_dma_rmgr.c | 2 +- .../atomisp2/css2400/runtime/isys/src/isys_init.c | 2 +- .../runtime/isys/src/isys_stream2mmio_rmgr.c | 2 +- .../pci/atomisp2/css2400/runtime/isys/src/rx.c | 2 +- .../css2400/runtime/isys/src/virtual_isys.c | 8 +- .../runtime/pipeline/interface/ia_css_pipeline.h | 28 +- .../css2400/runtime/pipeline/src/pipeline.c | 8 +- .../css2400/runtime/queue/interface/ia_css_queue.h | 22 +- .../css2400/runtime/queue/src/queue_access.c | 2 +- .../pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c | 4 +- .../atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 26 +- .../runtime/spctrl/interface/ia_css_spctrl.h | 20 +- .../runtime/spctrl/interface/ia_css_spctrl_comm.h | 14 +- .../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 4 +- .../pci/atomisp2/css2400/runtime/timer/src/timer.c | 2 +- .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 68 +- .../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 22 +- .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 2 +- .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 4 +- .../atomisp/pci/atomisp2/css2400/sh_css_params.h | 4 +- .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 18 +- .../atomisp/pci/atomisp2/css2400/sh_css_struct.h | 2 +- drivers/staging/octeon-usb/octeon-hcd.c | 6 +- drivers/staging/pi433/rf69.c | 2 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 14 +- drivers/target/target_core_pscsi.c | 4 +- drivers/tee/optee/core.c | 1 - drivers/thunderbolt/nhi.c | 2 +- drivers/tty/n_tty.c | 4 +- drivers/tty/serdev/serdev-ttyport.c | 26 +- drivers/tty/serial/8250/8250_early.c | 14 +- drivers/tty/serial/8250/8250_pci.c | 3 + drivers/usb/chipidea/ci_hdrc_msm.c | 2 +- drivers/usb/common/ulpi.c | 4 +- drivers/usb/core/config.c | 32 +- drivers/usb/core/devio.c | 14 +- drivers/usb/core/hub.c | 9 + drivers/usb/core/quirks.c | 9 +- drivers/usb/dwc2/core.h | 4 + drivers/usb/dwc2/gadget.c | 42 +- drivers/usb/dwc2/params.c | 29 +- drivers/usb/dwc3/dwc3-of-simple.c | 5 +- drivers/usb/dwc3/gadget.c | 4 +- drivers/usb/gadget/composite.c | 7 +- drivers/usb/gadget/function/f_fs.c | 15 +- drivers/usb/gadget/legacy/Kconfig | 2 +- drivers/usb/gadget/udc/bdc/bdc_core.c | 1 - drivers/usb/gadget/udc/core.c | 8 +- drivers/usb/gadget/udc/renesas_usb3.c | 2 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/xhci-debugfs.c | 16 +- drivers/usb/host/xhci-mem.c | 22 +- drivers/usb/host/xhci-pci.c | 3 + drivers/usb/host/xhci-ring.c | 18 +- drivers/usb/host/xhci.c | 6 +- drivers/usb/musb/da8xx.c | 10 +- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 6 + drivers/usb/serial/option.c | 20 + drivers/usb/serial/qcserial.c | 3 + drivers/usb/serial/usb_debug.c | 2 + drivers/usb/storage/uas-detect.h | 4 + drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/storage/unusual_uas.h | 7 + drivers/usb/typec/Kconfig | 54 +- drivers/usb/typec/ucsi/Kconfig | 1 - drivers/usb/usbip/stub_dev.c | 3 +- drivers/usb/usbip/stub_main.c | 5 +- drivers/usb/usbip/stub_rx.c | 47 +- drivers/usb/usbip/stub_tx.c | 13 +- drivers/usb/usbip/usbip_common.c | 16 +- drivers/usb/usbip/usbip_common.h | 1 + drivers/usb/usbip/vhci_hcd.c | 13 +- drivers/usb/usbip/vhci_rx.c | 23 +- drivers/usb/usbip/vhci_sysfs.c | 25 +- drivers/usb/usbip/vhci_tx.c | 3 +- drivers/vhost/net.c | 20 +- drivers/virtio/virtio.c | 2 + drivers/virtio/virtio_balloon.c | 3 +- drivers/virtio/virtio_mmio.c | 22 +- drivers/xen/Kconfig | 2 +- drivers/xen/balloon.c | 65 +- drivers/xen/pvcalls-front.c | 6 +- fs/9p/vfs_super.c | 6 +- fs/adfs/super.c | 4 +- fs/affs/amigaffs.c | 2 +- fs/affs/bitmap.c | 6 +- fs/affs/super.c | 16 +- fs/afs/dir.c | 37 +- fs/afs/inode.c | 4 + fs/afs/internal.h | 5 +- fs/afs/rxrpc.c | 2 +- fs/afs/security.c | 18 +- fs/afs/super.c | 18 +- fs/afs/write.c | 8 +- fs/autofs4/root.c | 17 +- fs/autofs4/waitq.c | 1 - fs/befs/ChangeLog | 2 +- fs/befs/linuxvfs.c | 4 +- fs/btrfs/compression.c | 9 +- fs/btrfs/compression.h | 5 +- fs/btrfs/ctree.c | 18 +- fs/btrfs/ctree.h | 3 +- fs/btrfs/delayed-inode.c | 45 +- fs/btrfs/disk-io.c | 22 +- fs/btrfs/extent-tree.c | 15 +- fs/btrfs/extent_io.c | 4 +- fs/btrfs/extent_io.h | 8 +- fs/btrfs/file.c | 130 +- fs/btrfs/free-space-cache.c | 3 +- fs/btrfs/inode.c | 36 +- fs/btrfs/ioctl.c | 6 +- fs/btrfs/relocation.c | 3 +- fs/btrfs/send.c | 124 +- fs/btrfs/super.c | 63 +- fs/btrfs/tests/extent-io-tests.c | 6 +- fs/btrfs/tests/inode-tests.c | 12 +- fs/btrfs/tree-checker.c | 27 +- fs/btrfs/tree-checker.h | 14 +- fs/btrfs/tree-log.c | 2 +- fs/btrfs/volumes.c | 37 +- fs/ceph/mds_client.c | 42 +- fs/ceph/super.c | 8 +- fs/cifs/cifs_fs_sb.h | 2 +- fs/cifs/cifsfs.c | 12 +- fs/cifs/cifsglob.h | 4 +- fs/cifs/inode.c | 2 +- fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 30 +- fs/cifs/xattr.c | 8 +- fs/coda/inode.c | 4 +- fs/cramfs/Kconfig | 1 + fs/cramfs/inode.c | 4 +- fs/ecryptfs/main.c | 8 +- fs/efs/super.c | 4 +- fs/exec.c | 16 +- fs/ext2/balloc.c | 4 +- fs/ext2/ialloc.c | 4 +- fs/ext2/super.c | 20 +- fs/ext4/extents.c | 1 + fs/ext4/ialloc.c | 2 + fs/ext4/inode.c | 13 +- fs/ext4/namei.c | 4 + fs/ext4/super.c | 52 +- fs/f2fs/checkpoint.c | 10 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/gc.c | 2 +- fs/f2fs/recovery.c | 10 +- fs/f2fs/super.c | 28 +- fs/fat/fatent.c | 6 +- fs/fat/inode.c | 10 +- fs/fat/misc.c | 2 +- fs/fat/namei_msdos.c | 2 +- fs/freevxfs/vxfs_super.c | 4 +- fs/fs-writeback.c | 2 +- fs/fuse/inode.c | 12 +- fs/gfs2/ops_fstype.c | 16 +- fs/gfs2/super.c | 10 +- fs/gfs2/trans.c | 2 +- fs/hfs/mdb.c | 4 +- fs/hfs/super.c | 16 +- fs/hfsplus/super.c | 22 +- fs/hpfs/dir.c | 1 - fs/hpfs/dnode.c | 2 - fs/hpfs/map.c | 2 +- fs/hpfs/super.c | 9 +- fs/hugetlbfs/inode.c | 4 +- fs/inode.c | 10 +- fs/isofs/inode.c | 2 +- fs/jffs2/fs.c | 4 +- fs/jffs2/os-linux.h | 2 +- fs/jffs2/super.c | 4 +- fs/jfs/super.c | 10 +- fs/kernfs/mount.c | 2 +- fs/libfs.c | 6 +- fs/lockd/host.c | 24 +- fs/lockd/mon.c | 3 +- fs/lockd/svc.c | 38 +- fs/lockd/svcsubs.c | 2 +- fs/locks.c | 2 +- fs/mbcache.c | 3 + fs/minix/inode.c | 4 +- fs/namei.c | 15 +- fs/namespace.c | 1 + fs/ncpfs/inode.c | 4 +- fs/nfs/client.c | 11 + fs/nfs/dir.c | 2 +- fs/nfs/inode.c | 2 +- fs/nfs/internal.h | 2 +- fs/nfs/nfs4client.c | 17 +- fs/nfs/nfs4state.c | 4 +- fs/nfs/super.c | 22 +- fs/nfs/write.c | 2 + fs/nfs_common/grace.c | 10 +- fs/nfsd/auth.c | 3 + fs/nfsd/export.c | 10 +- fs/nfsd/netns.h | 3 + fs/nfsd/nfs4idmap.c | 4 +- fs/nfsd/nfs4state.c | 279 ++-- fs/nfsd/nfsctl.c | 3 + fs/nfsd/nfssvc.c | 14 +- fs/nilfs2/segment.c | 2 +- fs/nilfs2/super.c | 24 +- fs/nilfs2/the_nilfs.c | 6 +- fs/notify/fsnotify.c | 2 +- fs/nsfs.c | 2 +- fs/ntfs/super.c | 32 +- fs/ocfs2/file.c | 2 +- fs/ocfs2/super.c | 28 +- fs/ocfs2/xattr.c | 2 +- fs/openpromfs/inode.c | 4 +- fs/orangefs/super.c | 8 +- fs/overlayfs/Kconfig | 10 + fs/overlayfs/dir.c | 3 +- fs/overlayfs/namei.c | 18 +- fs/overlayfs/overlayfs.h | 2 +- fs/overlayfs/ovl_entry.h | 2 + fs/overlayfs/readdir.c | 7 +- fs/overlayfs/super.c | 97 +- fs/proc/base.c | 5 +- fs/proc/inode.c | 2 +- fs/proc/root.c | 2 +- fs/proc_namespace.c | 8 +- fs/qnx4/inode.c | 4 +- fs/qnx6/inode.c | 4 +- fs/quota/dquot.c | 22 +- fs/reiserfs/inode.c | 2 +- fs/reiserfs/journal.c | 6 +- fs/reiserfs/prints.c | 4 +- fs/reiserfs/super.c | 19 +- fs/reiserfs/xattr.c | 10 +- fs/romfs/super.c | 4 +- fs/squashfs/super.c | 4 +- fs/statfs.c | 6 +- fs/super.c | 43 +- fs/sysfs/mount.c | 2 +- fs/sysv/inode.c | 2 +- fs/sysv/super.c | 2 +- fs/ubifs/file.c | 2 +- fs/ubifs/io.c | 2 +- fs/ubifs/super.c | 20 +- fs/ubifs/ubifs.h | 4 +- fs/udf/super.c | 6 +- fs/ufs/balloc.c | 8 +- fs/ufs/ialloc.c | 10 +- fs/ufs/super.c | 30 +- fs/userfaultfd.c | 20 +- fs/xfs/libxfs/xfs_alloc.c | 4 +- fs/xfs/libxfs/xfs_attr.c | 20 +- fs/xfs/libxfs/xfs_attr_leaf.c | 9 +- fs/xfs/libxfs/xfs_attr_leaf.h | 3 +- fs/xfs/libxfs/xfs_bmap.c | 8 +- fs/xfs/libxfs/xfs_defer.c | 39 +- fs/xfs/libxfs/xfs_defer.h | 5 +- fs/xfs/libxfs/xfs_ialloc.c | 10 +- fs/xfs/libxfs/xfs_ialloc.h | 1 - fs/xfs/libxfs/xfs_iext_tree.c | 4 +- fs/xfs/libxfs/xfs_refcount.c | 52 +- fs/xfs/libxfs/xfs_rmap.c | 99 +- fs/xfs/libxfs/xfs_rmap.h | 16 +- fs/xfs/scrub/inode.c | 14 +- fs/xfs/scrub/quota.c | 4 +- fs/xfs/scrub/scrub.c | 1 - fs/xfs/scrub/trace.c | 1 - fs/xfs/xfs_aops.c | 12 +- fs/xfs/xfs_bmap_item.c | 23 +- fs/xfs/xfs_bmap_item.h | 3 +- fs/xfs/xfs_buf.c | 15 +- fs/xfs/xfs_dquot.c | 14 +- fs/xfs/xfs_dquot_item.c | 40 +- fs/xfs/xfs_extfree_item.c | 2 +- fs/xfs/xfs_fsops.c | 5 + fs/xfs/xfs_icache.c | 35 +- fs/xfs/xfs_icache.h | 1 + fs/xfs/xfs_inode.c | 82 +- fs/xfs/xfs_inode.h | 3 +- fs/xfs/xfs_iomap.c | 4 +- fs/xfs/xfs_log.c | 6 +- fs/xfs/xfs_log_recover.c | 75 +- fs/xfs/xfs_qm.c | 50 +- fs/xfs/xfs_refcount_item.c | 21 +- fs/xfs/xfs_refcount_item.h | 3 +- fs/xfs/xfs_reflink.c | 23 +- fs/xfs/xfs_super.c | 17 +- fs/xfs/xfs_super.h | 2 +- fs/xfs/xfs_symlink.c | 15 +- fs/xfs/xfs_trace.c | 1 - include/acpi/acpi_bus.h | 1 + include/acpi/acpi_drivers.h | 1 + include/asm-generic/mm_hooks.h | 5 +- include/asm-generic/pgtable.h | 17 +- include/crypto/if_alg.h | 6 +- include/crypto/internal/hash.h | 8 + include/crypto/mcryptd.h | 1 + include/drm/drm_connector.h | 10 + include/drm/drm_edid.h | 5 +- include/drm/drm_mode_config.h | 18 +- include/drm/ttm/ttm_page_alloc.h | 32 +- include/kvm/arm_arch_timer.h | 5 +- include/linux/bio.h | 2 + include/linux/blk_types.h | 9 +- include/linux/blkdev.h | 25 +- include/linux/bpf.h | 10 + include/linux/bpf_verifier.h | 4 +- include/linux/compiler.h | 47 +- include/linux/completion.h | 45 - include/linux/cpuhotplug.h | 2 +- include/linux/cred.h | 1 + include/linux/debugfs.h | 2 + include/linux/dma-mapping.h | 2 - include/linux/efi.h | 4 +- include/linux/fs.h | 19 +- include/linux/fscache.h | 2 +- include/linux/gpio/driver.h | 33 +- include/linux/hugetlb.h | 8 - include/linux/hyperv.h | 1 + include/linux/idr.h | 1 + include/linux/iio/adc/stm32-dfsdm-adc.h | 18 + include/linux/iio/consumer.h | 37 + include/linux/iio/hw-consumer.h | 21 + include/linux/iio/iio.h | 28 - include/linux/iio/timer/stm32-lptim-trigger.h | 5 +- include/linux/iio/types.h | 28 + include/linux/intel-pti.h | 43 + include/linux/ipv6.h | 3 +- include/linux/irq.h | 17 + include/linux/irqdesc.h | 15 +- include/linux/irqdomain.h | 2 +- include/linux/kallsyms.h | 6 - include/linux/kmemcheck.h | 1 - include/linux/kvm_host.h | 5 +- include/{lib => linux}/libgcc.h | 0 include/linux/lockdep.h | 125 -- include/linux/mfd/rtsx_pci.h | 2 +- include/linux/migrate.h | 2 +- include/linux/mlx5/driver.h | 7 +- include/linux/mlx5/mlx5_ifc.h | 8 +- include/linux/mm.h | 14 + include/linux/oom.h | 9 + include/linux/pci.h | 3 + include/linux/perf_event.h | 6 +- include/linux/pm.h | 1 + include/linux/pti.h | 50 +- include/linux/ptr_ring.h | 9 + include/linux/rbtree.h | 2 + include/linux/rculist_nulls.h | 38 - include/linux/rwlock_types.h | 3 - include/linux/sched.h | 17 +- include/linux/sched/coredump.h | 1 + include/linux/serdev.h | 2 +- include/linux/skbuff.h | 3 +- include/linux/spi/spi.h | 2 +- include/linux/spinlock.h | 5 - include/linux/spinlock_types.h | 3 - include/linux/string.h | 5 +- include/linux/sunrpc/cache.h | 2 +- include/linux/sysfs.h | 6 + include/linux/tcp.h | 3 +- include/linux/tick.h | 1 + include/linux/timer.h | 4 +- include/linux/trace.h | 2 +- include/linux/usb/usbnet.h | 1 + include/net/cfg80211.h | 1 - include/net/gue.h | 18 +- include/net/ip.h | 1 + include/net/mac80211.h | 8 +- include/net/pkt_cls.h | 5 +- include/net/red.h | 13 +- include/net/sch_generic.h | 1 + include/net/sctp/checksum.h | 13 +- include/net/sctp/sctp.h | 5 + include/net/sctp/stream_sched.h | 5 + include/net/sctp/structs.h | 3 +- include/net/sock.h | 11 +- include/net/tc_act/tc_sample.h | 1 - include/net/tcp.h | 5 +- include/net/xfrm.h | 3 + include/scsi/libsas.h | 2 +- include/sound/hdaudio_ext.h | 4 +- include/sound/pcm.h | 8 + include/sound/rt5514.h | 2 + include/sound/rt5645.h | 3 + include/sound/soc-acpi-intel-match.h | 1 + include/sound/soc-acpi.h | 4 +- include/sound/soc-dai.h | 5 +- include/sound/soc.h | 6 +- include/trace/events/clk.h | 4 +- include/trace/events/kvm.h | 7 +- include/trace/events/preemptirq.h | 11 +- include/trace/events/rxrpc.h | 86 +- include/trace/events/tcp.h | 97 +- include/trace/events/xdp.h | 1 + include/uapi/asm-generic/bpf_perf_event.h | 9 + include/uapi/linux/bcache.h | 2 +- include/uapi/linux/bfs_fs.h | 2 +- include/uapi/linux/bpf_perf_event.h | 5 +- include/uapi/linux/kfd_ioctl.h | 22 +- include/uapi/linux/kvm.h | 4 +- include/uapi/linux/pkt_sched.h | 1 - include/uapi/linux/rtnetlink.h | 1 + include/uapi/linux/rxrpc.h | 1 + include/uapi/linux/usb/ch9.h | 3 + include/uapi/linux/vm_sockets_diag.h | 1 + include/uapi/sound/asound.h | 9 + include/uapi/sound/snd_sst_tokens.h | 17 +- include/xen/balloon.h | 5 + init/Kconfig | 6 +- init/main.c | 16 +- ipc/mqueue.c | 2 +- kernel/acct.c | 2 +- kernel/bpf/core.c | 3 +- kernel/bpf/hashtab.c | 2 + kernel/bpf/inode.c | 40 +- kernel/bpf/offload.c | 15 + kernel/bpf/syscall.c | 2 +- kernel/bpf/verifier.c | 283 ++-- kernel/cgroup/debug.c | 4 +- kernel/cgroup/stat.c | 8 +- kernel/cpu.c | 26 +- kernel/debug/kdb/kdb_io.c | 2 +- kernel/events/core.c | 7 +- kernel/exit.c | 9 + kernel/fork.c | 3 +- kernel/futex.c | 4 +- kernel/groups.c | 5 +- kernel/irq/debug.h | 5 + kernel/irq/debugfs.c | 1 + kernel/irq/generic-chip.c | 11 +- kernel/irq/internals.h | 2 +- kernel/irq/irqdomain.c | 13 +- kernel/irq/matrix.c | 4 +- kernel/irq/msi.c | 64 +- kernel/kallsyms.c | 8 +- kernel/kcov.c | 4 +- kernel/locking/lockdep.c | 651 +-------- kernel/locking/spinlock.c | 13 +- kernel/module.c | 6 +- kernel/pid.c | 8 +- kernel/printk/printk.c | 3 - kernel/sched/core.c | 22 +- kernel/sched/cpufreq_schedutil.c | 2 +- kernel/sched/fair.c | 102 +- kernel/sched/rt.c | 8 +- kernel/sched/wait.c | 2 +- kernel/time/Kconfig | 1 + kernel/time/posix-timers.c | 29 +- kernel/time/tick-sched.c | 32 +- kernel/time/timer.c | 35 +- kernel/trace/Kconfig | 1 + kernel/trace/blktrace.c | 30 +- kernel/trace/bpf_trace.c | 27 +- kernel/trace/ring_buffer.c | 18 +- kernel/trace/trace.c | 54 +- kernel/trace/trace_stack.c | 4 + kernel/uid16.c | 1 + kernel/workqueue.c | 33 +- lib/Kconfig.debug | 33 - lib/ashldi3.c | 2 +- lib/ashrdi3.c | 2 +- lib/asn1_decoder.c | 49 +- lib/cmpdi2.c | 2 +- lib/kobject_uevent.c | 16 +- lib/lshrdi3.c | 2 +- lib/mpi/longlong.h | 18 +- lib/muldi3.c | 2 +- lib/nlattr.c | 22 +- lib/oid_registry.c | 16 +- lib/rbtree.c | 10 + lib/test_bpf.c | 43 + lib/test_printf.c | 108 +- lib/timerqueue.c | 8 +- lib/ucmpdi2.c | 2 +- lib/vsprintf.c | 194 ++- mm/backing-dev.c | 17 +- mm/debug.c | 28 +- mm/early_ioremap.c | 2 +- mm/frame_vector.c | 14 + mm/gup.c | 64 + mm/huge_memory.c | 36 +- mm/hugetlb.c | 12 +- mm/kasan/report.c | 8 +- mm/kmemcheck.c | 1 - mm/kmemleak.c | 2 + mm/madvise.c | 4 +- mm/memcontrol.c | 2 +- mm/memory.c | 3 +- mm/mmap.c | 18 +- mm/mprotect.c | 6 +- mm/oom_kill.c | 11 +- mm/page-writeback.c | 5 +- mm/page_alloc.c | 26 +- mm/percpu.c | 4 + mm/shmem.c | 10 +- mm/slab.c | 23 +- mm/sparse.c | 2 +- mm/vmscan.c | 3 + mm/zsmalloc.c | 1 + net/9p/trans_fd.c | 1 - net/batman-adv/bat_iv_ogm.c | 4 +- net/batman-adv/bat_v.c | 2 +- net/batman-adv/fragmentation.c | 2 + net/batman-adv/tp_meter.c | 4 +- net/bridge/br_netlink.c | 11 +- net/core/dev.c | 4 +- net/core/net_namespace.c | 2 +- net/core/netprio_cgroup.c | 1 - net/core/skbuff.c | 17 +- net/dccp/minisocks.c | 6 + net/dccp/proto.c | 5 + net/dsa/dsa2.c | 25 +- net/dsa/slave.c | 1 - net/ipv4/devinet.c | 2 +- net/ipv4/fib_frontend.c | 9 +- net/ipv4/fib_semantics.c | 8 +- net/ipv4/igmp.c | 44 +- net/ipv4/inet_timewait_sock.c | 6 +- net/ipv4/ip_gre.c | 3 +- net/ipv4/ip_tunnel.c | 4 +- net/ipv4/netfilter/arp_tables.c | 1 - net/ipv4/netfilter/ip_tables.c | 1 - net/ipv4/netfilter/ipt_CLUSTERIP.c | 3 +- net/ipv4/raw.c | 15 +- net/ipv4/tcp.c | 1 + net/ipv4/tcp_bbr.c | 12 +- net/ipv4/tcp_input.c | 22 +- net/ipv4/tcp_ipv4.c | 61 +- net/ipv4/tcp_minisocks.c | 6 + net/ipv4/tcp_rate.c | 10 +- net/ipv4/tcp_recovery.c | 28 +- net/ipv4/tcp_timer.c | 2 + net/ipv4/xfrm4_input.c | 12 +- net/ipv6/af_inet6.c | 1 - net/ipv6/ip6_gre.c | 58 +- net/ipv6/ip6_output.c | 12 +- net/ipv6/ip6_tunnel.c | 11 +- net/ipv6/ipv6_sockglue.c | 1 + net/ipv6/mcast.c | 25 +- net/ipv6/netfilter/ip6_tables.c | 1 - net/ipv6/netfilter/ip6t_MASQUERADE.c | 8 +- net/ipv6/route.c | 20 +- net/ipv6/sit.c | 1 + net/ipv6/tcp_ipv6.c | 13 +- net/ipv6/xfrm6_input.c | 10 +- net/kcm/kcmsock.c | 68 +- net/mac80211/ht.c | 7 +- net/mac80211/mesh_hwmp.c | 15 +- net/mac80211/mlme.c | 2 +- net/mac80211/tx.c | 29 +- net/netfilter/nf_conntrack_h323_asn1.c | 128 +- net/netfilter/nf_conntrack_netlink.c | 13 +- net/netfilter/nf_conntrack_proto_tcp.c | 3 + net/netfilter/nf_tables_api.c | 7 + net/netfilter/nfnetlink_cthelper.c | 10 + net/netfilter/nfnetlink_log.c | 5 + net/netfilter/nfnetlink_queue.c | 5 + net/netfilter/nft_exthdr.c | 2 + net/netfilter/x_tables.c | 9 + net/netfilter/xt_bpf.c | 20 +- net/netfilter/xt_osf.c | 7 + net/netlink/af_netlink.c | 3 + net/openvswitch/datapath.c | 2 +- net/openvswitch/flow.c | 15 +- net/openvswitch/flow_netlink.c | 16 +- net/packet/af_packet.c | 37 +- net/packet/internal.h | 1 - net/rds/rdma.c | 2 +- net/rds/send.c | 3 + net/rxrpc/af_rxrpc.c | 24 +- net/rxrpc/ar-internal.h | 103 +- net/rxrpc/call_accept.c | 2 +- net/rxrpc/call_event.c | 229 ++-- net/rxrpc/call_object.c | 62 +- net/rxrpc/conn_client.c | 54 +- net/rxrpc/conn_event.c | 124 +- net/rxrpc/conn_object.c | 76 +- net/rxrpc/input.c | 76 +- net/rxrpc/misc.c | 19 +- net/rxrpc/net_ns.c | 33 +- net/rxrpc/output.c | 43 +- net/rxrpc/recvmsg.c | 12 +- net/rxrpc/sendmsg.c | 126 +- net/rxrpc/sysctl.c | 60 +- net/sched/act_meta_mark.c | 1 - net/sched/act_meta_skbtcindex.c | 1 - net/sched/act_sample.c | 14 +- net/sched/cls_api.c | 20 +- net/sched/cls_bpf.c | 116 +- net/sched/cls_u32.c | 1 - net/sched/sch_api.c | 2 + net/sched/sch_cbq.c | 9 +- net/sched/sch_choke.c | 3 + net/sched/sch_generic.c | 7 +- net/sched/sch_gred.c | 3 + net/sched/sch_ingress.c | 15 +- net/sched/sch_red.c | 33 +- net/sched/sch_sfq.c | 4 + net/sctp/chunk.c | 11 + net/sctp/debug.c | 3 + net/sctp/outqueue.c | 19 +- net/sctp/protocol.c | 1 + net/sctp/socket.c | 17 +- net/sctp/stream.c | 79 +- net/sctp/stream_sched.c | 25 +- net/sctp/stream_sched_prio.c | 7 +- net/sctp/stream_sched_rr.c | 7 +- net/sctp/ulpqueue.c | 24 +- net/socket.c | 110 +- net/strparser/strparser.c | 2 +- net/sunrpc/auth_gss/gss_rpc_xdr.c | 1 + net/sunrpc/auth_gss/svcauth_gss.c | 5 +- net/sunrpc/cache.c | 2 +- net/sunrpc/clnt.c | 5 + net/sunrpc/svcauth_unix.c | 6 +- net/sunrpc/xprt.c | 28 +- net/sunrpc/xprtrdma/rpc_rdma.c | 6 +- net/sunrpc/xprtrdma/transport.c | 2 + net/sunrpc/xprtrdma/verbs.c | 2 +- net/sunrpc/xprtrdma/xprt_rdma.h | 1 + net/sunrpc/xprtsock.c | 2 + net/tipc/bearer.c | 5 +- net/tipc/group.c | 49 +- net/tipc/monitor.c | 6 +- net/tipc/server.c | 3 +- net/tipc/socket.c | 4 +- net/tipc/udp_media.c | 4 - net/vmw_vsock/hyperv_transport.c | 2 +- net/vmw_vsock/vmci_transport.c | 14 +- net/wireless/Kconfig | 7 + net/wireless/Makefile | 39 +- net/wireless/certs/sforshee.hex | 86 ++ net/wireless/certs/sforshee.x509 | Bin 680 -> 0 bytes net/wireless/nl80211.c | 6 +- net/xfrm/xfrm_input.c | 69 +- net/xfrm/xfrm_policy.c | 9 +- net/xfrm/xfrm_state.c | 1 + net/xfrm/xfrm_user.c | 26 +- samples/bpf/bpf_load.c | 14 +- scripts/bloat-o-meter | 7 +- scripts/checkpatch.pl | 24 +- scripts/faddr2line | 21 +- scripts/kernel-doc | 2 +- security/Kconfig | 11 + security/apparmor/apparmorfs.c | 2 +- security/apparmor/include/audit.h | 12 +- security/apparmor/include/lib.h | 2 +- security/apparmor/mount.c | 12 +- security/commoncap.c | 21 +- security/keys/key.c | 1 - security/keys/keyctl.c | 24 +- security/keys/request_key.c | 48 +- sound/core/pcm.c | 2 + sound/core/pcm_misc.c | 19 +- sound/core/rawmidi.c | 15 +- sound/core/seq/seq_timer.c | 2 +- sound/hda/ext/hdac_ext_bus.c | 2 +- sound/hda/hdac_i915.c | 2 +- sound/pci/hda/patch_conexant.c | 29 + sound/pci/hda/patch_hdmi.c | 6 +- sound/pci/hda/patch_realtek.c | 57 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/amd/acp-pcm-dma.c | 42 +- sound/soc/atmel/Kconfig | 2 +- sound/soc/atmel/atmel-classd.c | 6 - sound/soc/cirrus/ep93xx-ac97.c | 6 +- sound/soc/codecs/88pm860x-codec.c | 9 +- sound/soc/codecs/Kconfig | 38 +- sound/soc/codecs/Makefile | 11 +- sound/soc/codecs/cq93vc.c | 10 +- sound/soc/codecs/cs35l32.c | 18 +- sound/soc/codecs/cs35l34.c | 19 +- sound/soc/codecs/cs42l52.c | 13 +- sound/soc/codecs/cs42l56.c | 13 +- sound/soc/codecs/cs42l73.c | 13 +- sound/soc/codecs/cs47l24.c | 12 +- sound/soc/codecs/cx20442.c | 44 +- sound/soc/codecs/da7213.c | 7 +- sound/soc/codecs/da7218.c | 11 +- sound/soc/codecs/dmic.c | 24 +- sound/soc/codecs/hdac_hdmi.c | 358 +++-- sound/soc/codecs/max98373.c | 976 ++++++++++++++ sound/soc/codecs/max98373.h | 212 +++ sound/soc/codecs/max98926.c | 2 +- sound/soc/codecs/max98927.c | 1 - sound/soc/codecs/mc13783.c | 9 +- sound/soc/codecs/msm8916-wcd-analog.c | 10 +- sound/soc/codecs/msm8916-wcd-digital.c | 4 +- sound/soc/codecs/nau8540.c | 98 +- sound/soc/codecs/nau8540.h | 20 + sound/soc/codecs/nau8824.c | 18 +- sound/soc/codecs/nau8825.c | 102 +- sound/soc/codecs/nau8825.h | 3 +- sound/soc/codecs/pcm186x-i2c.c | 69 + sound/soc/codecs/pcm186x-spi.c | 69 + sound/soc/codecs/pcm186x.c | 719 ++++++++++ sound/soc/codecs/pcm186x.h | 220 ++++ sound/soc/codecs/pcm512x-spi.c | 4 + sound/soc/codecs/rl6231.c | 93 +- sound/soc/codecs/rt5514-spi.c | 16 +- sound/soc/codecs/rt5514.c | 87 +- sound/soc/codecs/rt5514.h | 5 +- sound/soc/codecs/rt5645.c | 189 ++- sound/soc/codecs/rt5645.h | 6 + sound/soc/codecs/rt5663.c | 4 + sound/soc/codecs/rt5663.h | 4 + sound/soc/codecs/si476x.c | 9 +- sound/soc/codecs/sn95031.c | 936 ------------- sound/soc/codecs/sn95031.h | 133 -- sound/soc/codecs/spdif_receiver.c | 5 +- sound/soc/codecs/spdif_transmitter.c | 5 +- sound/soc/codecs/tas5720.c | 61 +- sound/soc/codecs/tas5720.h | 31 + sound/soc/codecs/tas6424.c | 707 ++++++++++ sound/soc/codecs/tas6424.h | 144 ++ sound/soc/codecs/tfa9879.c | 1 + sound/soc/codecs/tlv320aic31xx.c | 310 ++--- sound/soc/codecs/tlv320aic31xx.h | 335 ++--- sound/soc/codecs/tlv320aic32x4.c | 182 +-- sound/soc/codecs/tlv320aic32x4.h | 308 +++-- sound/soc/codecs/tlv320aic3x.c | 15 +- sound/soc/codecs/tlv320dac33.c | 45 +- sound/soc/codecs/ts3a227e.c | 2 +- sound/soc/codecs/tscs42xx.c | 50 +- sound/soc/codecs/twl4030.c | 15 +- sound/soc/codecs/twl6040.c | 20 +- sound/soc/codecs/uda1380.c | 44 +- sound/soc/codecs/wm0010.c | 5 +- sound/soc/codecs/wm2000.c | 6 +- sound/soc/codecs/wm2200.c | 9 +- sound/soc/codecs/wm5102.c | 11 +- sound/soc/codecs/wm5110.c | 12 +- sound/soc/codecs/wm8350.c | 10 +- sound/soc/codecs/wm8400.c | 9 +- sound/soc/codecs/wm8903.c | 12 +- sound/soc/codecs/wm8994.c | 10 +- sound/soc/codecs/wm8997.c | 11 +- sound/soc/codecs/wm8998.c | 12 +- sound/soc/codecs/wm_adsp.c | 12 +- sound/soc/davinci/davinci-mcasp.c | 19 + sound/soc/fsl/eukrea-tlv320.c | 1 - sound/soc/fsl/fsl-asoc-card.c | 4 +- sound/soc/fsl/fsl_asrc.h | 6 +- sound/soc/fsl/fsl_dma.c | 4 +- sound/soc/fsl/fsl_ssi.c | 1393 ++++++++++---------- sound/soc/fsl/fsl_ssi.h | 427 +++--- sound/soc/fsl/fsl_ssi_dbg.c | 59 +- sound/soc/hisilicon/hi6210-i2s.c | 1 - sound/soc/intel/Kconfig | 116 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/sst/sst_acpi.c | 3 + sound/soc/intel/atom/sst/sst_stream.c | 8 +- sound/soc/intel/boards/Kconfig | 194 ++- sound/soc/intel/boards/bytcr_rt5651.c | 46 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 7 + sound/soc/intel/boards/haswell.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 4 +- sound/soc/intel/boards/mfld_machine.c | 428 ------ sound/soc/intel/common/sst-dsp.c | 4 +- sound/soc/intel/skylake/bxt-sst.c | 2 +- sound/soc/intel/skylake/cnl-sst.c | 2 +- sound/soc/intel/skylake/skl-i2s.h | 64 + sound/soc/intel/skylake/skl-messages.c | 22 + sound/soc/intel/skylake/skl-nhlt.c | 173 ++- sound/soc/intel/skylake/skl-pcm.c | 14 +- sound/soc/intel/skylake/skl-ssp-clk.h | 79 ++ sound/soc/intel/skylake/skl-sst-dsp.c | 14 +- sound/soc/intel/skylake/skl-sst-dsp.h | 4 + sound/soc/intel/skylake/skl-sst-utils.c | 6 +- sound/soc/intel/skylake/skl-sst.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 46 +- sound/soc/intel/skylake/skl.c | 150 ++- sound/soc/intel/skylake/skl.h | 22 + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 552 +++----- sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 15 +- sound/soc/mediatek/mt2701/mt2701-afe-common.h | 87 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 213 +-- sound/soc/mediatek/mt2701/mt2701-reg.h | 42 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 6 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 - sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 - sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 - sound/soc/nuc900/nuc900-ac97.c | 11 +- sound/soc/omap/ams-delta.c | 4 +- sound/soc/qcom/apq8016_sbc.c | 10 +- sound/soc/rockchip/rk3399_gru_sound.c | 3 +- sound/soc/rockchip/rockchip_i2s.c | 11 +- sound/soc/rockchip/rockchip_spdif.c | 18 +- sound/soc/samsung/bells.c | 40 +- sound/soc/sh/rcar/adg.c | 6 +- sound/soc/sh/rcar/core.c | 147 ++- sound/soc/sh/rcar/dma.c | 104 +- sound/soc/sh/rcar/rsnd.h | 15 +- sound/soc/sh/rcar/ssi.c | 161 ++- sound/soc/sh/rcar/ssiu.c | 5 +- sound/soc/soc-acpi.c | 40 +- sound/soc/soc-compress.c | 4 +- sound/soc/soc-core.c | 31 +- sound/soc/soc-ops.c | 4 +- sound/soc/soc-utils.c | 2 +- sound/soc/stm/Kconfig | 12 + sound/soc/stm/Makefile | 3 + sound/soc/stm/stm32_adfsdm.c | 347 +++++ sound/soc/stm/stm32_sai.c | 114 +- sound/soc/sunxi/sun4i-codec.c | 29 +- sound/soc/sunxi/sun4i-i2s.c | 57 +- sound/soc/uniphier/Kconfig | 19 + sound/soc/uniphier/Makefile | 3 + sound/soc/uniphier/evea.c | 567 ++++++++ sound/soc/ux500/mop500.c | 4 + sound/soc/ux500/ux500_pcm.c | 5 + sound/usb/mixer.c | 30 +- sound/usb/quirks.c | 7 +- tools/arch/arm/include/uapi/asm/kvm.h | 7 + tools/arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 + tools/arch/arm64/include/uapi/asm/kvm.h | 7 + tools/arch/s390/include/uapi/asm/bpf_perf_event.h | 9 + tools/arch/s390/include/uapi/asm/kvm.h | 4 - tools/arch/s390/include/uapi/asm/kvm_perf.h | 4 - tools/arch/s390/include/uapi/asm/perf_regs.h | 44 + tools/arch/s390/include/uapi/asm/ptrace.h | 457 +++++++ tools/arch/x86/include/asm/cpufeatures.h | 538 ++++---- tools/arch/x86/include/asm/disabled-features.h | 8 +- tools/bpf/bpftool/Documentation/Makefile | 2 +- tools/bpf/bpftool/Makefile | 7 +- tools/bpf/bpftool/main.c | 36 +- tools/bpf/bpftool/main.h | 5 +- tools/bpf/bpftool/map.c | 8 +- tools/bpf/bpftool/prog.c | 2 + tools/hv/hv_kvp_daemon.c | 70 +- tools/include/linux/compiler.h | 21 +- tools/include/linux/kmemcheck.h | 1 - tools/include/linux/lockdep.h | 1 + tools/include/uapi/asm-generic/bpf_perf_event.h | 9 + tools/include/uapi/asm-generic/mman.h | 1 + tools/include/uapi/asm/bpf_perf_event.h | 7 + tools/include/uapi/drm/drm.h | 41 + tools/include/uapi/drm/i915_drm.h | 33 +- tools/include/uapi/linux/bpf_perf_event.h | 6 +- tools/include/uapi/linux/kcmp.h | 1 + tools/include/uapi/linux/kvm.h | 5 +- tools/include/uapi/linux/perf_event.h | 1 + tools/include/uapi/linux/prctl.h | 10 + tools/kvm/kvm_stat/kvm_stat | 74 +- tools/kvm/kvm_stat/kvm_stat.txt | 4 +- tools/objtool/Makefile | 8 +- tools/objtool/arch/x86/decode.c | 2 +- tools/objtool/arch/x86/lib/x86-opcode-map.txt | 15 +- tools/objtool/builtin-orc.c | 4 +- tools/objtool/orc_dump.c | 7 +- tools/objtool/orc_gen.c | 2 + tools/perf/Makefile.config | 9 +- tools/perf/arch/s390/Makefile | 1 + tools/perf/arch/s390/include/perf_regs.h | 2 +- tools/perf/arch/s390/util/dwarf-regs.c | 32 +- tools/perf/bench/numa.c | 56 +- tools/perf/builtin-help.c | 4 +- tools/perf/builtin-record.c | 42 +- tools/perf/builtin-report.c | 3 + tools/perf/builtin-script.c | 31 +- tools/perf/builtin-top.c | 36 +- tools/perf/builtin-trace.c | 6 +- tools/perf/check-headers.sh | 2 + tools/perf/jvmti/jvmti_agent.c | 16 +- tools/perf/jvmti/jvmti_agent.h | 7 +- tools/perf/jvmti/libjvmti.c | 147 ++- .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 7 +- tools/perf/tests/shell/trace+probe_vfs_getname.sh | 6 +- tools/perf/tests/task-exit.c | 4 + tools/perf/trace/beauty/mmap.c | 3 + tools/perf/util/annotate.c | 18 +- tools/perf/util/evlist.c | 14 +- tools/perf/util/evlist.h | 2 + tools/perf/util/evsel.c | 14 +- tools/perf/util/evsel.h | 1 + tools/perf/util/intel-pt-decoder/inat.h | 10 + .../perf/util/intel-pt-decoder/x86-opcode-map.txt | 15 +- tools/perf/util/machine.c | 3 + tools/perf/util/mmap.h | 2 +- tools/perf/util/parse-events.c | 2 + tools/perf/util/parse-events.h | 3 + tools/perf/util/pmu.c | 5 + tools/power/cpupower/bench/system.c | 2 +- .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 9 +- tools/testing/selftests/bpf/Makefile | 5 +- tools/testing/selftests/bpf/test_progs.c | 8 +- tools/testing/selftests/bpf/test_verifier.c | 629 ++++++++- tools/testing/selftests/bpf/test_verifier_log.c | 7 + tools/testing/selftests/net/config | 1 + tools/testing/selftests/x86/ldt_gdt.c | 12 +- tools/usb/usbip/libsrc/vhci_driver.c | 24 +- tools/usb/usbip/src/utils.c | 9 +- tools/virtio/ringtest/ptr_ring.c | 29 +- tools/vm/slabinfo-gnuplot.sh | 2 +- virt/kvm/arm/arch_timer.c | 43 +- virt/kvm/arm/arm.c | 17 +- virt/kvm/arm/hyp/timer-sr.c | 48 +- virt/kvm/arm/hyp/vgic-v2-sr.c | 4 - virt/kvm/arm/mmio.c | 6 +- virt/kvm/arm/mmu.c | 10 +- virt/kvm/arm/vgic/vgic-irqfd.c | 3 +- virt/kvm/arm/vgic/vgic-its.c | 4 +- virt/kvm/arm/vgic/vgic-v3.c | 2 +- virt/kvm/arm/vgic/vgic-v4.c | 6 +- virt/kvm/arm/vgic/vgic.c | 8 +- virt/kvm/kvm_main.c | 31 + 2467 files changed, 35148 insertions(+), 19492 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/max98373.txt create mode 100644 Documentation/devicetree/bindings/sound/pcm186x.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,tas6424.txt create mode 100644 Documentation/devicetree/bindings/sound/uniphier,evea.txt create mode 100644 Documentation/driver-api/iio/hw-consumer.rst delete mode 100644 Documentation/locking/crossrelease.txt create mode 100644 Documentation/media/dvb-drivers/frontends.rst create mode 100644 arch/arm64/include/uapi/asm/bpf_perf_event.h delete mode 100644 arch/arm64/kernel/ftrace-mod.S create mode 100644 arch/mips/include/asm/serial.h create mode 100644 arch/riscv/include/asm/vdso-syscalls.h create mode 100644 arch/riscv/kernel/vdso/clock_getres.S create mode 100644 arch/riscv/kernel/vdso/clock_gettime.S create mode 100644 arch/riscv/kernel/vdso/flush_icache.S create mode 100644 arch/riscv/kernel/vdso/getcpu.S create mode 100644 arch/riscv/kernel/vdso/gettimeofday.S create mode 100644 arch/riscv/mm/cacheflush.c create mode 100644 arch/s390/include/uapi/asm/bpf_perf_event.h create mode 100644 arch/x86/boot/compressed/pgtable_64.c create mode 100644 arch/x86/include/asm/cpu_entry_area.h create mode 100644 arch/x86/include/asm/intel_ds.h create mode 100644 arch/x86/include/asm/invpcid.h delete mode 100644 arch/x86/include/asm/kmemcheck.h create mode 100644 arch/x86/include/asm/pti.h create mode 100644 arch/x86/mm/cpu_entry_area.c delete mode 100644 arch/x86/mm/kmemcheck/error.c delete mode 100644 arch/x86/mm/kmemcheck/error.h delete mode 100644 arch/x86/mm/kmemcheck/opcode.c delete mode 100644 arch/x86/mm/kmemcheck/opcode.h delete mode 100644 arch/x86/mm/kmemcheck/pte.c delete mode 100644 arch/x86/mm/kmemcheck/pte.h delete mode 100644 arch/x86/mm/kmemcheck/selftest.c delete mode 100644 arch/x86/mm/kmemcheck/selftest.h delete mode 100644 arch/x86/mm/kmemcheck/shadow.h create mode 100644 arch/x86/mm/pti.c create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/buffer/industrialio-hw-consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h create mode 100644 include/linux/iio/hw-consumer.h create mode 100644 include/linux/intel-pti.h delete mode 100644 include/linux/kmemcheck.h rename include/{lib => linux}/libgcc.h (100%) create mode 100644 include/uapi/asm-generic/bpf_perf_event.h delete mode 100644 mm/kmemcheck.c create mode 100644 net/wireless/certs/sforshee.hex delete mode 100644 net/wireless/certs/sforshee.x509 create mode 100644 sound/soc/codecs/max98373.c create mode 100644 sound/soc/codecs/max98373.h create mode 100644 sound/soc/codecs/pcm186x-i2c.c create mode 100644 sound/soc/codecs/pcm186x-spi.c create mode 100644 sound/soc/codecs/pcm186x.c create mode 100644 sound/soc/codecs/pcm186x.h delete mode 100644 sound/soc/codecs/sn95031.c delete mode 100644 sound/soc/codecs/sn95031.h create mode 100644 sound/soc/codecs/tas6424.c create mode 100644 sound/soc/codecs/tas6424.h delete mode 100644 sound/soc/intel/boards/mfld_machine.c create mode 100644 sound/soc/intel/skylake/skl-i2s.h create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h create mode 100644 sound/soc/stm/stm32_adfsdm.c create mode 100644 sound/soc/uniphier/Kconfig create mode 100644 sound/soc/uniphier/Makefile create mode 100644 sound/soc/uniphier/evea.c create mode 100644 tools/arch/arm64/include/uapi/asm/bpf_perf_event.h create mode 100644 tools/arch/s390/include/uapi/asm/bpf_perf_event.h create mode 100644 tools/arch/s390/include/uapi/asm/perf_regs.h create mode 100644 tools/arch/s390/include/uapi/asm/ptrace.h delete mode 100644 tools/include/linux/kmemcheck.h create mode 100644 tools/include/uapi/asm-generic/bpf_perf_event.h create mode 100644 tools/include/uapi/asm/bpf_perf_event.h

2 3

[alsa-devel] LAC 2018 : Call for Papers / Posters / Workshops/ Music Performances / Multimedia Installations
by Robin Gareus 12 Jan '18

12 Jan '18

[Apologies for cross-postings] [Please distribute] Conference date: 7th - 10th June 2018 The Linux Audio Conference 2018 will be hosted at c-base, Berlin - in partnership with the Electronic Music Studio (TU Berlin) and Spektrum. https://lac.linuxaudio.org/2018 Deadline for all submissions: Friday, February 28th, 2018 (23:59 UTC) - - - 1: Call for Papers / Posters / Workshops LAC 2018 invites submissions of papers, posters and workshops addressing all areas of audio processing based on Linux and open source software. All submissions and presentations are in English. All submissions are peer reviewed by a committee of experts from different disciplines. Submissions can focus on technical, artistic or scientific issues and can target developers or users. For more details see the website: https://lac.linuxaudio.org/2018/pages/cfp/ *Papers* Papers must be written and presented in English. The length of papers is 4 to 8 pages, with up to 5 keywords, and an abstract of up to 200 words. The poster presentations are based on paper submissions of 2-4 pages, with up to 5 keywords and an abstract of up to 150 words. *Workshops* The workshop presentation (max duration of 2h) should be 1-4 pages, with up to 5 keywords, and an abstract of up to 150 words to be published on the conference website. Submit a brief description of the workshop including URL (if available). How to submit? * Use the OpenConf online submission tool at https://lac.linuxaudio.org/2018/openconf * Select the relevant submission type ('_ PAPER _' / '_ POSTER _' / '_ WORKSHOP _') * The required file format is PDF, formatted for A4 paper. Authors are required to use the templates for paper formatting available as download on the conference website. * Please notify us if you need a special technical setup for your presentation. - - - 2: Call for Music Performances / Multimedia Installations LAC 2018 also invites submissions of Electroacoustic Works and Multimedia Installations. A jury will select the compositions and installations to be included in the conference program according to artistic merit and technical feasibility. Please be prepared to perform your work yourself and make sure that you have all resources needed to perform your piece at your disposal (e.g. instruments, other performers, etc.). Unfortunately, LAC 2018 cannot pay a fee neither for you nor for any additional performers, and LAC 2018 cannot organize or pay for travel or accommodation neither for you nor for any additional performers. All submissions are peer reviewed by a committee of experts in music and arts. Electroacoustic Works and Multimedia Installation can address all areas of digital audio and audiovisual art. Available Technical Setups For concerts, the LAC will provide the following equipment: * 8-channel - speaker setup * Stereo setup + video projection * Digital mixing desk Additional requests can not be guaranteed. How to submit? * Use the OpenConf online submission tool at https://lac.linuxaudio.org/2018/openconf * Select the submission type '_ PERFORMANCE _' * The required file format is PDF, formatted for A4 paper. It includes: * Description of the project program notes * Link to video or audio demonstration of the project * Technical rider of the work Important Dates * Deadline for all submissions: Friday, February 28th, 2018 (23:59 UTC) * Acceptance notification: March 31st, 2018 * Final deadline for 'camera ready' paper: April 15th, 2018 * Author registration deadline: April 15th, 2018 * Final program: May 1st, 2018 Up-to-date information regarding the conference can be found on its website: https://lac.linuxaudio.org/2018 Looking forward to seeing you in Berlin! The Linux Audio Conference 2018 team

1 0

[alsa-devel] [rfc] Sound support for n9
by Pavel Machek 12 Jan '18

12 Jan '18

Hi! Binding documentation is pending, and code will need to be updated to match it. I guess burst_bclkdiv should be handled as int, not as u8? SPDX is modern these days. Anything else that needs to be fixed? Best regards, Pavel diff --git a/include/sound/n9.h b/include/sound/n9.h new file mode 100644 index 0000000..b14ddf0 --- /dev/null +++ b/include/sound/n9.h @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2009 Nokia + +#ifndef _N9_H_ +#define _N9_H_ + +struct dfl61audio_hsmic_event { + void *private; + void (*event)(void *priv, bool on); +}; + +void dfl61_jack_report(int status); +int dfl61_request_hsmicbias(bool enable); +void dfl61_register_hsmic_event_cb(struct dfl61audio_hsmic_event *event); +int dfl61_request_hp_enable(bool enable); +#endif diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 5b94a15..3823bcc 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -30,6 +32,7 @@ #include <linux/interrupt.h> #include <linux/gpio.h> #include <linux/regulator/consumer.h> +#include <linux/of_gpio.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> @@ -1484,16 +1487,11 @@ static struct snd_soc_dai_driver dac33_dai = { static int dac33_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct tlv320dac33_platform_data *pdata; + struct tlv320dac33_platform_data *pdata = client->dev.platform_data; struct tlv320dac33_priv *dac33; + struct device_node *np = client->dev.of_node; int ret, i; - if (client->dev.platform_data == NULL) { - dev_err(&client->dev, "Platform data not set\n"); - return -ENODEV; - } - pdata = client->dev.platform_data; - dac33 = devm_kzalloc(&client->dev, sizeof(struct tlv320dac33_priv), GFP_KERNEL); if (dac33 == NULL) @@ -1505,10 +1503,26 @@ static int dac33_i2c_probe(struct i2c_client *client, i2c_set_clientdata(client, dac33); - dac33->power_gpio = pdata->power_gpio; - dac33->burst_bclkdiv = pdata->burst_bclkdiv; - dac33->keep_bclk = pdata->keep_bclk; - dac33->mode1_latency = pdata->mode1_latency; + if (pdata) { + dac33->power_gpio = pdata->power_gpio; + dac33->burst_bclkdiv = pdata->burst_bclkdiv; + dac33->keep_bclk = pdata->keep_bclk; + dac33->mode1_latency = pdata->mode1_latency; + } else if (np) { + ret = of_get_named_gpio(np, "power-gpio", 0); + if (ret >= 0) + dac33->power_gpio = ret; + else + dac33->power_gpio = -1; + + if (of_property_read_bool(np, "keep-bclk")) + dac33->keep_bclk = true; + + of_property_read_u8(np, "burst-bclkdiv", &dac33->burst_bclkdiv); + } else { + dev_err(&client->dev, "Platform data not set\n"); + return -ENODEV; + } if (!dac33->mode1_latency) dac33->mode1_latency = 10000; /* 10ms */ dac33->irq = client->irq; @@ -1574,9 +1588,16 @@ static const struct i2c_device_id tlv320dac33_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, tlv320dac33_i2c_id); +static const struct of_device_id tlv320dac33_of_match[] = { + { .compatible = "ti,tlv320dac33", }, + {}, +}; +MODULE_DEVICE_TABLE(i2c, tlv320dac33_of_match); + static struct i2c_driver tlv320dac33_i2c_driver = { .driver = { .name = "tlv320dac33-codec", + .of_match_table = of_match_ptr(tlv320dac33_of_match), }, .probe = dac33_i2c_probe, .remove = dac33_i2c_remove, diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index f5451c7..2772414 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -47,6 +47,18 @@ config SND_OMAP_SOC_RX51 Say Y if you want to add support for SoC audio on Nokia N900 cellphone. +config SND_OMAP_SOC_N9 + tristate "SoC Audio support for Nokia N9/N950" + depends on SND_OMAP_SOC && ARM && I2C + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + select SND_SOC_TLV320DAC33 + select SND_SOC_TPA6130A2 + select SND_SOC_WL1273 if MFD_WL1273_CORE + depends on GPIOLIB + help + Say Y if you want to add support for SoC audio on Nokia N9/N950. + config SND_OMAP_SOC_AMS_DELTA tristate "SoC Audio support for Amstrad E3 (Delta) videophone" depends on SND_OMAP_SOC && MACH_AMS_DELTA && TTY diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index a6785dc..07efd21 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_SND_OMAP_SOC_HDMI_AUDIO) += snd-soc-omap-hdmi-audio.o # OMAP Machine Support snd-soc-n810-objs := n810.o snd-soc-rx51-objs := rx51.o +snd-soc-n9-objs := n9.o snd-soc-ams-delta-objs := ams-delta.o snd-soc-osk5912-objs := osk5912.o snd-soc-am3517evm-objs := am3517evm.o @@ -24,6 +25,7 @@ snd-soc-omap3pandora-objs := omap3pandora.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o +obj-$(CONFIG_SND_OMAP_SOC_N9) += snd-soc-n9.o obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o diff --git a/sound/soc/omap/n9.c b/sound/soc/omap/n9.c new file mode 100644 index 0000000..db61463 --- /dev/null +++ b/sound/soc/omap/n9.c @@ -0,0 +1,748 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// n9.c -- SoC audio for Nokia N9/N950 +// +// Copyright (C) 2008 - 2009 Nokia Corporation +// +// Contact: Peter Ujfalusi <peter.ujfalusi(a)ti.com> +// Eduardo Valentin <eduardo.valentin(a)nokia.com> +// Jarkko Nikula <jarkko.nikula(a)bitmer.com> +// + +#include <linux/delay.h> +#include <linux/gpio.h> +#include <linux/platform_device.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <sound/core.h> +#include <sound/jack.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <linux/platform_data/asoc-ti-mcbsp.h> +#include <linux/mfd/twl4030-audio.h> +#include "../codecs/tlv320dac33.h" +#include "../codecs/tpa6130a2.h" +#include "../codecs/wl1273.h" + +#include <asm/mach-types.h> + +#include <sound/n9.h> +#include "omap-mcbsp.h" +#include "mcbsp.h" + +#define JACK_REPORT_MASK (SND_JACK_MECHANICAL | SND_JACK_AVOUT | \ + SND_JACK_HEADSET) + +struct dfl61wl1273_audio_pdata { + struct gpio_desc *power_gpio; +}; + +struct dfl61twl_audio_pdata { + struct gpio_desc *speaker_amp_gpio; +}; + +static int dfl61dac33_interconnect_enable(int); +static struct snd_soc_card dfl61dac33_sound_card; +static struct snd_soc_card dfl61twl_sound_card; +static struct snd_soc_jack dfl61_jack; +static struct dfl61audio_hsmic_event *hsmic_event; + +static struct snd_soc_component *find_component(struct snd_soc_card *card) { + struct snd_soc_component *component; + + if (list_empty(&card->component_dev_list)) { + pr_err("Can't find codec for %s\n", card->name); + return NULL; + } + + component = list_entry(card->component_dev_list.next, + struct snd_soc_component, card_list); + + return component; +} + +/* TWL4030 */ +void dfl61_jack_report(int status) +{ + if (dfl61_jack.card) + snd_soc_jack_report(&dfl61_jack, status, JACK_REPORT_MASK); + else + pr_err("twl4030: Cannot report jack status"); +} +EXPORT_SYMBOL_GPL(dfl61_jack_report); + +int dfl61_request_hsmicbias(bool enable) +{ + struct snd_soc_component *component; + struct snd_soc_dapm_context *dapm; + bool lock = false; + int ret; + + if (!dfl61twl_sound_card.instantiated) { + pr_warn("twl4030: sound card not instantiated yet"); + return -EPROBE_DEFER; + } + + component = find_component(&dfl61twl_sound_card); + if (!component) + return -ENODEV; + + dapm = snd_soc_component_get_dapm(component); + if (!dapm) { + pr_err("twl4030: Cannot set hsmicbias yet"); + return -ENODEV; + } + + mutex_lock(&dfl61twl_sound_card.dapm_mutex); + lock = true; + + if (enable) + snd_soc_dapm_force_enable_pin_unlocked(dapm, "Headset Mic Bias"); + else + snd_soc_dapm_disable_pin_unlocked(dapm, "Headset Mic Bias"); + + ret = snd_soc_dapm_sync_unlocked(dapm); + + if (lock) + mutex_unlock(&dfl61twl_sound_card.dapm_mutex); + + return ret; +} +EXPORT_SYMBOL(dfl61_request_hsmicbias); + +void dfl61_register_hsmic_event_cb(struct dfl61audio_hsmic_event *event) +{ + hsmic_event = event; +} +EXPORT_SYMBOL(dfl61_register_hsmic_event_cb); + +static int dfl61twl_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + unsigned int fmt; + int r; + + switch (params_channels(params)) { + case 2: /* Stereo I2S mode */ + fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM; + case 4: /* Four channel TDM mode */ + fmt = SND_SOC_DAIFMT_DSP_A | + SND_SOC_DAIFMT_IB_NF | + SND_SOC_DAIFMT_CBM_CFM; + break; + default: + return -EINVAL; + } + /* Set codec DAI configuration */ + r = snd_soc_dai_set_fmt(rtd->codec_dai, fmt); + if (r < 0) { + pr_err("Can't set codec DAI configuration for twl4030: %d\n", r); + return r; + } + + /* Set cpu DAI configuration */ + r = snd_soc_dai_set_fmt(rtd->cpu_dai, fmt); + if (r < 0) { + pr_err("Can't set cpu DAI configuration for twl4030: %d\n", r); + return r; + } + + return 0; +} + +static int dfl61twl_spk_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event) +{ + struct snd_soc_dapm_context *dapm = w->dapm; + struct snd_soc_card *card = dapm->card; + struct dfl61twl_audio_pdata *pdata = snd_soc_card_get_drvdata(card); + + gpiod_set_raw_value_cansleep(pdata->speaker_amp_gpio, + !!SND_SOC_DAPM_EVENT_ON(event)); + + return 0; +} + +static int dfl61twl_tlv320dac33_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event) +{ + int r; + + if (SND_SOC_DAPM_EVENT_ON(event)) + r = dfl61dac33_interconnect_enable(1); + else + r = dfl61dac33_interconnect_enable(0); + + return r; +} + +static int dfl61twl_hsmic_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event) +{ + if (!hsmic_event || !hsmic_event->event) + return 0; + + if (SND_SOC_DAPM_EVENT_ON(event)) + hsmic_event->event(hsmic_event->private, 1); + else + hsmic_event->event(hsmic_event->private, 0); + + return 0; +} + +/* DAPM widgets and routing for TWL4030 */ +static const struct snd_soc_dapm_widget dfl61twl_dapm_widgets[] = { + SND_SOC_DAPM_SPK("Ext Spk", dfl61twl_spk_event), + SND_SOC_DAPM_SPK("Earpiece", NULL), + SND_SOC_DAPM_SPK("HAC", NULL), + SND_SOC_DAPM_SPK("Vibra", NULL), + SND_SOC_DAPM_SPK("DAC33 interconnect", dfl61twl_tlv320dac33_event), + + SND_SOC_DAPM_MIC("Digital Mic", NULL), + SND_SOC_DAPM_MIC("Headset Mic", dfl61twl_hsmic_event), + + SND_SOC_DAPM_LINE("FMRX Left Line-in", NULL), + SND_SOC_DAPM_LINE("FMRX Right Line-in", NULL), +}; + +static const struct snd_soc_dapm_route dfl61twl_audio_map[] = { + {"Ext Spk", NULL, "PREDRIVER"}, + {"Earpiece", NULL, "EARPIECE"}, + {"HAC", NULL, "HFL"}, + {"Vibra", NULL, "VIBRA"}, + {"DAC33 interconnect", NULL, "PREDRIVEL"}, + + {"DIGIMIC0", NULL, "Digital Mic"}, + {"Digital Mic", NULL, "Mic Bias 1"}, + + {"HSMIC", NULL, "Headset Mic"}, + {"Headset Mic", NULL, "Headset Mic Bias"}, + + {"AUXL", NULL, "FMRX Left Line-in"}, + {"AUXR", NULL, "FMRX Right Line-in"}, +}; + +/* Pre DAC routings for the twl4030 codec */ +static const char *twl4030_predacl1_texts[] = { + "SDRL1", "SDRM1", "SDRL2", "SDRM2", +}; +static const char *twl4030_predacr1_texts[] = { + "SDRR1", "SDRM1", "SDRR2", "SDRM2" +}; +static const char *twl4030_predacl2_texts[] = {"SDRL2", "SDRM2"}; +static const char *twl4030_predacr2_texts[] = {"SDRR2", "SDRM2"}; + +static const struct soc_enum twl4030_predacl1_enum = + SOC_ENUM_SINGLE(TWL4030_REG_RX_PATH_SEL, 2, + ARRAY_SIZE(twl4030_predacl1_texts), + twl4030_predacl1_texts); + +static const struct soc_enum twl4030_predacr1_enum = + SOC_ENUM_SINGLE(TWL4030_REG_RX_PATH_SEL, 0, + ARRAY_SIZE(twl4030_predacr1_texts), + twl4030_predacr1_texts); + +static const struct soc_enum twl4030_predacl2_enum = + SOC_ENUM_SINGLE(TWL4030_REG_RX_PATH_SEL, 5, + ARRAY_SIZE(twl4030_predacl2_texts), + twl4030_predacl2_texts); + +static const struct soc_enum twl4030_predacr2_enum = + SOC_ENUM_SINGLE(TWL4030_REG_RX_PATH_SEL, 4, + ARRAY_SIZE(twl4030_predacr2_texts), + twl4030_predacr2_texts); + +static const struct snd_kcontrol_new dfl61twl_controls[] = { + /* Mux controls before the DACs */ + SOC_ENUM("DACL1 Playback Mux", twl4030_predacl1_enum), + SOC_ENUM("DACR1 Playback Mux", twl4030_predacr1_enum), + SOC_ENUM("DACL2 Playback Mux", twl4030_predacl2_enum), + SOC_ENUM("DACR2 Playback Mux", twl4030_predacr2_enum), +}; + +static int dfl61twl_init(struct snd_soc_pcm_runtime *rtd) +{ + struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(rtd->cpu_dai); + int r; + + /* Create jack for accessory reporting */ + r = snd_soc_card_jack_new(&dfl61twl_sound_card, "Jack", + JACK_REPORT_MASK , &dfl61_jack, NULL, 0); + if (r) { + pr_err("Failed to add Jack\n"); + return r; + } + + snd_soc_add_codec_controls(rtd->codec, dfl61twl_controls, + ARRAY_SIZE(dfl61twl_controls)); + + if (omap_mcbsp_st_add_controls(rtd, 3)) + dev_dbg(rtd->codec->dev, "Unable to set Sidetone for McBSP3\n"); + + mcbsp->dma_op_mode = MCBSP_DMA_MODE_THRESHOLD; + + return 0; +} + +static struct snd_soc_ops dfl61twl_ops = { + .hw_params = dfl61twl_hw_params, +}; + +/* TLV320DAC33 */ +static int dfl61dac33_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + int r; + + /* Set codec DAI configuration */ + r = snd_soc_dai_set_fmt(rtd->codec_dai, + SND_SOC_DAIFMT_LEFT_J | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (r < 0) { + pr_err("Can't set codec DAI configuration for tlv320dac33: %d\n", r); + return r; + } + + /* Set cpu DAI configuration */ + r = snd_soc_dai_set_fmt(rtd->cpu_dai, + SND_SOC_DAIFMT_LEFT_J | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (r < 0) { + pr_err("Can't set cpu DAI configuration for tlv320dac33: %d\n", r); + return r; + } + + /* Set the codec system clock for DAC and ADC */ + r = snd_soc_dai_set_sysclk(rtd->codec_dai, TLV320DAC33_SLEEPCLK, 32768, + SND_SOC_CLOCK_IN); + if (r < 0) { + pr_err("Can't set codec system clock for tlv320dac33\n"); + return r; + } + + return 0; +} + +static int dfl61dac33_interconnect_enable(int enable) +{ + struct snd_soc_component *component = + find_component(&dfl61dac33_sound_card); + struct snd_soc_dapm_context *dapm; + bool lock = false; + + if (!component) + return -ENODEV; + + dapm = snd_soc_component_get_dapm(component); + + mutex_lock(&dapm->card->dapm_mutex); + lock = true; + + if (enable) + snd_soc_dapm_enable_pin_unlocked(dapm, "twl4030 interconnect"); + else + snd_soc_dapm_disable_pin_unlocked(dapm, "twl4030 interconnect"); + + snd_soc_dapm_sync_unlocked(dapm); + + if (lock) + mutex_unlock(&dapm->card->dapm_mutex); + + return 0; +} + +static void dfl61dac33_hp_enable(struct snd_soc_component *component, int enable) +{ + struct snd_soc_dapm_context *dapm = + snd_soc_component_get_dapm(component); + + snd_soc_dapm_mutex_lock(dapm); + + if (enable) { + snd_soc_dapm_enable_pin_unlocked(dapm, "Headphone"); + } else { + snd_soc_dapm_disable_pin_unlocked(dapm, "Headphone"); + } + + snd_soc_dapm_sync_unlocked(dapm); + + snd_soc_dapm_mutex_unlock(dapm); +} + +int dfl61_request_hp_enable(bool enable) +{ + struct snd_soc_component *component = + find_component(&dfl61dac33_sound_card); + + if (!component) { + pr_err("dfl61-request_hp_enable"); + return -ENODEV; + } + + dfl61dac33_hp_enable(component, enable); + + return 0; +} +EXPORT_SYMBOL(dfl61_request_hp_enable); + +static const struct snd_kcontrol_new dfl61dac33_controls[] = { + SOC_DAPM_PIN_SWITCH("Headphone"), +}; + +static const struct snd_soc_dapm_widget dfl61dac33_dapm_widgets[] = { + /* Outputs */ + SND_SOC_DAPM_LINE("FMTX_L Line Out", NULL), + SND_SOC_DAPM_LINE("FMTX_R Line Out", NULL), + SND_SOC_DAPM_HP("Headphone", NULL), + /* Inputs */ + SND_SOC_DAPM_LINE("twl4030 interconnect", NULL), +}; + +static const struct snd_soc_dapm_route dfl61dac33_audio_map[] = { + {"Headphone", NULL, "TPA6140A2 HPLEFT"}, + {"Headphone", NULL, "TPA6140A2 HPRIGHT"}, + {"TPA6140A2 HPLEFT", NULL, "LEFT_LO"}, + {"TPA6140A2 HPRIGHT", NULL, "RIGHT_LO"}, + + {"FMTX_L Line Out", NULL, "LEFT_LO"}, + {"FMTX_R Line Out", NULL, "RIGHT_LO"}, + + {"LINER", NULL, "twl4030 interconnect"}, + {"LINEL", NULL, "twl4030 interconnect"}, +}; + +static int dfl61dac33_init(struct snd_soc_pcm_runtime *rtd) +{ + struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(rtd->cpu_dai); + struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(rtd->codec); + + snd_soc_limit_volume(rtd->card, "TPA6140A2 Headphone Playback Volume", 21); + + snd_soc_dapm_disable_pin(dapm, "twl4030 interconnect"); + + if (omap_mcbsp_st_add_controls(rtd, 2)) + dev_dbg(rtd->codec->dev, "Unable to set Sidetone for McBSP2\n"); + + mcbsp->dma_op_mode = MCBSP_DMA_MODE_THRESHOLD; + + return 0; +} + +static struct snd_soc_ops dfl61dac33_ops = { + .hw_params = dfl61dac33_hw_params, +}; + +/* WL1273 */ +static int dfl61wl1273_init(struct snd_soc_pcm_runtime *rtd) +{ + struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(rtd->cpu_dai); + mcbsp->dma_op_mode = MCBSP_DMA_MODE_THRESHOLD; + + return 0; +} + +static int dfl61wl1273_startup(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + unsigned int fmt; + int r; + + r = wl1273_get_format(rtd->codec, &fmt); + if (r < 0) { + pr_err("Can't get fmt for wl1273: %d\n", r); + return r; + } + + /* Set cpu DAI configuration */ + r = snd_soc_dai_set_fmt(rtd->cpu_dai, fmt); + if (r < 0) { + pr_err("Can't set cpu DAI configuration for wl1273: %d\n", r); + return r; + } + return 0; +} + +static struct snd_soc_ops dfl61wl1273_ops = { + .startup = dfl61wl1273_startup, +}; + +static int dfl61wl1273_card_probe(struct snd_soc_card *card) +{ + struct dfl61wl1273_audio_pdata *pdata = snd_soc_card_get_drvdata(card); + + gpiod_set_value(pdata->power_gpio, 1); + return 0; +} + + +static int dfl61wl1273_card_remove(struct snd_soc_card *card) +{ + struct dfl61wl1273_audio_pdata *pdata = snd_soc_card_get_drvdata(card); + + gpiod_set_value(pdata->power_gpio, 0); + return 0; +} + +/* Digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link dfl61twl_dai[] = { + { + .name = "TWL4030", + .stream_name = "TWL4030", + .cpu_dai_name = "omap-mcbsp.3", + .codec_dai_name = "twl4030-hifi", + .platform_name = "omap-pcm-audio", + .codec_name = "twl4030-codec", + .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | + SND_SOC_DAIFMT_CBM_CFM, + .init = dfl61twl_init, + .ops = &dfl61twl_ops, + }, +}; + +static struct snd_soc_dai_link dfl61dac33_dai[] = { + { + .name = "TLV320DAC33", + .stream_name = "DAC33", + .cpu_dai_name = "omap-mcbsp.2", + .codec_dai_name = "tlv320dac33-hifi", + .platform_name = "omap-pcm-audio", + .codec_name = "tlv320dac33-codec.1-0019", + .init = dfl61dac33_init, + .ops = &dfl61dac33_ops, + }, +}; + +static struct snd_soc_aux_dev dfl61dac33_aux_dev[] = { + { + .name = "TPA6140A2", + .codec_name = "tpa6130a2.1-0060", + }, +}; + +static struct snd_soc_codec_conf dfl61dac33_codec_conf[] = { + { + .dev_name = "tpa6130a2.2-0060", + .name_prefix = "TPA6140A2", + }, +}; + +static struct snd_soc_dai_link dfl61wl1273_dai[] = { + { + .name = "BT/FM PCM", + .stream_name = "BT/FM Stream", + .cpu_dai_name = "omap-mcbsp.4", + .codec_dai_name = "wl1273-fm", + .platform_name = "omap-pcm-audio", + .codec_name = "wl1273-codec", + .init = dfl61wl1273_init, + .ops = &dfl61wl1273_ops, + }, +}; + +/* Audio cards */ +static struct snd_soc_card dfl61twl_sound_card = { + .name = "dfl61-twl4030", + .owner = THIS_MODULE, + .dai_link = dfl61twl_dai, + .num_links = ARRAY_SIZE(dfl61twl_dai), + .fully_routed = true, + .dapm_widgets = dfl61twl_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(dfl61twl_dapm_widgets), + .dapm_routes = dfl61twl_audio_map, + .num_dapm_routes = ARRAY_SIZE(dfl61twl_audio_map), +}; + +static struct snd_soc_card dfl61dac33_sound_card = { + .name = "dfl61-dac33", + .owner = THIS_MODULE, + .dai_link = dfl61dac33_dai, + .num_links = ARRAY_SIZE(dfl61dac33_dai), + .aux_dev = dfl61dac33_aux_dev, + .num_aux_devs = ARRAY_SIZE(dfl61dac33_aux_dev), + .codec_conf = dfl61dac33_codec_conf, + .num_configs = ARRAY_SIZE(dfl61dac33_codec_conf), + .fully_routed = true, + .controls = dfl61dac33_controls, + .num_controls = ARRAY_SIZE(dfl61dac33_controls), + .dapm_widgets = dfl61dac33_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(dfl61dac33_dapm_widgets), + .dapm_routes = dfl61dac33_audio_map, + .num_dapm_routes = ARRAY_SIZE(dfl61dac33_audio_map), +}; + +static struct snd_soc_card dfl61wl1273_sound_card = { + .name = "dfl61-wl1273", + .owner = THIS_MODULE, + .probe = dfl61wl1273_card_probe, + .remove = dfl61wl1273_card_remove, + .dai_link = dfl61wl1273_dai, + .num_links = ARRAY_SIZE(dfl61wl1273_dai), + .fully_routed = true, +}; + +static int n9_soc_probe(struct platform_device *pdev) +{ + struct dfl61twl_audio_pdata *pdata_twl; + struct dfl61wl1273_audio_pdata *pdata_wl1273; + struct device_node *np = pdev->dev.of_node; + struct snd_soc_card *card_twl = &dfl61twl_sound_card; + struct snd_soc_card *card_dac33 = &dfl61dac33_sound_card; + struct snd_soc_card *card_wl1273 = &dfl61wl1273_sound_card; + int err; + + if (!(machine_is_nokia_rm696() || machine_is_nokia_rm680()) + && !(of_machine_is_compatible("nokia,omap3-n9") + || of_machine_is_compatible("nokia,omap3-n950"))) + return -ENODEV; + + card_twl->dev = &pdev->dev; + card_dac33->dev = &pdev->dev; + card_wl1273->dev = &pdev->dev; + + if (np) { + struct device_node *dai_node; + + dai_node = of_parse_phandle(np, "nokia,twl4030-cpu-dai", 0); + if (!dai_node) { + dev_err(&pdev->dev, "McBSP node for TWL4030 is not provided\n"); + return -EINVAL; + } + dfl61twl_dai[0].cpu_dai_name = NULL; + dfl61twl_dai[0].platform_name = NULL; + dfl61twl_dai[0].cpu_of_node = dai_node; + dfl61twl_dai[0].platform_of_node = dai_node; + + dai_node = of_parse_phandle(np, "nokia,tlv320dac33-cpu-dai", 0); + if (!dai_node) { + dev_err(&pdev->dev, "McBSP node for TLV320DAC33 is not provided\n"); + return -EINVAL; + } + dfl61dac33_dai[0].cpu_dai_name = NULL; + dfl61dac33_dai[0].platform_name = NULL; + dfl61dac33_dai[0].cpu_of_node = dai_node; + dfl61dac33_dai[0].platform_of_node = dai_node; + + dai_node = of_parse_phandle(np, "nokia,wl1273-cpu-dai", 0); + if (!dai_node) { + dev_err(&pdev->dev, "McBSP node for WL1273 is not provided\n"); + return -EINVAL; + } + dfl61wl1273_dai[0].cpu_dai_name = NULL; + dfl61wl1273_dai[0].platform_name = NULL; + dfl61wl1273_dai[0].cpu_of_node = dai_node; + dfl61wl1273_dai[0].platform_of_node = dai_node; + + dai_node = of_parse_phandle(np, "nokia,twl4030-codec", 0); + if (!dai_node) { + dev_err(&pdev->dev, "TWL4030 codec node is not provided\n"); + return -EINVAL; + } + dfl61twl_dai[0].codec_name = NULL; + dfl61twl_dai[0].codec_of_node = dai_node; + + dai_node = of_parse_phandle(np, "nokia,tlv320dac33-codec", 0); + if (!dai_node) { + dev_err(&pdev->dev, "TLV320DAC33 codec node is not provided\n"); + return -EINVAL; + } + dfl61dac33_dai[0].codec_name = NULL; + dfl61dac33_dai[0].codec_of_node = dai_node; + + dai_node = of_parse_phandle(np, "nokia,headphone-amplifier", 0); + if (!dai_node) { + dev_err(&pdev->dev, "Headphone amplifier node is not provided\n"); + return -EINVAL; + } + dfl61dac33_aux_dev[0].codec_name = NULL; + dfl61dac33_aux_dev[0].codec_of_node = dai_node; + dfl61dac33_codec_conf[0].dev_name = NULL; + dfl61dac33_codec_conf[0].of_node = dai_node; + + dai_node = of_parse_phandle(np, "nokia,wl1273-codec", 0); + if (!dai_node) { + dev_err(&pdev->dev, "WL1273 codec node is not provided\n"); + return -EINVAL; + } + dfl61wl1273_dai[0].codec_name = NULL; + dfl61wl1273_dai[0].codec_of_node = dai_node; + } + + pdata_twl = devm_kzalloc(&pdev->dev, sizeof(*pdata_twl), GFP_KERNEL); + if (pdata_twl == NULL) { + dev_err(card_twl->dev, "failed to create private data for twl4030\n"); + return -ENOMEM; + } + snd_soc_card_set_drvdata(card_twl, pdata_twl); + + pdata_twl->speaker_amp_gpio = devm_gpiod_get(card_twl->dev, + "speaker-amplifier", + GPIOD_OUT_LOW); + if (IS_ERR(pdata_twl->speaker_amp_gpio)) { + dev_err(card_twl->dev, "could not get speaker enable gpio\n"); + return PTR_ERR(pdata_twl->speaker_amp_gpio); + } + + pdata_wl1273 = devm_kzalloc(&pdev->dev, sizeof(*pdata_wl1273), GFP_KERNEL); + if (pdata_wl1273 == NULL) { + dev_err(card_wl1273->dev, "failed to create private data for wl1273\n"); + return -ENOMEM; + } + snd_soc_card_set_drvdata(card_wl1273, pdata_wl1273); + + pdata_wl1273->power_gpio = devm_gpiod_get(card_wl1273->dev, + "wl1273-power", + GPIOD_OUT_LOW); + if (IS_ERR(pdata_wl1273->power_gpio)) { + dev_err(card_wl1273->dev, "could not get wl1273 enable gpio\n"); + return PTR_ERR(pdata_wl1273->power_gpio); + } + + err = devm_snd_soc_register_card(&pdev->dev, card_twl); + if (err < 0) { + dev_err(card_twl->dev, "failed to register twl4030 card: %d\n", err); + return err; + } + + err = devm_snd_soc_register_card(&pdev->dev, card_dac33); + if (err < 0) { + dev_err(card_dac33->dev, "failed to register tlv320dac33 card: %d\n", err); + return err; + } + + + + err = devm_snd_soc_register_card(&pdev->dev, card_wl1273); + if (err < 0) { + dev_err(card_wl1273->dev, "failed to register wl1273 card\n"); + return err; + } + + return 0; +} + +static const struct of_device_id n9_audio_of_match[] = { + { .compatible = "nokia,n9-audio", }, + {}, +}; +MODULE_DEVICE_TABLE(of, n9_audio_of_match); + +static struct platform_driver n9_soc_driver = { + .driver = { + .name = "n9-audio", + .of_match_table = of_match_ptr(n9_audio_of_match), + }, + .probe = n9_soc_probe, +}; + +module_platform_driver(n9_soc_driver); + +MODULE_AUTHOR("Nokia Corporation"); +MODULE_DESCRIPTION("ALSA SoC Nokia N9/N950"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:n9-audio"); -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

1 0

[alsa-devel] [PATCH] ASoC: rt5645: add fallback case for jack detection support
by Pierre-Louis Bossart 12 Jan '18

12 Jan '18

Commit 78f5605c0329 ("ASoC: rt5645: cleanup DMI matching code") did a lot of useful cleanups, but the logic is a bit flawed: if there is no DMI match on an ACPI machine, the code reads non-existent properties. Re-add previous code that checked for the existence of those properties and a fallback mode to enable jd-mode3 if there is no pdata, device property or quirk. This will help avoid having to add new DMI quirks when only the jd-mode is needed for headset playback. Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Bard Liao <bardliao(a)realtek.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/codecs/rt5645.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index ebc4f5970f24..476020445f65 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3687,6 +3687,17 @@ static const struct dmi_system_id dmi_platform_data[] = { { } }; +static bool rt5645_check_dp(struct device *dev) +{ + if (device_property_present(dev, "realtek,in2-differential") || + device_property_present(dev, "realtek,dmic1-data-pin") || + device_property_present(dev, "realtek,dmic2-data-pin") || + device_property_present(dev, "realtek,jd-mode")) + return true; + + return false; +} + static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev) { rt5645->pdata.in2_diff = device_property_read_bool(dev, @@ -3727,8 +3738,10 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, if (pdata) rt5645->pdata = *pdata; - else + else if (rt5645_check_dp(&i2c->dev)) rt5645_parse_dt(rt5645, &i2c->dev); + else + rt5645->pdata = jd_mode3_platform_data; if (quirk != -1) { rt5645->pdata.in2_diff = QUIRK_IN2_DIFF(quirk); -- 2.14.1

3 4

[alsa-devel] [PATCH v3 00/27] kill devm_ioremap_nocache
by Yisheng Xie 12 Jan '18

12 Jan '18

Hi all, When I tried to use devm_ioremap function and review related code, I found devm_ioremap and devm_ioremap_nocache is almost the same with each other, except one use ioremap while the other use ioremap_nocache. While ioremap's default function is ioremap_nocache, so devm_ioremap_nocache also have the same function with devm_ioremap, which can just be killed to reduce the size of devres.o(from 20304 bytes to 18992 bytes in my compile environment). I have posted two versions, which use macro instead of function for devm_ioremap_nocache[1] or devm_ioremap[2]. And Greg suggest me to kill devm_ioremap_nocache for no need to keep a macro around for the duplicate thing. So here comes v3 and please help to review. Thanks so much! Yisheng Xie [1] https://lkml.org/lkml/2017/11/20/135 [2] https://lkml.org/lkml/2017/11/25/21 Yisheng Xie (27): ASOC: replace devm_ioremap_nocache with devm_ioremap spi: replace devm_ioremap_nocache with devm_ioremap staging: replace devm_ioremap_nocache with devm_ioremap ipack: replace devm_ioremap_nocache with devm_ioremap media: replace devm_ioremap_nocache with devm_ioremap gpio: replace devm_ioremap_nocache with devm_ioremap mmc: replace devm_ioremap_nocache with devm_ioremap PCI: replace devm_ioremap_nocache with devm_ioremap platform/x86: replace devm_ioremap_nocache with devm_ioremap tty: replace devm_ioremap_nocache with devm_ioremap video: replace devm_ioremap_nocache with devm_ioremap rtc: replace devm_ioremap_nocache with devm_ioremap char: replace devm_ioremap_nocache with devm_ioremap mtd: nand: replace devm_ioremap_nocache with devm_ioremap dmaengine: replace devm_ioremap_nocache with devm_ioremap ata: replace devm_ioremap_nocache with devm_ioremap irqchip: replace devm_ioremap_nocache with devm_ioremap pinctrl: replace devm_ioremap_nocache with devm_ioremap drm: replace devm_ioremap_nocache with devm_ioremap regulator: replace devm_ioremap_nocache with devm_ioremap watchdog: replace devm_ioremap_nocache with devm_ioremap tools/testing/nvdimm: replace devm_ioremap_nocache with devm_ioremap MIPS: pci: replace devm_ioremap_nocache with devm_ioremap can: replace devm_ioremap_nocache with devm_ioremap wireless: replace devm_ioremap_nocache with devm_ioremap ethernet: replace devm_ioremap_nocache with devm_ioremap devres: kill devm_ioremap_nocache Documentation/driver-model/devres.txt | 1 - arch/mips/pci/pci-ar2315.c | 3 +-- drivers/ata/pata_arasan_cf.c | 3 +-- drivers/ata/pata_octeon_cf.c | 9 ++++---- drivers/ata/pata_rb532_cf.c | 2 +- drivers/char/hw_random/bcm63xx-rng.c | 3 +-- drivers/char/hw_random/octeon-rng.c | 10 ++++----- drivers/dma/altera-msgdma.c | 3 +-- drivers/dma/sprd-dma.c | 4 ++-- drivers/gpio/gpio-ath79.c | 3 +-- drivers/gpio/gpio-em.c | 6 ++--- drivers/gpio/gpio-htc-egpio.c | 4 ++-- drivers/gpio/gpio-xgene.c | 3 +-- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 3 +-- drivers/gpu/drm/sti/sti_hda.c | 4 ++-- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_tvout.c | 2 +- drivers/gpu/drm/sti/sti_vtg.c | 2 +- drivers/ipack/devices/ipoctal.c | 13 +++++------ drivers/irqchip/irq-renesas-intc-irqpin.c | 4 ++-- drivers/media/platform/tegra-cec/tegra_cec.c | 4 ++-- drivers/mmc/host/sdhci-acpi.c | 3 +-- drivers/mtd/nand/fsl_upm.c | 4 ++-- drivers/net/can/sja1000/sja1000_platform.c | 4 ++-- drivers/net/ethernet/altera/altera_tse_main.c | 3 +-- drivers/net/ethernet/ethoc.c | 8 +++---- drivers/net/ethernet/lantiq_etop.c | 4 ++-- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/wireless/ath/ath9k/ahb.c | 2 +- drivers/pci/dwc/pci-dra7xx.c | 2 +- drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 2 +- drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 4 ++-- drivers/pinctrl/freescale/pinctrl-imx1-core.c | 2 +- drivers/pinctrl/pinctrl-amd.c | 4 ++-- drivers/platform/x86/intel_pmc_core.c | 5 ++--- drivers/regulator/ti-abb-regulator.c | 6 ++--- drivers/rtc/rtc-sh.c | 4 ++-- drivers/spi/spi-jcore.c | 3 +-- drivers/staging/fsl-mc/bus/mc-io.c | 8 +++---- drivers/tty/mips_ejtag_fdc.c | 4 ++-- drivers/tty/serial/8250/8250_omap.c | 3 +-- drivers/tty/serial/lantiq.c | 3 +-- drivers/tty/serial/meson_uart.c | 3 +-- drivers/tty/serial/owl-uart.c | 2 +- drivers/tty/serial/pic32_uart.c | 4 ++-- drivers/video/fbdev/mbx/mbxfb.c | 9 ++++---- drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 2 +- drivers/video/fbdev/pxa168fb.c | 4 ++-- drivers/watchdog/bcm63xx_wdt.c | 4 ++-- drivers/watchdog/rc32434_wdt.c | 4 ++-- include/linux/io.h | 2 -- lib/devres.c | 29 ------------------------- scripts/coccinelle/free/devm_free.cocci | 2 -- sound/soc/au1x/ac97c.c | 4 ++-- sound/soc/au1x/i2sc.c | 4 ++-- sound/soc/intel/atom/sst/sst_acpi.c | 20 ++++++++--------- sound/soc/intel/boards/mfld_machine.c | 4 ++-- sound/soc/sh/fsi.c | 4 ++-- tools/testing/nvdimm/Kbuild | 2 +- tools/testing/nvdimm/test/iomap.c | 2 +- 62 files changed, 109 insertions(+), 168 deletions(-) -- 1.8.3.1

6 11

[alsa-devel] [PATCH v2] ASoC: hdac_hdmi: Ensuring proper setting of output widget power state
by abhijeet.kumar＠intel.com 12 Jan '18

12 Jan '18

From: Abhijeet Kumar <abhijeet.kumar(a)intel.com> In usecases like hot plug-unplug DP panel or modeset during a playback, sometimes we observe no audio after codec resets. During no audio condition, we have noticed that the power state of the pin or the connector is D3. Optimzing the way we set the power could mitigate the issue. With this changes the verb is sent to set the power state and response is received. Thus ensuring power state is set. Signed-off-by: Abhijeet Kumar <abhijeet.kumar(a)intel.com> --- Changes in v2: - update commit message sound/soc/codecs/hdac_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index f3b4f4dfae6a..e24caecf0a4f 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -718,7 +718,7 @@ static void hdac_hdmi_set_power_state(struct hdac_ext_device *edev, { if (get_wcaps(&edev->hdac, nid) & AC_WCAP_POWER) { if (!snd_hdac_check_power_state(&edev->hdac, nid, pwr_state)) - snd_hdac_codec_write(&edev->hdac, nid, 0, + snd_hdac_codec_read(&edev->hdac, nid, 0, AC_VERB_SET_POWER_STATE, pwr_state); } } -- 1.9.1

1 0

[alsa-devel] [PATCH v2] ASoC: rt5645: add fallback case for jack detection support
by Pierre-Louis Bossart 11 Jan '18

11 Jan '18

Commit 78f5605c0329 ("ASoC: rt5645: cleanup DMI matching code") did a lot of useful cleanups. This patch adds a default case to enable jack detection if there is no pdata, device property or quirk. The chosen jd-mode3 is the most common and should limit the addition of new DMI-based quirks. Existing DMI quirks which only set this mode are left as is and not removed. Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Bard Liao <bardliao(a)realtek.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- v2: no functional change, only rewrite of the commit message for clarity sound/soc/codecs/rt5645.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 789346cb30b9..8f140c8b93ac 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3739,6 +3739,17 @@ static const struct dmi_system_id dmi_platform_data[] = { { } }; +static bool rt5645_check_dp(struct device *dev) +{ + if (device_property_present(dev, "realtek,in2-differential") || + device_property_present(dev, "realtek,dmic1-data-pin") || + device_property_present(dev, "realtek,dmic2-data-pin") || + device_property_present(dev, "realtek,jd-mode")) + return true; + + return false; +} + static int rt5645_parse_dt(struct rt5645_priv *rt5645, struct device *dev) { rt5645->pdata.in2_diff = device_property_read_bool(dev, @@ -3779,8 +3790,10 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, if (pdata) rt5645->pdata = *pdata; - else + else if (rt5645_check_dp(&i2c->dev)) rt5645_parse_dt(rt5645, &i2c->dev); + else + rt5645->pdata = jd_mode3_platform_data; if (quirk != -1) { rt5645->pdata.in2_diff = QUIRK_IN2_DIFF(quirk); -- 2.14.1

2 1

[alsa-devel] [PATCH] ASoC: sgtl5000: fix powerup/down of micbias-voltage
by fischerc＠swissphone.de 11 Jan '18

11 Jan '18

From: Christian Fischer <fischerc(a)swissphone.de> The mic-bias-voltage should get powered up/down automatically. Added missing DAPM_PRE and DAPM_POST widgets to fire up the mic_bias_event function. Signed-off-by: Christian Fischer <fischerc(a)swissphone.de> --- sound/soc/codecs/sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index f2bb4fe..4973365 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -260,6 +260,9 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), + + SND_SOC_DAPM_PRE("MIC_BIAS_PRE", mic_bias_event), + SND_SOC_DAPM_POST("MIC_BIAS_POST", mic_bias_event), }; /* routes for sgtl5000 */ -- 2.7.4

3 3

[alsa-devel] [PATCH 1/2] sound: Remove unused register_sound_midi() and co
by Takashi Iwai 11 Jan '18

11 Jan '18

These helpers are no longer used after the removal of the legacy OSS drivers. Let's clean up. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/linux/sound.h | 2 -- sound/sound_core.c | 35 ----------------------------------- 2 files changed, 37 deletions(-) diff --git a/include/linux/sound.h b/include/linux/sound.h index 3c6d393c7f29..ec85b7a1f8d1 100644 --- a/include/linux/sound.h +++ b/include/linux/sound.h @@ -12,11 +12,9 @@ struct device; extern int register_sound_special(const struct file_operations *fops, int unit); extern int register_sound_special_device(const struct file_operations *fops, int unit, struct device *dev); extern int register_sound_mixer(const struct file_operations *fops, int dev); -extern int register_sound_midi(const struct file_operations *fops, int dev); extern int register_sound_dsp(const struct file_operations *fops, int dev); extern void unregister_sound_special(int unit); extern void unregister_sound_mixer(int unit); -extern void unregister_sound_midi(int unit); extern void unregister_sound_dsp(int unit); #endif /* _LINUX_SOUND_H */ diff --git a/sound/sound_core.c b/sound/sound_core.c index 99b73c675743..8b026b66cf18 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -452,26 +452,6 @@ int register_sound_mixer(const struct file_operations *fops, int dev) EXPORT_SYMBOL(register_sound_mixer); -/** - * register_sound_midi - register a midi device - * @fops: File operations for the driver - * @dev: Unit number to allocate - * - * Allocate a midi device. Unit is the number of the midi device requested. - * Pass -1 to request the next free midi unit. - * - * Return: On success, the allocated number is returned. On failure, - * a negative error code is returned. - */ - -int register_sound_midi(const struct file_operations *fops, int dev) -{ - return sound_insert_unit(&chains[2], fops, dev, 2, 130, - "midi", S_IRUSR | S_IWUSR, NULL); -} - -EXPORT_SYMBOL(register_sound_midi); - /* * DSP's are registered as a triple. Register only one and cheat * in open - see below. @@ -532,21 +512,6 @@ void unregister_sound_mixer(int unit) EXPORT_SYMBOL(unregister_sound_mixer); -/** - * unregister_sound_midi - unregister a midi device - * @unit: unit number to allocate - * - * Release a sound device that was allocated with register_sound_midi(). - * The unit passed is the return value from the register function. - */ - -void unregister_sound_midi(int unit) -{ - sound_remove_unit(&chains[2], unit); -} - -EXPORT_SYMBOL(unregister_sound_midi); - /** * unregister_sound_dsp - unregister a DSP device * @unit: unit number to allocate -- 2.15.1

1 1

[alsa-devel] [PATCH] ALSA: seq: Make ioctls race-free
by Takashi Iwai 11 Jan '18

11 Jan '18

The ALSA sequencer ioctls have no protection against racy calls while the concurrent operations may lead to interfere with each other. As reported recently, for example, the concurrent calls of setting client pool with a combination of write calls may lead to either the unkillable dead-lock or UAF. As a slightly big hammer solution, this patch introduces the mutex to make each ioctl exclusive. Although this may reduce performance via parallel ioctl calls, usually it's not demanded for sequencer usages, hence it should be negligible. Reported-by: Luo Quan <a4651386(a)163.com> Reviewed-by: Kees Cook <keescook(a)chromium.org> Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/seq_clientmgr.c | 3 +++ sound/core/seq/seq_clientmgr.h | 1 + 2 files changed, 4 insertions(+) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 6e22eea72654..d01913404581 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -221,6 +221,7 @@ static struct snd_seq_client *seq_create_client1(int client_index, int poolsize) rwlock_init(&client->ports_lock); mutex_init(&client->ports_mutex); INIT_LIST_HEAD(&client->ports_list_head); + mutex_init(&client->ioctl_mutex); /* find free slot in the client table */ spin_lock_irqsave(&clients_lock, flags); @@ -2130,7 +2131,9 @@ static long snd_seq_ioctl(struct file *file, unsigned int cmd, return -EFAULT; } + mutex_lock(&client->ioctl_mutex); err = handler->func(client, &buf); + mutex_unlock(&client->ioctl_mutex); if (err >= 0) { /* Some commands includes a bug in 'dir' field. */ if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT || diff --git a/sound/core/seq/seq_clientmgr.h b/sound/core/seq/seq_clientmgr.h index c6614254ef8a..0611e1e0ed5b 100644 --- a/sound/core/seq/seq_clientmgr.h +++ b/sound/core/seq/seq_clientmgr.h @@ -61,6 +61,7 @@ struct snd_seq_client { struct list_head ports_list_head; rwlock_t ports_lock; struct mutex ports_mutex; + struct mutex ioctl_mutex; int convert32; /* convert 32->64bit */ /* output pool */ -- 2.15.1

1 0

[alsa-devel] [PATCH -next] ASoC: stm32: fix a typo in stm32_adfsdm_probe()
by Wei Yongjun 11 Jan '18

11 Jan '18

Fix a typo, we should return PTR_ERR(priv->iio_cb) instead of PTR_ERR(priv->iio_ch). Fixes: 55da094824c4 ("ASoC: stm32: add DFSDM DAI support") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/stm/stm32_adfsdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index af50891..7306e3e 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -320,7 +320,7 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) priv->iio_cb = iio_channel_get_all_cb(&pdev->dev, NULL, NULL); if (IS_ERR(priv->iio_cb)) - return PTR_ERR(priv->iio_ch); + return PTR_ERR(priv->iio_cb); ret = devm_snd_soc_register_platform(&pdev->dev, &stm32_adfsdm_soc_platform);

2 1

[alsa-devel] Applied "IIO: ADC: stm32-dfsdm: avoid unused-variable warning" to the asoc tree
by Mark Brown 11 Jan '18

11 Jan '18

The patch IIO: ADC: stm32-dfsdm: avoid unused-variable warning 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 2353758bc2d427809f5feb15f046ded91c60afef Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd(a)arndb.de> Date: Thu, 11 Jan 2018 11:34:46 +0100 Subject: [PATCH] IIO: ADC: stm32-dfsdm: avoid unused-variable warning Building with CONFIG_OF disabled produces a compiler warning: drivers/iio/adc/stm32-dfsdm-core.c: In function 'stm32_dfsdm_probe': drivers/iio/adc/stm32-dfsdm-core.c:245:22: error: unused variable 'pnode' [-Werror=unused-variable] This removes the variable and open-codes it in the only place it gets used to avoid that warning. Fixes: bed73904e76f ("IIO: ADC: add stm32 DFSDM core support") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/iio/adc/stm32-dfsdm-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c index 72427414db7f..6cd655f8239b 100644 --- a/drivers/iio/adc/stm32-dfsdm-core.c +++ b/drivers/iio/adc/stm32-dfsdm-core.c @@ -242,7 +242,6 @@ MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match); static int stm32_dfsdm_probe(struct platform_device *pdev) { struct dfsdm_priv *priv; - struct device_node *pnode = pdev->dev.of_node; const struct of_device_id *of_id; const struct stm32_dfsdm_dev_data *dev_data; struct stm32_dfsdm *dfsdm; @@ -254,7 +253,7 @@ static int stm32_dfsdm_probe(struct platform_device *pdev) priv->pdev = pdev; - of_id = of_match_node(stm32_dfsdm_of_match, pnode); + of_id = of_match_node(stm32_dfsdm_of_match, pdev->dev.of_node); if (!of_id->data) { dev_err(&pdev->dev, "Data associated to device is missing\n"); return -EINVAL; -- 2.15.1

1 0

[alsa-devel] Applied "IIO: ADC: stm32-dfsdm: avoid unused-variable warning" to the asoc tree
by Mark Brown 11 Jan '18

11 Jan '18

The patch IIO: ADC: stm32-dfsdm: avoid unused-variable warning 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 25140717414c319bcc44b5aac39357a52d0bc8e0 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd(a)arndb.de> Date: Thu, 11 Jan 2018 11:34:46 +0100 Subject: [PATCH] IIO: ADC: stm32-dfsdm: avoid unused-variable warning Building with CONFIG_OF disabled produces a compiler warning: drivers/iio/adc/stm32-dfsdm-core.c: In function 'stm32_dfsdm_probe': drivers/iio/adc/stm32-dfsdm-core.c:245:22: error: unused variable 'pnode' [-Werror=unused-variable] This removes the variable and open-codes it in the only place it gets used to avoid that warning. Fixes: bed73904e76f ("IIO: ADC: add stm32 DFSDM core support") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/iio/adc/stm32-dfsdm-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c index 72427414db7f..6cd655f8239b 100644 --- a/drivers/iio/adc/stm32-dfsdm-core.c +++ b/drivers/iio/adc/stm32-dfsdm-core.c @@ -242,7 +242,6 @@ MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match); static int stm32_dfsdm_probe(struct platform_device *pdev) { struct dfsdm_priv *priv; - struct device_node *pnode = pdev->dev.of_node; const struct of_device_id *of_id; const struct stm32_dfsdm_dev_data *dev_data; struct stm32_dfsdm *dfsdm; @@ -254,7 +253,7 @@ static int stm32_dfsdm_probe(struct platform_device *pdev) priv->pdev = pdev; - of_id = of_match_node(stm32_dfsdm_of_match, pnode); + of_id = of_match_node(stm32_dfsdm_of_match, pdev->dev.of_node); if (!of_id->data) { dev_err(&pdev->dev, "Data associated to device is missing\n"); return -EINVAL; -- 2.15.1

1 0

[alsa-devel] Applied "IIO: ADC: fix return value check in stm32_dfsdm_adc_probe()" to the asoc tree
by Mark Brown 11 Jan '18

11 Jan '18

The patch IIO: ADC: fix return value check in stm32_dfsdm_adc_probe() 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 d5ff18bcd4b5e66396eab7e8271172157ee1253e Mon Sep 17 00:00:00 2001 From: Wei Yongjun <weiyongjun1(a)huawei.com> Date: Thu, 11 Jan 2018 11:12:41 +0000 Subject: [PATCH] IIO: ADC: fix return value check in stm32_dfsdm_adc_probe() In case of error, the function devm_iio_device_alloc() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: e2e6771c6462 ("IIO: ADC: add STM32 DFSDM sigma delta ADC support") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/iio/adc/stm32-dfsdm-adc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c index e628d04d5c77..5e871404f565 100644 --- a/drivers/iio/adc/stm32-dfsdm-adc.c +++ b/drivers/iio/adc/stm32-dfsdm-adc.c @@ -1100,9 +1100,9 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev) dev_data = (const struct stm32_dfsdm_dev_data *)of_id->data; iio = devm_iio_device_alloc(dev, sizeof(*adc)); - if (IS_ERR(iio)) { + if (!iio) { dev_err(dev, "%s: Failed to allocate IIO\n", __func__); - return PTR_ERR(iio); + return -ENOMEM; } adc = iio_priv(iio); -- 2.15.1

1 0

[alsa-devel] [PATCH] ASoC: stm32: select IIO_BUFFER
by Arnd Bergmann 11 Jan '18

11 Jan '18

The new stm32_adfsdm driver has incomplete dependencies as shown by Kconfig: warning: (SND_SOC_STM32_DFSDM && LMP91000) selects IIO_BUFFER_CB which has unmet direct dependencies (IIO && IIO_BUFFER) sound/soc/stm/stm32_adfsdm.o: In function `stm32_adfsdm_trigger': stm32_adfsdm.c:(.text+0x8c): undefined reference to `stm32_dfsdm_get_buff_cb' stm32_adfsdm.c:(.text+0x9c): undefined reference to `stm32_dfsdm_release_buff_cb' This makes the dependency on SND_SOC_STM32_DFSDM unconditional, so we can always resolve the stm32_dfsdm_get_buff_cb/stm32_dfsdm_release_buff_cb symbols and get the implied IIO_BUFFER dependency. compile-testing on other platforms is still possible as long as that IIO driver is there. Fixes: 55da094824c4 ("ASoC: stm32: add DFSDM DAI support") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/stm/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig index a78f7700d489..3ad881fc40a1 100644 --- a/sound/soc/stm/Kconfig +++ b/sound/soc/stm/Kconfig @@ -30,8 +30,9 @@ config SND_SOC_STM32_SPDIFRX config SND_SOC_STM32_DFSDM tristate "SoC Audio support for STM32 DFSDM" - depends on (ARCH_STM32 && OF && STM32_DFSDM_ADC) || COMPILE_TEST + depends on ARCH_STM32 || COMPILE_TEST depends on SND_SOC + depends on STM32_DFSDM_ADC select SND_SOC_GENERIC_DMAENGINE_PCM select SND_SOC_DMIC select IIO_BUFFER_CB -- 2.9.0

2 1

[alsa-devel] WARNING in snd_interval_mulkdiv
by syzbot 11 Jan '18

11 Jan '18

Hello, syzkaller hit the following crash on cf1fb158230edce8a0482bfb2e59b9c390477fb6 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master compiler: gcc (GCC) 7.1.1 20170620 .config is attached Raw console output is attached. C reproducer is attached syzkaller reproducer is attached. See https://goo.gl/kgGztJ for information about syzkaller reproducers IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+7e6ee55011deeebce15d(a)syzkaller.appspotmail.com It will help syzbot understand when the bug is fixed. See footer for details. If you forward the report, please keep this part and the footer. audit: type=1400 audit(1515606919.914:7): avc: denied { map } for pid=3501 comm="syzkaller879499" path="/root/syzkaller879499069" dev="sda1" ino=16481 scontext=unconfined_u:system_r:insmod_t:s0-s0:c0.c1023 tcontext=unconfined_u:object_r:user_home_t:s0 tclass=file permissive=1 WARNING: CPU: 1 PID: 3501 at sound/core/pcm_lib.c:563 muldiv32 sound/core/pcm_lib.c:563 [inline] WARNING: CPU: 1 PID: 3501 at sound/core/pcm_lib.c:563 snd_interval_mulkdiv+0x5a9/0x650 sound/core/pcm_lib.c:756 Kernel panic - not syncing: panic_on_warn set ... CPU: 1 PID: 3501 Comm: syzkaller879499 Not tainted 4.15.0-rc7+ #256 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:17 [inline] dump_stack+0x194/0x257 lib/dump_stack.c:53 panic+0x1e4/0x41c kernel/panic.c:183 __warn+0x1dc/0x200 kernel/panic.c:547 report_bug+0x211/0x2d0 lib/bug.c:184 fixup_bug.part.11+0x37/0x80 arch/x86/kernel/traps.c:178 fixup_bug arch/x86/kernel/traps.c:247 [inline] do_error_trap+0x2d7/0x3e0 arch/x86/kernel/traps.c:296 do_invalid_op+0x1b/0x20 arch/x86/kernel/traps.c:315 invalid_op+0x22/0x40 arch/x86/entry/entry_64.S:1079 RIP: 0010:muldiv32 sound/core/pcm_lib.c:563 [inline] RIP: 0010:snd_interval_mulkdiv+0x5a9/0x650 sound/core/pcm_lib.c:756 RSP: 0018:ffff8801c04c7478 EFLAGS: 00010293 RAX: ffff8801c05f43c0 RBX: ffff8801c04c7500 RCX: ffffffff841cb1f9 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 00000000000f4240 RBP: ffff8801c04c74c0 R08: 000000000000009c R09: ffffed00380bc5e3 R10: 0000000000000013 R11: ffffed00380bc5e2 R12: ffff8801c05e2ec0 R13: ffff8801c05e2eb4 R14: ffff8801c05e2ec8 R15: ffff8801c05e2ebc snd_pcm_hw_rule_mulkdiv+0xfd/0x1c0 sound/core/pcm_native.c:2040 constrain_params_by_rules+0x625/0x11b0 sound/core/pcm_native.c:400 snd_pcm_hw_refine+0x818/0x1070 sound/core/pcm_native.c:502 snd_pcm_hw_refine_old_user sound/core/pcm_native.c:3612 [inline] snd_pcm_common_ioctl+0x7f9/0x1f60 sound/core/pcm_native.c:2922 snd_pcm_ioctl+0x81/0xb0 sound/core/pcm_native.c:2959 vfs_ioctl fs/ioctl.c:46 [inline] do_vfs_ioctl+0x1b1/0x1520 fs/ioctl.c:686 SYSC_ioctl fs/ioctl.c:701 [inline] SyS_ioctl+0x8f/0xc0 fs/ioctl.c:692 entry_SYSCALL_64_fastpath+0x23/0x9a RIP: 0033:0x443d79 RSP: 002b:00007ffe547ec708 EFLAGS: 00000286 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: ffffffffffffffff RCX: 0000000000443d79 RDX: 0000000020001f64 RSI: 00000000c1004110 RDI: 0000000000000003 RBP: 00000000006ce018 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000020005000 R11: 0000000000000286 R12: 0000000000401a60 R13: 0000000000401af0 R14: 0000000000000000 R15: 0000000000000000 Dumping ftrace buffer: (ftrace buffer empty) Kernel Offset: disabled Rebooting in 86400 seconds.. --- This bug is generated by a dumb bot. It may contain errors. See https://goo.gl/tpsmEJ for details. Direct all questions to syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. If you forgot to add the Reported-by tag, once the fix for this bug is merged into any tree, please reply to this email with: #syz fix: exact-commit-title If you want to test a patch for this bug, please reply with: #syz test: git://repo/address.git branch and provide the patch inline or as an attachment. To mark this as a duplicate of another syzbot report, please reply with: #syz dup: exact-subject-of-another-report If it's a one-off invalid bug report, please reply with: #syz invalid Note: if the crash happens again, it will cause creation of a new bug report. Note: all commands must start from beginning of the line in the email body.

2 1

[alsa-devel] [PATCH] ASoC: ux500: add MODULE_LICENSE tag
by Arnd Bergmann 10 Jan '18

10 Jan '18

This adds MODULE_LICENSE/AUTHOR/DESCRIPTION tags to the ux500 platform drivers, to avoid these build warnings: WARNING: modpost: missing MODULE_LICENSE() in sound/soc/ux500/snd-soc-ux500-plat-dma.o WARNING: modpost: missing MODULE_LICENSE() in sound/soc/ux500/snd-soc-ux500-mach-mop500.o The company no longer exists, so the email addresses of the authors don't work any more, but I've added them anyway for consistency. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/ux500/mop500.c | 4 ++++ sound/soc/ux500/ux500_pcm.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c index 070a6880980e..c60a57797640 100644 --- a/sound/soc/ux500/mop500.c +++ b/sound/soc/ux500/mop500.c @@ -163,3 +163,7 @@ static struct platform_driver snd_soc_mop500_driver = { }; module_platform_driver(snd_soc_mop500_driver); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("ASoC MOP500 board driver"); +MODULE_AUTHOR("Ola Lilja"); diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index f12c01dddc8d..d35ba7700f46 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c @@ -165,3 +165,8 @@ int ux500_pcm_unregister_platform(struct platform_device *pdev) return 0; } EXPORT_SYMBOL_GPL(ux500_pcm_unregister_platform); + +MODULE_AUTHOR("Ola Lilja"); +MODULE_AUTHOR("Roger Nilsson"); +MODULE_DESCRIPTION("ASoC UX500 driver"); +MODULE_LICENSE("GPL v2"); -- 2.9.0

3 2

[alsa-devel] [PATCH 0/2] ASoC: Remove mfld dead code
by Vinod Koul 10 Jan '18

10 Jan '18

Medfield machine was not compiling for long on mainline. Since no one complained, lets remove the dead code and associated codec. Vinod Koul (2): ASoC: Intel: remove mfld_machine ASoC: sn95031: remove this code sound/soc/codecs/Kconfig | 4 - sound/soc/codecs/Makefile | 1 - sound/soc/codecs/sn95031.c | 936 ---------------------------------- sound/soc/codecs/sn95031.h | 133 ----- sound/soc/intel/boards/Kconfig | 14 - sound/soc/intel/boards/mfld_machine.c | 430 ---------------- 6 files changed, 1518 deletions(-) delete mode 100644 sound/soc/codecs/sn95031.c delete mode 100644 sound/soc/codecs/sn95031.h delete mode 100644 sound/soc/intel/boards/mfld_machine.c -- 2.7.4

4 8

[alsa-devel] [asoc:topic/st-dfsdm 2/2] sound/soc/stm/stm32_adfsdm.c:17:10: fatal error: linux/iio/adc/stm32-dfsdm-adc.h: No such file or directory
by kbuild test robot 10 Jan '18

10 Jan '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/st-dfsdm head: 55da094824c4ef1d50bc591733d79448d00265bb commit: 55da094824c4ef1d50bc591733d79448d00265bb [2/2] ASoC: stm32: add DFSDM DAI support config: frv-allmodconfig (attached as .config) compiler: frv-linux-gcc (GCC) 7.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 55da094824c4ef1d50bc591733d79448d00265bb # save the attached .config to linux build tree make.cross ARCH=frv All errors (new ones prefixed by >>): >> sound/soc/stm/stm32_adfsdm.c:17:10: fatal error: linux/iio/adc/stm32-dfsdm-adc.h: No such file or directory #include <linux/iio/adc/stm32-dfsdm-adc.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. vim +17 sound/soc/stm/stm32_adfsdm.c 14 15 #include <linux/iio/iio.h> 16 #include <linux/iio/consumer.h> > 17 #include <linux/iio/adc/stm32-dfsdm-adc.h> 18 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

Re: [alsa-devel] [PATCH v2] ASoC: sgtl5000: Fix powerup/down of micbias
by Fischer, Christian 10 Jan '18

10 Jan '18

Hello Daniel, I'm sorry, thats my first official patch :-) I've now cloned a kernel outside my buildsystem and (hopefully) a new, acceptable patch. Regards, Christian From d06794d98e3ed84ecb1641b74d093366ffff2cba Mon Sep 17 00:00:00 2001 From: Christian Fischer <fischerc(a)swissphone.de> Date: Wed, 10 Jan 2018 16:47:51 +0100 Subject: [PATCH v2] ASoC: sgtl5000: fix powerup/down of micbias-voltage The mic-bias-voltage should get powered up/down automatically. Added missing DAPM_PRE and DAPM_POST widgets to fire up the mic_bias_event function. Signed-off-by: Christian Fischer <fischerc(a)swissphone.de> --- sound/soc/codecs/sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index f2bb4fe..4973365 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -260,6 +260,9 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), + + SND_SOC_DAPM_PRE("MIC_BIAS_PRE", mic_bias_event), + SND_SOC_DAPM_POST("MIC_BIAS_POST", mic_bias_event), }; /* routes for sgtl5000 */ -- 2.7.4 -----Ursprüngliche Nachricht----- Von: Daniel Baluta [mailto:daniel.baluta@nxp.com] Gesendet: Mittwoch, 10. Januar 2018 15:31 An: Fischer, Christian <fischerc(a)swissphone.de>; alsa-devel(a)alsa-project.org Cc: lgirdwood(a)gmail.com; broonie(a)kernel.org; tiwai(a)suse.com Betreff: Re: [alsa-devel] [PATCH v2] ASoC: sgtl5000: Fix powerup/down of micbias On Mi, 2018-01-10 at 14:26 +0000, Fischer, Christian wrote: > Hello Fabio, > > is it now ok? > I'm not working with linux-git, so my patch is created by myself. > > Regards, > Christian > > Signed-off-by: Christian Fischer <fischerc(a)swissphone.de> Hi Christian, This doesn't look good to me. How are creating/sending the patches? You should update the commit message to include your Signed-off-by tag and then resend the entire patch. thanks, Daniel. > > --- sound/soc/codecs/sgtl5000.c > +++ sound/soc/codecs/sgtl5000.c > @@ -260,6 +260,9 @@ static const struct snd_soc_dapm_widget > > SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), > SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), > + > + SND_SOC_DAPM_PRE("MIC_BIAS_PRE", mic_bias_event), > + SND_SOC_DAPM_POST("MIC_BIAS_POST", mic_bias_event), > }; > > /* routes for sgtl5000 */ > > -----Ursprüngliche Nachricht----- > Von: Fabio Estevam [mailto:festevam@gmail.com] > Gesendet: Mittwoch, 10. Januar 2018 13:42 > An: Fischer, Christian <fischerc(a)swissphone.de> > Cc: alsa-devel(a)alsa-project.org; Takashi Iwai <tiwai(a)suse.com>; Mark > Brown <broonie(a)kernel.org>; Liam Girdwood <lgirdwood(a)gmail.com> > Betreff: Re: [alsa-devel] [PATCH] ASoC: sgtl5000: Fix powerup/down of > micbias > > Hi Christian, > > On Wed, Jan 10, 2018 at 8:07 AM, Fischer, Christian <fischerc(a)swissphone.de> wrote: > > > > The bias-bias-voltage should powered up/down automatically. > > Added missing DAPM_PRE and DAPM_POST widgets to fire up the mic_bias_event function. > Thanks for submitting the patch. > > You missed your Signed-off-by tag. > > Please resend it. > > Thanks > _______________________________________________ > Alsa-devel mailing list > Alsa-devel(a)alsa-project.org > https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail > man.alsa-project.org%2Fmailman%2Flistinfo%2Falsa-devel&data=02%7C01%7C > daniel.baluta%40nxp.com%7C4a771694af314fa7d73008d558362a37 > %7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636511912029282885&sdata=Zo42ZJxIxp54YyYLVsFrrRWkDt%2FqByR6uqr8U6pX3iY%3D&reserved=0

2 1

[alsa-devel] [asoc:topic/iio 9/11] drivers/iio/adc/stm32-dfsdm-adc.c:241:6: sparse: symbol 'stm32_dfsdm_stop_filter' was not declared. Should it be static?
by kbuild test robot 10 Jan '18

10 Jan '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/iio head: 16cbca06fa8288a4f58426fc898b141e12ee8008 commit: e2e6771c646251657fafb2a78db566d5c2c70635 [9/11] IIO: ADC: add STM32 DFSDM sigma delta ADC support reproduce: # apt-get install sparse git checkout e2e6771c646251657fafb2a78db566d5c2c70635 make ARCH=x86_64 allmodconfig make C=1 CF=-D__CHECK_ENDIAN__ sparse warnings: (new ones prefixed by >>) >> drivers/iio/adc/stm32-dfsdm-adc.c:241:6: sparse: symbol 'stm32_dfsdm_stop_filter' was not declared. Should it be >> drivers/iio/adc/stm32-dfsdm-adc.c:283:5: sparse: symbol 'stm32_dfsdm_channel_parse_of' was not declared. Should it be Please review and possibly fold the followup patch. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

3 3

[alsa-devel] [-next PATCH 0/4] sysfs and DEVICE_ATTR_<foo>
by Joe Perches 10 Jan '18

10 Jan '18

16 24

Re: [alsa-devel] [PATCH v2] ASoC: sgtl5000: Fix powerup/down of micbias
by Fischer, Christian 10 Jan '18

10 Jan '18

Hello Fabio, is it now ok? I'm not working with linux-git, so my patch is created by myself. Regards, Christian Signed-off-by: Christian Fischer <fischerc(a)swissphone.de> --- sound/soc/codecs/sgtl5000.c +++ sound/soc/codecs/sgtl5000.c @@ -260,6 +260,9 @@ static const struct snd_soc_dapm_widget SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), + + SND_SOC_DAPM_PRE("MIC_BIAS_PRE", mic_bias_event), + SND_SOC_DAPM_POST("MIC_BIAS_POST", mic_bias_event), }; /* routes for sgtl5000 */ -----Ursprüngliche Nachricht----- Von: Fabio Estevam [mailto:festevam@gmail.com] Gesendet: Mittwoch, 10. Januar 2018 13:42 An: Fischer, Christian <fischerc(a)swissphone.de> Cc: alsa-devel(a)alsa-project.org; Takashi Iwai <tiwai(a)suse.com>; Mark Brown <broonie(a)kernel.org>; Liam Girdwood <lgirdwood(a)gmail.com> Betreff: Re: [alsa-devel] [PATCH] ASoC: sgtl5000: Fix powerup/down of micbias Hi Christian, On Wed, Jan 10, 2018 at 8:07 AM, Fischer, Christian <fischerc(a)swissphone.de> wrote: > The bias-bias-voltage should powered up/down automatically. > Added missing DAPM_PRE and DAPM_POST widgets to fire up the mic_bias_event function. Thanks for submitting the patch. You missed your Signed-off-by tag. Please resend it. Thanks

2 1

Re: [alsa-devel] ASoC: sgtl5000: recording issue at 8 kHz with fsl-imx28
by Fischer, Christian 10 Jan '18

10 Jan '18

It's me again. I just found out that the audio playback is affected by this problem too. Maybe this can serve as a hint. Regards, Christian -----Ursprüngliche Nachricht----- Von: alsa-devel-bounces(a)alsa-project.org [mailto:alsa-devel-bounces@alsa-project.org] Im Auftrag von Fischer, Christian Gesendet: Mittwoch, 10. Januar 2018 11:31 An: alsa-devel(a)alsa-project.org Cc: 'Takashi Iwai' <tiwai(a)suse.com>; 'Mark Brown' <broonie(a)kernel.org>; 'Liam Girdwood' <lgirdwood(a)gmail.com> Betreff: [alsa-devel] ASoC: sgtl5000: recording issue at 8 kHz with fsl-imx28 Hello guys, trying to record from a SGTL5000 with 8 kHz sampling rate gives a very bad audio quality. All other sampling rates working fine. Initially posted at NXP forum: https://community.nxp.com/message/975131 Tested with imx28, sgtl5000 and Kernel 4.14.12. I've attached a recording with 8 kHz, capture-vol was 67, mic-gain 33, AVC-off and Capture-ZC off. Recorded with "arecord -D "hw:0,1" -t wav -f S16_LE -c 2 -r 8000 test.wav". Sounds like there are missing samples.. The microphone is powered from mic-bias and decoupled with a 100nF capacitor. Can anybody help me? Thank you guys! Kind regards, Christian Fischer

1 0

[alsa-devel] [RESEND PATCH v9 00/13] Add STM32 DFSDM support
by Arnaud Pouliquen 10 Jan '18

10 Jan '18

Hello Mark, Here is the resend of the patchset. I added the Reviewed-by: Jonathan Cameron in patch 10/13. Jonathan's comment for you, posted for this version: >So Mark, over to you. I'm happy if you want to do the immutable branch once >any issue you find are fixed, or I can do it. >I'm just looking for acks or a pull request now. History: Version 9 fix patch 10/13: IIO: ADC: add stm32 DFSDM support for PDM microphone Main deltas V9 vs V8: - Rework probe and remove order for audio configuration in stm32-dfsdm-adc.c. - Optimization of the filling of the dma_slave_config struct. Main deltas V8 vs V7: - Few typos fixes. - Function return optimizations in sound/soc/stm/stm32_adfsdm.c. Main deltas V7 vs V6: - Replaces the custom license information text with the appropriate SPDX identifier. - Few fixes in sound/soc/stm/stm32_adfsdm.c and stm32-dfsdm-core.c. - Add missing #interrupt-cells in binding examples. - Integrate last Jonathan's comments. Main deltas V6 vs V5: - Fix warning reported by kbuild test in : include/linux/iio/consumer.h sound/soc/stm/stm32_adfsdm.c Main deltas V5 vs V4: - Integrate ASOC DAI as a subnode of the DFSDM. - Add in kernel consumer interface to allow to manipulate attribute. Thanks, Arnaud Arnaud Pouliquen (12): docs: driver-api: add iio hw consumer section IIO: hw_consumer: add devm_iio_hw_consumer_alloc IIO: inkern: API for manipulating channel attributes IIO: Add DT bindings for sigma delta adc modulator IIO: ADC: add sigma delta modulator support IIO: add DT bindings for stm32 DFSDM filter IIO: ADC: add stm32 DFSDM core support IIO: ADC: add STM32 DFSDM sigma delta ADC support IIO: ADC: add stm32 DFSDM support for PDM microphone IIO: consumer: allow to set buffer sizes ASoC: add bindings for stm32 DFSDM filter ASoC: stm32: add DFSDM DAI support Lars-Peter Clausen (1): iio: Add hardware consumer buffer support .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 16 + .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 128 +++ .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 + Documentation/driver-api/iio/hw-consumer.rst | 51 + Documentation/driver-api/iio/index.rst | 1 + drivers/iio/adc/Kconfig | 37 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/sd_adc_modulator.c | 68 ++ drivers/iio/adc/stm32-dfsdm-adc.c | 1216 ++++++++++++++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 309 +++++ drivers/iio/adc/stm32-dfsdm.h | 310 +++++ drivers/iio/buffer/Kconfig | 10 + drivers/iio/buffer/Makefile | 1 + drivers/iio/buffer/industrialio-buffer-cb.c | 11 + drivers/iio/buffer/industrialio-hw-consumer.c | 247 ++++ drivers/iio/inkern.c | 17 +- include/linux/iio/adc/stm32-dfsdm-adc.h | 18 + include/linux/iio/consumer.h | 37 + include/linux/iio/hw-consumer.h | 21 + include/linux/iio/iio.h | 28 - include/linux/iio/types.h | 28 + sound/soc/stm/Kconfig | 11 + sound/soc/stm/Makefile | 3 + sound/soc/stm/stm32_adfsdm.c | 347 ++++++ 25 files changed, 2961 insertions(+), 33 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 Documentation/driver-api/iio/hw-consumer.rst create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/buffer/industrialio-hw-consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h create mode 100644 include/linux/iio/hw-consumer.h create mode 100644 sound/soc/stm/stm32_adfsdm.c -- 2.7.4

3 16

[alsa-devel] [PATCH 1/2] soundwire: Fix a signedness bug
by Dan Carpenter 10 Jan '18

10 Jan '18

"ret" is an int and "buf" is a u8. sdw_read() returns negative error codes which are truncated to the u8, 0-255 range before being stored as an int. It means that "ret" can't be less than zero. Fixes: b0a9c37b0178 ("soundwire: Add slave status handling") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 4c345197eb55..ac88031f7664 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -771,12 +771,13 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) sdw_modify_slave_status(slave, SDW_SLAVE_ALERT); /* Read Instat 1, Instat 2 and Instat 3 registers */ - ret = buf = sdw_read(slave, SDW_SCP_INT1); + ret = sdw_read(slave, SDW_SCP_INT1); if (ret < 0) { dev_err(slave->bus->dev, "SDW_SCP_INT1 read failed:%d", ret); return ret; } + buf = ret; ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, buf2); if (ret < 0) { @@ -870,12 +871,13 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave) * Read status again to ensure no new interrupts arrived * while servicing interrupts. */ - ret = _buf = sdw_read(slave, SDW_SCP_INT1); + ret = sdw_read(slave, SDW_SCP_INT1); if (ret < 0) { dev_err(slave->bus->dev, "SDW_SCP_INT1 read failed:%d", ret); return ret; } + _buf = ret; ret = sdw_nread(slave, SDW_SCP_INTSTAT2, 2, _buf2); if (ret < 0) {

3 6

[alsa-devel] [PATCH] ASoC: sgtl5000: Fix powerup/down of micbias
by Fischer, Christian 10 Jan '18

10 Jan '18

The bias-bias-voltage should powered up/down automatically. Added missing DAPM_PRE and DAPM_POST widgets to fire up the mic_bias_event function. --- sound/soc/codecs/sgtl5000.c +++ sound/soc/codecs/sgtl5000.c @@ -260,6 +260,9 @@ static const struct snd_soc_dapm_widget SND_SOC_DAPM_PRE("VAG_POWER_PRE", power_vag_event), SND_SOC_DAPM_POST("VAG_POWER_POST", power_vag_event), + + SND_SOC_DAPM_PRE("MIC_BIAS_PRE", mic_bias_event), + SND_SOC_DAPM_POST("MIC_BIAS_POST", mic_bias_event), }; /* routes for sgtl5000 */

2 1

[alsa-devel] [PATCH v7 00/13] Add STM32 DFSDM support
by Arnaud Pouliquen 10 Jan '18

10 Jan '18

Hello, Here is a new version integrating last comments Main deltas V7 vs V6: - Replaces the custom license information text with the appropriate SPDX identifier. - Few fixes in sound/soc/stm/stm32_adfsdm.c and stm32-dfsdm-core.c. - Add missing #interrupt-cells in binding examples. - Integrate last Jonathan's comments. Main deltas V6 vs V5: - Fix warning reported by kbuild test in : include/linux/iio/consumer.h sound/soc/stm/stm32_adfsdm.c Main deltas V5 vs V4: - Integrate ASOC DAI as a subnode of the DFSDM. - Add in kernel consumer interface to allow to manipulate attribute. Regards, Arnaud Arnaud Pouliquen (12): docs: driver-api: add iio hw consumer section IIO: hw_consumer: add devm_iio_hw_consumer_alloc IIO: inkern: API for manipulating channel attributes IIO: Add DT bindings for sigma delta adc modulator IIO: ADC: add sigma delta modulator support IIO: add DT bindings for stm32 DFSDM filter IIO: ADC: add stm32 DFSDM core support IIO: ADC: add STM32 DFSDM sigma delta ADC support IIO: ADC: add stm32 DFSDM support for PDM microphone IIO: consumer: allow to set buffer sizes ASoC: add bindings for stm32 DFSDM filter ASoC: stm32: add DFSDM DAI support Lars-Peter Clausen (1): iio: Add hardware consumer buffer support .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 16 + .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 128 ++ .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 + Documentation/driver-api/iio/hw-consumer.rst | 51 + Documentation/driver-api/iio/index.rst | 1 + drivers/iio/adc/Kconfig | 37 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/sd_adc_modulator.c | 68 ++ drivers/iio/adc/stm32-dfsdm-adc.c | 1220 ++++++++++++++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 309 +++++ drivers/iio/adc/stm32-dfsdm.h | 310 +++++ drivers/iio/buffer/Kconfig | 10 + drivers/iio/buffer/Makefile | 1 + drivers/iio/buffer/industrialio-buffer-cb.c | 11 + drivers/iio/buffer/industrialio-hw-consumer.c | 247 ++++ drivers/iio/inkern.c | 18 +- include/linux/iio/adc/stm32-dfsdm-adc.h | 18 + include/linux/iio/consumer.h | 37 + include/linux/iio/hw-consumer.h | 21 + include/linux/iio/iio.h | 28 - include/linux/iio/types.h | 28 + sound/soc/stm/Kconfig | 11 + sound/soc/stm/Makefile | 3 + sound/soc/stm/stm32_adfsdm.c | 351 ++++++ 25 files changed, 2970 insertions(+), 33 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 Documentation/driver-api/iio/hw-consumer.rst create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/buffer/industrialio-hw-consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h create mode 100644 include/linux/iio/hw-consumer.h create mode 100644 sound/soc/stm/stm32_adfsdm.c -- 2.7.4

3 22

[alsa-devel] [PATCH v5 00/13] Add STM32 DFSDM support
by Arnaud Pouliquen 10 Jan '18

10 Jan '18

Hello, Here is a new version integrating remarks from Rob and Jonathan. Main deltas vs V4: - Integrate ASOC DAI not as a subnode of the DFSDM. - Add in kernel consumer interface to allow to manipulate attribute. Context reminder: ----------------- DFSDM peripheral is a peripheral that allows to connect some sigma delta ADCs or PDM microphones via a SPI or Manchester bus. DFSDM integrates digital filters to offer up to 24 bits final resolution. In term of SW architecture. 2 use-cases have to be supported: 1) Sigma delta ADC conversion through IIO framework. Sigma delta ADC is handled by generic sigma delta modulator driver. DFSDM peripheral is binded to a SD modulator ADC using the IIO HW consumer interface. Please notice that IIO HW consumer interface has be proposed by Lars, but is part of this patchset with Lars's agreement. User interface is IIO one. Notice that this patch-set propose only a raw conversion, to simplify review. Buffer and trigger management will be added in next patch-sets. 2) PDM microphone record through ALSA framework. PDM microphone is handled by ASOC Generic DMIC codec driver. ADFSDM ASOC DAI driver is binded to IIO driver using the IIO consumer interface ADFSDM ASOC DAI driver is binded to a PDM microphone ASOC component using ASOC Of_graph. User interface is ALSA one. As IIO DMA management is not adapted to an audio realtime stream. A specific DMA management has been implemented in IIO driver for audio purposes. Regards, Arnaud Arnaud Pouliquen (12): docs: driver-api: add iio hw consumer section IIO: hw_consumer: add devm_iio_hw_consumer_alloc IIO: inkern: API for manipulating channel attributes IIO: Add DT bindings for sigma delta adc modulator IIO: ADC: add sigma delta modulator support IIO: add DT bindings for stm32 DFSDM filter IIO: ADC: add stm32 DFSDM core support IIO: ADC: add STM32 DFSDM sigma delta ADC support IIO: ADC: add stm32 DFSDM support for PDM microphone IIO: consumer: allow to set buffer sizes ASoC: add bindings for stm32 DFSDM filter ASoC: stm32: add DFSDM DAI support Lars-Peter Clausen (1): iio: Add hardware consumer buffer support .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 16 + .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 127 ++ .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 62 + Documentation/driver-api/iio/hw-consumer.rst | 51 + Documentation/driver-api/iio/index.rst | 1 + drivers/iio/adc/Kconfig | 37 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/sd_adc_modulator.c | 81 ++ drivers/iio/adc/stm32-dfsdm-adc.c | 1232 ++++++++++++++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 318 +++++ drivers/iio/adc/stm32-dfsdm.h | 319 +++++ drivers/iio/buffer/Kconfig | 10 + drivers/iio/buffer/Makefile | 1 + drivers/iio/buffer/industrialio-buffer-cb.c | 11 + drivers/iio/buffer/industrialio-hw-consumer.c | 248 ++++ drivers/iio/inkern.c | 18 +- include/linux/iio/adc/stm32-dfsdm-adc.h | 28 + include/linux/iio/consumer.h | 37 + include/linux/iio/hw-consumer.h | 22 + sound/soc/stm/Kconfig | 11 + sound/soc/stm/Makefile | 3 + sound/soc/stm/stm32_adfsdm.c | 386 ++++++ 23 files changed, 3030 insertions(+), 5 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 Documentation/driver-api/iio/hw-consumer.rst create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/buffer/industrialio-hw-consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h create mode 100644 include/linux/iio/hw-consumer.h create mode 100644 sound/soc/stm/stm32_adfsdm.c -- 2.7.4

4 21

[alsa-devel] Applied "IIO: inkern: API for manipulating channel attributes" to the asoc tree
by Mark Brown 10 Jan '18

10 Jan '18

The patch IIO: inkern: API for manipulating channel attributes 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 34739a213dbb85c8d775de42d52358255059c257 Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Date: Wed, 10 Jan 2018 11:13:06 +0100 Subject: [PATCH] IIO: inkern: API for manipulating channel attributes Extend the inkern API with functions for reading and writing attribute of iio channels. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/iio/inkern.c | 17 ++++++++++++----- include/linux/iio/consumer.h | 26 ++++++++++++++++++++++++++ include/linux/iio/iio.h | 28 ---------------------------- include/linux/iio/types.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 33 deletions(-) diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c index 069defcc6d9b..ec98790e2a28 100644 --- a/drivers/iio/inkern.c +++ b/drivers/iio/inkern.c @@ -664,9 +664,8 @@ int iio_convert_raw_to_processed(struct iio_channel *chan, int raw, } EXPORT_SYMBOL_GPL(iio_convert_raw_to_processed); -static int iio_read_channel_attribute(struct iio_channel *chan, - int *val, int *val2, - enum iio_chan_info_enum attribute) +int iio_read_channel_attribute(struct iio_channel *chan, int *val, int *val2, + enum iio_chan_info_enum attribute) { int ret; @@ -682,6 +681,7 @@ static int iio_read_channel_attribute(struct iio_channel *chan, return ret; } +EXPORT_SYMBOL_GPL(iio_read_channel_attribute); int iio_read_channel_offset(struct iio_channel *chan, int *val, int *val2) { @@ -850,7 +850,8 @@ static int iio_channel_write(struct iio_channel *chan, int val, int val2, chan->channel, val, val2, info); } -int iio_write_channel_raw(struct iio_channel *chan, int val) +int iio_write_channel_attribute(struct iio_channel *chan, int val, int val2, + enum iio_chan_info_enum attribute) { int ret; @@ -860,12 +861,18 @@ int iio_write_channel_raw(struct iio_channel *chan, int val) goto err_unlock; } - ret = iio_channel_write(chan, val, 0, IIO_CHAN_INFO_RAW); + ret = iio_channel_write(chan, val, val2, attribute); err_unlock: mutex_unlock(&chan->indio_dev->info_exist_lock); return ret; } +EXPORT_SYMBOL_GPL(iio_write_channel_attribute); + +int iio_write_channel_raw(struct iio_channel *chan, int val) +{ + return iio_write_channel_attribute(chan, val, 0, IIO_CHAN_INFO_RAW); +} EXPORT_SYMBOL_GPL(iio_write_channel_raw); unsigned int iio_get_channel_ext_info_count(struct iio_channel *chan) diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h index 5e347a9805fd..2017f35db17c 100644 --- a/include/linux/iio/consumer.h +++ b/include/linux/iio/consumer.h @@ -215,6 +215,32 @@ int iio_read_channel_average_raw(struct iio_channel *chan, int *val); */ int iio_read_channel_processed(struct iio_channel *chan, int *val); +/** + * iio_write_channel_attribute() - Write values to the device attribute. + * @chan: The channel being queried. + * @val: Value being written. + * @val2: Value being written.val2 use depends on attribute type. + * @attribute: info attribute to be read. + * + * Returns an error code or 0. + */ +int iio_write_channel_attribute(struct iio_channel *chan, int val, + int val2, enum iio_chan_info_enum attribute); + +/** + * iio_read_channel_attribute() - Read values from the device attribute. + * @chan: The channel being queried. + * @val: Value being written. + * @val2: Value being written.Val2 use depends on attribute type. + * @attribute: info attribute to be written. + * + * Returns an error code if failed. Else returns a description of what is in val + * and val2, such as IIO_VAL_INT_PLUS_MICRO telling us we have a value of val + * + val2/1e6 + */ +int iio_read_channel_attribute(struct iio_channel *chan, int *val, + int *val2, enum iio_chan_info_enum attribute); + /** * iio_write_channel_raw() - write to a given channel * @chan: The channel being queried. diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index 20b61347ea58..f12a61be1ede 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -20,34 +20,6 @@ * Currently assumes nano seconds. */ -enum iio_chan_info_enum { - IIO_CHAN_INFO_RAW = 0, - IIO_CHAN_INFO_PROCESSED, - IIO_CHAN_INFO_SCALE, - IIO_CHAN_INFO_OFFSET, - IIO_CHAN_INFO_CALIBSCALE, - IIO_CHAN_INFO_CALIBBIAS, - IIO_CHAN_INFO_PEAK, - IIO_CHAN_INFO_PEAK_SCALE, - IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW, - IIO_CHAN_INFO_AVERAGE_RAW, - IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY, - IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY, - IIO_CHAN_INFO_SAMP_FREQ, - IIO_CHAN_INFO_FREQUENCY, - IIO_CHAN_INFO_PHASE, - IIO_CHAN_INFO_HARDWAREGAIN, - IIO_CHAN_INFO_HYSTERESIS, - IIO_CHAN_INFO_INT_TIME, - IIO_CHAN_INFO_ENABLE, - IIO_CHAN_INFO_CALIBHEIGHT, - IIO_CHAN_INFO_CALIBWEIGHT, - IIO_CHAN_INFO_DEBOUNCE_COUNT, - IIO_CHAN_INFO_DEBOUNCE_TIME, - IIO_CHAN_INFO_CALIBEMISSIVITY, - IIO_CHAN_INFO_OVERSAMPLING_RATIO, -}; - enum iio_shared_by { IIO_SEPARATE, IIO_SHARED_BY_TYPE, diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h index 2aa7b6384d64..6eb3d683ef62 100644 --- a/include/linux/iio/types.h +++ b/include/linux/iio/types.h @@ -34,4 +34,32 @@ enum iio_available_type { IIO_AVAIL_RANGE, }; +enum iio_chan_info_enum { + IIO_CHAN_INFO_RAW = 0, + IIO_CHAN_INFO_PROCESSED, + IIO_CHAN_INFO_SCALE, + IIO_CHAN_INFO_OFFSET, + IIO_CHAN_INFO_CALIBSCALE, + IIO_CHAN_INFO_CALIBBIAS, + IIO_CHAN_INFO_PEAK, + IIO_CHAN_INFO_PEAK_SCALE, + IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW, + IIO_CHAN_INFO_AVERAGE_RAW, + IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY, + IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY, + IIO_CHAN_INFO_SAMP_FREQ, + IIO_CHAN_INFO_FREQUENCY, + IIO_CHAN_INFO_PHASE, + IIO_CHAN_INFO_HARDWAREGAIN, + IIO_CHAN_INFO_HYSTERESIS, + IIO_CHAN_INFO_INT_TIME, + IIO_CHAN_INFO_ENABLE, + IIO_CHAN_INFO_CALIBHEIGHT, + IIO_CHAN_INFO_CALIBWEIGHT, + IIO_CHAN_INFO_DEBOUNCE_COUNT, + IIO_CHAN_INFO_DEBOUNCE_TIME, + IIO_CHAN_INFO_CALIBEMISSIVITY, + IIO_CHAN_INFO_OVERSAMPLING_RATIO, +}; + #endif /* _IIO_TYPES_H_ */ -- 2.15.1

1 0

[alsa-devel] [PATCH v4 00/12] Add STM32 DFSDM support
by Arnaud Pouliquen 10 Jan '18

10 Jan '18

Hello, Here is a new version of the DFSDM proposed. Context reminder: ----------------- DFSDM peripheral is a peripheral that allows to connect some sigma delta ADCs or PDM microphones via a SPI or Manchester bus. DFSDM integrates digital filters to offer up to 24 bits final resolution. In term of SW architecture. 2 use-cases have to be supported: 1) Sigma delta ADC conversion through IIO framework. Sigma delta ADC is handled by generic sigma delta modulator driver. DFSDM peripheral is binded to a SD modulator ADC using the IIO HW consumer interface. Please notice that IIO HW consumer interface has be proposed by Lars, but is part of this patchset with Lars's agreement. User interface is IIO one. Notice that this patch-set propose only a raw conversion, to simplify review. Buffer and trigger management will be added in next patch-sets. 2) PDM microphone record through ALSA framework. PDM microphone is handled by ASOC Generic DMIC codec driver. ADFSDM ASOC DAI driver is binded to IIO driver using the IIO consumer interface ADFSDM ASOC DAI driver is binded to a PDM microphone ASOC component using ASOC Of_graph. User interface is ALSA one. As IIO DMA management is not adapted to an audio realtime stream. A specific DMA management has been implemented in IIO driver for audio purposes. History of the versions: ----------------------- V3: Implementation with DMA support in IIO instead of handling it in ASOC. - New patches to support ASoC DMA codec in DT - ASoC: Add Bindins for DMIC codec driver. - ASoC: codec: add DT support in dmic codec. - New patches to allow in-kernel set of IIO buffer size and watermark - IIO: consumer: allow to set buffer sizes. - IIO DFSDM drivers - Split audio and ADC support in 2 drivers. - Implement DMA cyclic mode. - Add SPI bus Trigger for buffer management. - IIO sigma delta adc drivers - Suppress "simple and rename driver. - ASoC driver - Suppress DMA engine. - Suppress copy ops. - Use IIO consmumer interface to enable/Disable DFSDM. V2: Patch-set associated to this RFC proposes an implementation of the DFSDM features shared between ASoC and IIO frameworks. Patch-set is only a Skeleton of the drivers, so a base to discuss and validate a design. It contains minimum code to allow probing (with DT) and to expose the ASoC and IIO ABI. Hope that is sufficent in a first step to allow to focus on APIs. In this patch-set there are two new APIs used: - IIO in-kern API: based on hw_customer API proposed by Lars - ASOC <-> IIO API inspired by API defined for hdmi-codec for ASoC/DRM interconnect. API is dedicated to DFSDM only. Notice also that this design is based on following assumption: - Audio stream ABI interface is ASoC, no access to data through IIO ABI for PDM. - ASoC DMA should be used for audio transfer as designed for real time stream. - Need some runtime parameters exchange between ASoC and IIO due to the correlation between the sample frequency, the DFSDM decimation factor and the associated scaling. - "ASoC: dmaengine_pcm: add copy support" patch: I added a patch in ASoC that allows to implement a copy function to process data after DMA transfer. Requested, as DFSDM samples captured contain channel ID on 8-LSB bits and need also a potential rescale to present DAT on 24-bits. - "IIO: ADC: add sigma delta modulator support" patch: Simple dummy driver created to support external Sigma delta modulator. It is binded to DFSDM driver through hw_customer API. Regards, Arnaud Arnaud Pouliquen (11): docs: driver-api: add iio hw consumer section IIO: hw_consumer: add devm_iio_hw_consumer_alloc IIO: Add DT bindings for sigma delta adc modulator IIO: ADC: add sigma delta modulator support IIO: add DT bindings for stm32 DFSDM filter IIO: ADC: add stm32 DFSDM core support IIO: ADC: add STM32 DFSDM sigma delta ADC support IIO: ADC: add stm32 DFSDM support for PDM microphone IIO: consumer: allow to set buffer sizes ASoC: add bindings for stm32 DFSDM filter ASoC: stm32: add DFSDM DAI support Lars-Peter Clausen (1): iio: Add hardware consumer buffer support .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 22 + .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 127 ++ .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 + Documentation/driver-api/iio/hw-consumer.rst | 50 + Documentation/driver-api/iio/index.rst | 1 + drivers/iio/adc/Kconfig | 37 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/sd_adc_modulator.c | 82 ++ drivers/iio/adc/stm32-dfsdm-adc.c | 1250 ++++++++++++++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 318 +++++ drivers/iio/adc/stm32-dfsdm.h | 319 +++++ drivers/iio/buffer/Kconfig | 10 + drivers/iio/buffer/Makefile | 1 + drivers/iio/buffer/industrialio-buffer-cb.c | 11 + drivers/iio/buffer/industrialio-hw-consumer.c | 248 ++++ include/linux/iio/adc/stm32-dfsdm-adc.h | 27 + include/linux/iio/consumer.h | 11 + include/linux/iio/hw-consumer.h | 22 + sound/soc/stm/Kconfig | 11 + sound/soc/stm/Makefile | 3 + sound/soc/stm/stm32_adfsdm.c | 388 ++++++ 22 files changed, 3017 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 Documentation/driver-api/iio/hw-consumer.rst create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/buffer/industrialio-hw-consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h create mode 100644 include/linux/iio/hw-consumer.h create mode 100644 sound/soc/stm/stm32_adfsdm.c -- 2.7.4

4 28

[alsa-devel] Applied "IIO: ADC: add stm32 DFSDM support for PDM microphone" to the asoc tree
by Mark Brown 10 Jan '18

10 Jan '18

The patch IIO: ADC: add stm32 DFSDM support for PDM microphone 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 eca949800d2dd761bc0c73b793e4e9ad4a997469 Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Date: Wed, 10 Jan 2018 11:13:12 +0100 Subject: [PATCH] IIO: ADC: add stm32 DFSDM support for PDM microphone This code offers a way to handle PDM audio microphones in ASOC framework. Audio driver should use consumer API. A specific management is implemented for DMA, with a callback, to allows to handle audio buffers efficiently. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 16 + drivers/iio/adc/stm32-dfsdm-adc.c | 502 ++++++++++++++++++++- include/linux/iio/adc/stm32-dfsdm-adc.h | 18 + 3 files changed, 529 insertions(+), 7 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h diff --git a/Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 b/Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 new file mode 100644 index 000000000000..da9822309f07 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 @@ -0,0 +1,16 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_voltage_spi_clk_freq +KernelVersion: 4.14 +Contact: arnaud.pouliquen(a)st.com +Description: + For audio purpose only. + Used by audio driver to set/get the spi input frequency. + This is mandatory if DFSDM is slave on SPI bus, to + provide information on the SPI clock frequency during runtime + Notice that the SPI frequency should be a multiple of sample + frequency to ensure the precision. + if DFSDM input is SPI master + Reading SPI clkout frequency, + error on writing + If DFSDM input is SPI Slave: + Reading returns value previously set. + Writing value before starting conversions. \ No newline at end of file diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c index 68b5920e92cb..b03ca3f94331 100644 --- a/drivers/iio/adc/stm32-dfsdm-adc.c +++ b/drivers/iio/adc/stm32-dfsdm-adc.c @@ -6,19 +6,23 @@ * Author: Arnaud Pouliquen <arnaud.pouliquen(a)st.com>. */ +#include <linux/dmaengine.h> +#include <linux/dma-mapping.h> #include <linux/interrupt.h> #include <linux/iio/buffer.h> #include <linux/iio/hw-consumer.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/module.h> -#include <linux/of.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h> #include "stm32-dfsdm.h" +#define DFSDM_DMA_BUFFER_SIZE (4 * PAGE_SIZE) + /* Conversion timeout */ #define DFSDM_TIMEOUT_US 100000 #define DFSDM_TIMEOUT (msecs_to_jiffies(DFSDM_TIMEOUT_US / 1000)) @@ -58,6 +62,18 @@ struct stm32_dfsdm_adc { struct completion completion; u32 *buffer; + /* Audio specific */ + unsigned int spi_freq; /* SPI bus clock frequency */ + unsigned int sample_freq; /* Sample frequency after filter decimation */ + int (*cb)(const void *data, size_t size, void *cb_priv); + void *cb_priv; + + /* DMA */ + u8 *rx_buf; + unsigned int bufi; /* Buffer current position */ + unsigned int buf_sz; /* Buffer size */ + struct dma_chan *dma_chan; + dma_addr_t dma_buf; }; struct stm32_dfsdm_str2field { @@ -351,10 +367,63 @@ int stm32_dfsdm_channel_parse_of(struct stm32_dfsdm *dfsdm, return 0; } +static ssize_t dfsdm_adc_audio_get_spiclk(struct iio_dev *indio_dev, + uintptr_t priv, + const struct iio_chan_spec *chan, + char *buf) +{ + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + + return snprintf(buf, PAGE_SIZE, "%d\n", adc->spi_freq); +} + +static ssize_t dfsdm_adc_audio_set_spiclk(struct iio_dev *indio_dev, + uintptr_t priv, + const struct iio_chan_spec *chan, + const char *buf, size_t len) +{ + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + struct stm32_dfsdm_filter *fl = &adc->dfsdm->fl_list[adc->fl_id]; + struct stm32_dfsdm_channel *ch = &adc->dfsdm->ch_list[adc->ch_id]; + unsigned int sample_freq = adc->sample_freq; + unsigned int spi_freq; + int ret; + + dev_err(&indio_dev->dev, "enter %s\n", __func__); + /* If DFSDM is master on SPI, SPI freq can not be updated */ + if (ch->src != DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL) + return -EPERM; + + ret = kstrtoint(buf, 0, &spi_freq); + if (ret) + return ret; + + if (!spi_freq) + return -EINVAL; + + if (sample_freq) { + if (spi_freq % sample_freq) + dev_warn(&indio_dev->dev, + "Sampling rate not accurate (%d)\n", + spi_freq / (spi_freq / sample_freq)); + + ret = stm32_dfsdm_set_osrs(fl, 0, (spi_freq / sample_freq)); + if (ret < 0) { + dev_err(&indio_dev->dev, + "No filter parameters that match!\n"); + return ret; + } + } + adc->spi_freq = spi_freq; + + return len; +} + static int stm32_dfsdm_start_conv(struct stm32_dfsdm_adc *adc, bool dma) { struct regmap *regmap = adc->dfsdm->regmap; int ret; + unsigned int dma_en = 0, cont_en = 0; ret = stm32_dfsdm_start_channel(adc->dfsdm, adc->ch_id); if (ret < 0) @@ -365,6 +434,24 @@ static int stm32_dfsdm_start_conv(struct stm32_dfsdm_adc *adc, bool dma) if (ret < 0) goto stop_channels; + if (dma) { + /* Enable DMA transfer*/ + dma_en = DFSDM_CR1_RDMAEN(1); + /* Enable conversion triggered by SPI clock*/ + cont_en = DFSDM_CR1_RCONT(1); + } + /* Enable DMA transfer*/ + ret = regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id), + DFSDM_CR1_RDMAEN_MASK, dma_en); + if (ret < 0) + goto stop_channels; + + /* Enable conversion triggered by SPI clock*/ + ret = regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id), + DFSDM_CR1_RCONT_MASK, cont_en); + if (ret < 0) + goto stop_channels; + ret = stm32_dfsdm_start_filter(adc->dfsdm, adc->fl_id); if (ret < 0) goto stop_channels; @@ -398,6 +485,231 @@ static void stm32_dfsdm_stop_conv(struct stm32_dfsdm_adc *adc) stm32_dfsdm_stop_channel(adc->dfsdm, adc->ch_id); } +static int stm32_dfsdm_set_watermark(struct iio_dev *indio_dev, + unsigned int val) +{ + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + unsigned int watermark = DFSDM_DMA_BUFFER_SIZE / 2; + + /* + * DMA cyclic transfers are used, buffer is split into two periods. + * There should be : + * - always one buffer (period) DMA is working on + * - one buffer (period) driver pushed to ASoC side. + */ + watermark = min(watermark, val * (unsigned int)(sizeof(u32))); + adc->buf_sz = watermark * 2; + + return 0; +} + +static unsigned int stm32_dfsdm_adc_dma_residue(struct stm32_dfsdm_adc *adc) +{ + struct dma_tx_state state; + enum dma_status status; + + status = dmaengine_tx_status(adc->dma_chan, + adc->dma_chan->cookie, + &state); + if (status == DMA_IN_PROGRESS) { + /* Residue is size in bytes from end of buffer */ + unsigned int i = adc->buf_sz - state.residue; + unsigned int size; + + /* Return available bytes */ + if (i >= adc->bufi) + size = i - adc->bufi; + else + size = adc->buf_sz + i - adc->bufi; + + return size; + } + + return 0; +} + +static void stm32_dfsdm_audio_dma_buffer_done(void *data) +{ + struct iio_dev *indio_dev = data; + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + int available = stm32_dfsdm_adc_dma_residue(adc); + size_t old_pos; + + /* + * FIXME: In Kernel interface does not support cyclic DMA buffer,and + * offers only an interface to push data samples per samples. + * For this reason IIO buffer interface is not used and interface is + * bypassed using a private callback registered by ASoC. + * This should be a temporary solution waiting a cyclic DMA engine + * support in IIO. + */ + + dev_dbg(&indio_dev->dev, "%s: pos = %d, available = %d\n", __func__, + adc->bufi, available); + old_pos = adc->bufi; + + while (available >= indio_dev->scan_bytes) { + u32 *buffer = (u32 *)&adc->rx_buf[adc->bufi]; + + /* Mask 8 LSB that contains the channel ID */ + *buffer = (*buffer & 0xFFFFFF00) << 8; + available -= indio_dev->scan_bytes; + adc->bufi += indio_dev->scan_bytes; + if (adc->bufi >= adc->buf_sz) { + if (adc->cb) + adc->cb(&adc->rx_buf[old_pos], + adc->buf_sz - old_pos, adc->cb_priv); + adc->bufi = 0; + old_pos = 0; + } + } + if (adc->cb) + adc->cb(&adc->rx_buf[old_pos], adc->bufi - old_pos, + adc->cb_priv); +} + +static int stm32_dfsdm_adc_dma_start(struct iio_dev *indio_dev) +{ + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + struct dma_async_tx_descriptor *desc; + dma_cookie_t cookie; + int ret; + + if (!adc->dma_chan) + return -EINVAL; + + dev_dbg(&indio_dev->dev, "%s size=%d watermark=%d\n", __func__, + adc->buf_sz, adc->buf_sz / 2); + + /* Prepare a DMA cyclic transaction */ + desc = dmaengine_prep_dma_cyclic(adc->dma_chan, + adc->dma_buf, + adc->buf_sz, adc->buf_sz / 2, + DMA_DEV_TO_MEM, + DMA_PREP_INTERRUPT); + if (!desc) + return -EBUSY; + + desc->callback = stm32_dfsdm_audio_dma_buffer_done; + desc->callback_param = indio_dev; + + cookie = dmaengine_submit(desc); + ret = dma_submit_error(cookie); + if (ret) { + dmaengine_terminate_all(adc->dma_chan); + return ret; + } + + /* Issue pending DMA requests */ + dma_async_issue_pending(adc->dma_chan); + + return 0; +} + +static int stm32_dfsdm_postenable(struct iio_dev *indio_dev) +{ + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + int ret; + + /* Reset adc buffer index */ + adc->bufi = 0; + + ret = stm32_dfsdm_start_dfsdm(adc->dfsdm); + if (ret < 0) + return ret; + + ret = stm32_dfsdm_start_conv(adc, true); + if (ret) { + dev_err(&indio_dev->dev, "Can't start conversion\n"); + goto stop_dfsdm; + } + + if (adc->dma_chan) { + ret = stm32_dfsdm_adc_dma_start(indio_dev); + if (ret) { + dev_err(&indio_dev->dev, "Can't start DMA\n"); + goto err_stop_conv; + } + } + + return 0; + +err_stop_conv: + stm32_dfsdm_stop_conv(adc); +stop_dfsdm: + stm32_dfsdm_stop_dfsdm(adc->dfsdm); + + return ret; +} + +static int stm32_dfsdm_predisable(struct iio_dev *indio_dev) +{ + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + + if (adc->dma_chan) + dmaengine_terminate_all(adc->dma_chan); + + stm32_dfsdm_stop_conv(adc); + + stm32_dfsdm_stop_dfsdm(adc->dfsdm); + + return 0; +} + +static const struct iio_buffer_setup_ops stm32_dfsdm_buffer_setup_ops = { + .postenable = &stm32_dfsdm_postenable, + .predisable = &stm32_dfsdm_predisable, +}; + +/** + * stm32_dfsdm_get_buff_cb() - register a callback that will be called when + * DMA transfer period is achieved. + * + * @iio_dev: Handle to IIO device. + * @cb: Pointer to callback function: + * - data: pointer to data buffer + * - size: size in byte of the data buffer + * - private: pointer to consumer private structure. + * @private: Pointer to consumer private structure. + */ +int stm32_dfsdm_get_buff_cb(struct iio_dev *iio_dev, + int (*cb)(const void *data, size_t size, + void *private), + void *private) +{ + struct stm32_dfsdm_adc *adc; + + if (!iio_dev) + return -EINVAL; + adc = iio_priv(iio_dev); + + adc->cb = cb; + adc->cb_priv = private; + + return 0; +} +EXPORT_SYMBOL_GPL(stm32_dfsdm_get_buff_cb); + +/** + * stm32_dfsdm_release_buff_cb - unregister buffer callback + * + * @iio_dev: Handle to IIO device. + */ +int stm32_dfsdm_release_buff_cb(struct iio_dev *iio_dev) +{ + struct stm32_dfsdm_adc *adc; + + if (!iio_dev) + return -EINVAL; + adc = iio_priv(iio_dev); + + adc->cb = NULL; + adc->cb_priv = NULL; + + return 0; +} +EXPORT_SYMBOL_GPL(stm32_dfsdm_release_buff_cb); + static int stm32_dfsdm_single_conv(struct iio_dev *indio_dev, const struct iio_chan_spec *chan, int *res) { @@ -453,15 +765,41 @@ static int stm32_dfsdm_write_raw(struct iio_dev *indio_dev, { struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); struct stm32_dfsdm_filter *fl = &adc->dfsdm->fl_list[adc->fl_id]; + struct stm32_dfsdm_channel *ch = &adc->dfsdm->ch_list[adc->ch_id]; + unsigned int spi_freq = adc->spi_freq; int ret = -EINVAL; - if (mask == IIO_CHAN_INFO_OVERSAMPLING_RATIO) { + switch (mask) { + case IIO_CHAN_INFO_OVERSAMPLING_RATIO: ret = stm32_dfsdm_set_osrs(fl, 0, val); if (!ret) adc->oversamp = val; + + return ret; + + case IIO_CHAN_INFO_SAMP_FREQ: + if (!val) + return -EINVAL; + if (ch->src != DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL) + spi_freq = adc->dfsdm->spi_master_freq; + + if (spi_freq % val) + dev_warn(&indio_dev->dev, + "Sampling rate not accurate (%d)\n", + spi_freq / (spi_freq / val)); + + ret = stm32_dfsdm_set_osrs(fl, 0, (spi_freq / val)); + if (ret < 0) { + dev_err(&indio_dev->dev, + "Not able to find parameter that match!\n"); + return ret; + } + adc->sample_freq = val; + + return 0; } - return ret; + return -EINVAL; } static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev, @@ -493,12 +831,23 @@ static int stm32_dfsdm_read_raw(struct iio_dev *indio_dev, case IIO_CHAN_INFO_OVERSAMPLING_RATIO: *val = adc->oversamp; + return IIO_VAL_INT; + + case IIO_CHAN_INFO_SAMP_FREQ: + *val = adc->sample_freq; + return IIO_VAL_INT; } return -EINVAL; } +static const struct iio_info stm32_dfsdm_info_audio = { + .hwfifo_set_watermark = stm32_dfsdm_set_watermark, + .read_raw = stm32_dfsdm_read_raw, + .write_raw = stm32_dfsdm_write_raw, +}; + static const struct iio_info stm32_dfsdm_info_adc = { .read_raw = stm32_dfsdm_read_raw, .write_raw = stm32_dfsdm_write_raw, @@ -531,6 +880,70 @@ static irqreturn_t stm32_dfsdm_irq(int irq, void *arg) return IRQ_HANDLED; } +/* + * Define external info for SPI Frequency and audio sampling rate that can be + * configured by ASoC driver through consumer.h API + */ +static const struct iio_chan_spec_ext_info dfsdm_adc_audio_ext_info[] = { + /* spi_clk_freq : clock freq on SPI/manchester bus used by channel */ + { + .name = "spi_clk_freq", + .shared = IIO_SHARED_BY_TYPE, + .read = dfsdm_adc_audio_get_spiclk, + .write = dfsdm_adc_audio_set_spiclk, + }, + {}, +}; + +static void stm32_dfsdm_dma_release(struct iio_dev *indio_dev) +{ + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + + if (adc->dma_chan) { + dma_free_coherent(adc->dma_chan->device->dev, + DFSDM_DMA_BUFFER_SIZE, + adc->rx_buf, adc->dma_buf); + dma_release_channel(adc->dma_chan); + } +} + +static int stm32_dfsdm_dma_request(struct iio_dev *indio_dev) +{ + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + struct dma_slave_config config = { + .src_addr = (dma_addr_t)adc->dfsdm->phys_base + + DFSDM_RDATAR(adc->fl_id), + .src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, + }; + int ret; + + adc->dma_chan = dma_request_slave_channel(&indio_dev->dev, "rx"); + if (!adc->dma_chan) + return -EINVAL; + + adc->rx_buf = dma_alloc_coherent(adc->dma_chan->device->dev, + DFSDM_DMA_BUFFER_SIZE, + &adc->dma_buf, GFP_KERNEL); + if (!adc->rx_buf) { + ret = -ENOMEM; + goto err_release; + } + + ret = dmaengine_slave_config(adc->dma_chan, &config); + if (ret) + goto err_free; + + return 0; + +err_free: + dma_free_coherent(adc->dma_chan->device->dev, DFSDM_DMA_BUFFER_SIZE, + adc->rx_buf, adc->dma_buf); +err_release: + dma_release_channel(adc->dma_chan); + + return ret; +} + static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev, struct iio_chan_spec *ch) { @@ -551,7 +964,12 @@ static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev, ch->info_mask_separate = BIT(IIO_CHAN_INFO_RAW); ch->info_mask_shared_by_all = BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO); - ch->scan_type.sign = 'u'; + if (adc->dev_data->type == DFSDM_AUDIO) { + ch->scan_type.sign = 's'; + ch->ext_info = dfsdm_adc_audio_ext_info; + } else { + ch->scan_type.sign = 'u'; + } ch->scan_type.realbits = 24; ch->scan_type.storagebits = 32; adc->ch_id = ch->channel; @@ -560,6 +978,39 @@ static int stm32_dfsdm_adc_chan_init_one(struct iio_dev *indio_dev, &adc->dfsdm->ch_list[ch->channel]); } +static int stm32_dfsdm_audio_init(struct iio_dev *indio_dev) +{ + struct iio_chan_spec *ch; + struct stm32_dfsdm_adc *adc = iio_priv(indio_dev); + struct stm32_dfsdm_channel *d_ch; + int ret; + + indio_dev->modes |= INDIO_BUFFER_SOFTWARE; + indio_dev->setup_ops = &stm32_dfsdm_buffer_setup_ops; + + ch = devm_kzalloc(&indio_dev->dev, sizeof(*ch), GFP_KERNEL); + if (!ch) + return -ENOMEM; + + ch->scan_index = 0; + + ret = stm32_dfsdm_adc_chan_init_one(indio_dev, ch); + if (ret < 0) { + dev_err(&indio_dev->dev, "Channels init failed\n"); + return ret; + } + ch->info_mask_separate = BIT(IIO_CHAN_INFO_SAMP_FREQ); + + d_ch = &adc->dfsdm->ch_list[adc->ch_id]; + if (d_ch->src != DFSDM_CHANNEL_SPI_CLOCK_EXTERNAL) + adc->spi_freq = adc->dfsdm->spi_master_freq; + + indio_dev->num_channels = 1; + indio_dev->channels = ch; + + return stm32_dfsdm_dma_request(indio_dev); +} + static int stm32_dfsdm_adc_init(struct iio_dev *indio_dev) { struct iio_chan_spec *ch; @@ -612,11 +1063,20 @@ static const struct stm32_dfsdm_dev_data stm32h7_dfsdm_adc_data = { .init = stm32_dfsdm_adc_init, }; +static const struct stm32_dfsdm_dev_data stm32h7_dfsdm_audio_data = { + .type = DFSDM_AUDIO, + .init = stm32_dfsdm_audio_init, +}; + static const struct of_device_id stm32_dfsdm_adc_match[] = { { .compatible = "st,stm32-dfsdm-adc", .data = &stm32h7_dfsdm_adc_data, }, + { + .compatible = "st,stm32-dfsdm-dmic", + .data = &stm32h7_dfsdm_audio_data, + }, {} }; @@ -667,8 +1127,13 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev) name = devm_kzalloc(dev, sizeof("dfsdm-adc0"), GFP_KERNEL); if (!name) return -ENOMEM; - iio->info = &stm32_dfsdm_info_adc; - snprintf(name, sizeof("dfsdm-adc0"), "dfsdm-adc%d", adc->fl_id); + if (dev_data->type == DFSDM_AUDIO) { + iio->info = &stm32_dfsdm_info_audio; + snprintf(name, sizeof("dfsdm-pdm0"), "dfsdm-pdm%d", adc->fl_id); + } else { + iio->info = &stm32_dfsdm_info_adc; + snprintf(name, sizeof("dfsdm-adc0"), "dfsdm-adc%d", adc->fl_id); + } iio->name = name; /* @@ -700,7 +1165,27 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev) if (ret < 0) return ret; - return iio_device_register(iio); + ret = iio_device_register(iio); + if (ret < 0) + goto err_cleanup; + + dev_err(dev, "of_platform_populate\n"); + if (dev_data->type == DFSDM_AUDIO) { + ret = of_platform_populate(np, NULL, NULL, dev); + if (ret < 0) { + dev_err(dev, "Failed to find an audio DAI\n"); + goto err_unregister; + } + } + + return 0; + +err_unregister: + iio_device_unregister(iio); +err_cleanup: + stm32_dfsdm_dma_release(iio); + + return ret; } static int stm32_dfsdm_adc_remove(struct platform_device *pdev) @@ -708,7 +1193,10 @@ static int stm32_dfsdm_adc_remove(struct platform_device *pdev) struct stm32_dfsdm_adc *adc = platform_get_drvdata(pdev); struct iio_dev *indio_dev = iio_priv_to_dev(adc); + if (adc->dev_data->type == DFSDM_AUDIO) + of_platform_depopulate(&pdev->dev); iio_device_unregister(indio_dev); + stm32_dfsdm_dma_release(indio_dev); return 0; } diff --git a/include/linux/iio/adc/stm32-dfsdm-adc.h b/include/linux/iio/adc/stm32-dfsdm-adc.h new file mode 100644 index 000000000000..e7dc7a542a4e --- /dev/null +++ b/include/linux/iio/adc/stm32-dfsdm-adc.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * This file discribe the STM32 DFSDM IIO driver API for audio part + * + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Arnaud Pouliquen <arnaud.pouliquen(a)st.com>. + */ + +#ifndef STM32_DFSDM_ADC_H +#define STM32_DFSDM_ADC_H + +int stm32_dfsdm_get_buff_cb(struct iio_dev *iio_dev, + int (*cb)(const void *data, size_t size, + void *private), + void *private); +int stm32_dfsdm_release_buff_cb(struct iio_dev *iio_dev); + +#endif -- 2.15.1

1 0

[alsa-devel] Applied "IIO: consumer: allow to set buffer sizes" to the asoc tree
by Mark Brown 10 Jan '18

10 Jan '18

The patch IIO: consumer: allow to set buffer sizes 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 16cbca06fa8288a4f58426fc898b141e12ee8008 Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Date: Wed, 10 Jan 2018 11:13:13 +0100 Subject: [PATCH] IIO: consumer: allow to set buffer sizes Add iio consumer API to set buffer size and watermark according to sysfs API. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/iio/buffer/industrialio-buffer-cb.c | 11 +++++++++++ include/linux/iio/consumer.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/iio/buffer/industrialio-buffer-cb.c b/drivers/iio/buffer/industrialio-buffer-cb.c index 4847534700e7..ea63c838eeae 100644 --- a/drivers/iio/buffer/industrialio-buffer-cb.c +++ b/drivers/iio/buffer/industrialio-buffer-cb.c @@ -104,6 +104,17 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, } EXPORT_SYMBOL_GPL(iio_channel_get_all_cb); +int iio_channel_cb_set_buffer_watermark(struct iio_cb_buffer *cb_buff, + size_t watermark) +{ + if (!watermark) + return -EINVAL; + cb_buff->buffer.watermark = watermark; + + return 0; +} +EXPORT_SYMBOL_GPL(iio_channel_cb_set_buffer_watermark); + int iio_channel_start_all_cb(struct iio_cb_buffer *cb_buff) { return iio_update_buffers(cb_buff->indio_dev, &cb_buff->buffer, diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h index 2017f35db17c..9887f4f8e2a8 100644 --- a/include/linux/iio/consumer.h +++ b/include/linux/iio/consumer.h @@ -133,6 +133,17 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, int (*cb)(const void *data, void *private), void *private); +/** + * iio_channel_cb_set_buffer_watermark() - set the buffer watermark. + * @cb_buffer: The callback buffer from whom we want the channel + * information. + * @watermark: buffer watermark in bytes. + * + * This function allows to configure the buffer watermark. + */ +int iio_channel_cb_set_buffer_watermark(struct iio_cb_buffer *cb_buffer, + size_t watermark); + /** * iio_channel_release_all_cb() - release and unregister the callback. * @cb_buffer: The callback buffer that was allocated. -- 2.15.1

1 0

[alsa-devel] [PATCH v8 00/13] Add STM32 DFSDM support
by Arnaud Pouliquen 10 Jan '18

10 Jan '18

Hello New version based on minor comments from Jonathan. Main deltas V8 vs V7: - Few typos fixes. - Function return optimizations in sound/soc/stm/stm32_adfsdm.c. Main deltas V7 vs V6: - Replaces the custom license information text with the appropriate SPDX identifier. - Few fixes in sound/soc/stm/stm32_adfsdm.c and stm32-dfsdm-core.c. - Add missing #interrupt-cells in binding examples. - Integrate last Jonathan's comments. Main deltas V6 vs V5: - Fix warning reported by kbuild test in : include/linux/iio/consumer.h sound/soc/stm/stm32_adfsdm.c Main deltas V5 vs V4: - Integrate ASOC DAI as a subnode of the DFSDM. - Add in kernel consumer interface to allow to manipulate attribute. Thanks, Arnaud Arnaud Pouliquen (12): docs: driver-api: add iio hw consumer section IIO: hw_consumer: add devm_iio_hw_consumer_alloc IIO: inkern: API for manipulating channel attributes IIO: Add DT bindings for sigma delta adc modulator IIO: ADC: add sigma delta modulator support IIO: add DT bindings for stm32 DFSDM filter IIO: ADC: add stm32 DFSDM core support IIO: ADC: add STM32 DFSDM sigma delta ADC support IIO: ADC: add stm32 DFSDM support for PDM microphone IIO: consumer: allow to set buffer sizes ASoC: add bindings for stm32 DFSDM filter ASoC: stm32: add DFSDM DAI support Lars-Peter Clausen (1): iio: Add hardware consumer buffer support .../ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 | 16 + .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 128 ++ .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 63 + Documentation/driver-api/iio/hw-consumer.rst | 51 + Documentation/driver-api/iio/index.rst | 1 + drivers/iio/adc/Kconfig | 37 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/sd_adc_modulator.c | 68 ++ drivers/iio/adc/stm32-dfsdm-adc.c | 1220 ++++++++++++++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 309 +++++ drivers/iio/adc/stm32-dfsdm.h | 310 +++++ drivers/iio/buffer/Kconfig | 10 + drivers/iio/buffer/Makefile | 1 + drivers/iio/buffer/industrialio-buffer-cb.c | 11 + drivers/iio/buffer/industrialio-hw-consumer.c | 247 ++++ drivers/iio/inkern.c | 17 +- include/linux/iio/adc/stm32-dfsdm-adc.h | 18 + include/linux/iio/consumer.h | 37 + include/linux/iio/hw-consumer.h | 21 + include/linux/iio/iio.h | 28 - include/linux/iio/types.h | 28 + sound/soc/stm/Kconfig | 11 + sound/soc/stm/Makefile | 3 + sound/soc/stm/stm32_adfsdm.c | 347 ++++++ 25 files changed, 2965 insertions(+), 33 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32 create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 Documentation/driver-api/iio/hw-consumer.rst create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/buffer/industrialio-hw-consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-adc.h create mode 100644 include/linux/iio/hw-consumer.h create mode 100644 sound/soc/stm/stm32_adfsdm.c -- 2.7.4

3 16

[alsa-devel] [PATCH] ASoC: mt8173: remove unnecessary micbias widget in route
by Bard Liao 10 Jan '18

10 Jan '18

The micbias1/2 are connected to route as SUPPLY usage. It was not take effect since they were MICBIAS type. To keep the same register settings, we have to remove it once the micbias1/2 widget is converted to SUPPLY type. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 -- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 -- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index 99c1521..5a9a548 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c @@ -37,8 +37,6 @@ static const struct snd_soc_dapm_route mt8173_rt5650_rt5514_routes[] = { {"Sub DMIC1R", NULL, "Int Mic"}, {"Headphone", NULL, "HPOL"}, {"Headphone", NULL, "HPOR"}, - {"Headset Mic", NULL, "micbias1"}, - {"Headset Mic", NULL, "micbias2"}, {"IN1P", NULL, "Headset Mic"}, {"IN1N", NULL, "Headset Mic"}, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index 42de84c..b724808 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c @@ -40,8 +40,6 @@ static const struct snd_soc_dapm_route mt8173_rt5650_rt5676_routes[] = { {"Headphone", NULL, "HPOL"}, {"Headphone", NULL, "HPOR"}, {"Headphone", NULL, "Sub AIF2TX"}, /* IF2 ADC to 5650 */ - {"Headset Mic", NULL, "micbias1"}, - {"Headset Mic", NULL, "micbias2"}, {"IN1P", NULL, "Headset Mic"}, {"IN1N", NULL, "Headset Mic"}, {"Sub AIF2RX", NULL, "Headset Mic"}, /* IF2 DAC from 5650 */ diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index e69c141..40ebefd 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -51,8 +51,6 @@ static const struct snd_soc_dapm_route mt8173_rt5650_routes[] = { {"DMIC R1", NULL, "Int Mic"}, {"Headphone", NULL, "HPOL"}, {"Headphone", NULL, "HPOR"}, - {"Headset Mic", NULL, "micbias1"}, - {"Headset Mic", NULL, "micbias2"}, {"IN1P", NULL, "Headset Mic"}, {"IN1N", NULL, "Headset Mic"}, }; -- 2.7.4

2 1

[alsa-devel] ASoC: sgtl5000: recording issue at 8 kHz with fsl-imx28
by Fischer, Christian 10 Jan '18

10 Jan '18

Hello guys, trying to record from a SGTL5000 with 8 kHz sampling rate gives a very bad audio quality. All other sampling rates working fine. Initially posted at NXP forum: https://community.nxp.com/message/975131 Tested with imx28, sgtl5000 and Kernel 4.14.12. I've attached a recording with 8 kHz, capture-vol was 67, mic-gain 33, AVC-off and Capture-ZC off. Recorded with "arecord -D "hw:0,1" -t wav -f S16_LE -c 2 -r 8000 test.wav". Sounds like there are missing samples.. The microphone is powered from mic-bias and decoupled with a 100nF capacitor. Can anybody help me? Thank you guys! Kind regards, Christian Fischer

1 0

[alsa-devel] [ANNOUNCE] SOF 1.0 Release
by Liam Girdwood 10 Jan '18

10 Jan '18

I'd like to announce the 1.0 release of Sound Open Firmware (SOF) is available for download on git.alsa-project.org. SOF is an open source BSD licensed audio DSP firmware that currently runs on Cadence xtensa architecture DSPs found on Intel Baytrail, Braswell and Cherrytrail based devices, however SOF is architecture and platform independent meaning it's not tightly coupled to xtensa DSPs or Intel CPUs/SoCs. The 1.0 release supports limited playback and capture topologies alongside volume, mixing and sample format conversion. Information about SOF can be found on the ALSA SOF wiki here :- https://www.alsa-project.org/main/index.php/Firmware Development for SOF 1.1 has started which will include support for Haswell, Broadwell and Apollolake platform alongside support for SRC and more complex topologies. Liam

4 4

Re: [alsa-devel] Headphone issues iMac 14.1 (A1418)
by Takashi Iwai 10 Jan '18

10 Jan '18

On Wed, 10 Jan 2018 09:46:27 +0100, Freaky wrote: > > Sorry, forgot to ask, is the patch going to be included upstream and/or > would you like us to test it? The official patch is below and I queued it now. It'll be likely included in 4.15-final after rc8. thanks, Takashi -- 8< -- From: Takashi Iwai <tiwai(a)suse.de> Subject: [PATCH] ALSA: hda - Apply the existing quirk to iMac 14,1 iMac 14,1 requires the same quirk as iMac 12,2, using GPIO 2 and 3 for headphone and speaker output amps. Add the codec SSID quirk entry (106b:0600) accordingly. BugLink: http://lkml.kernel.org/r/CAEw6Zyteav09VGHRfD5QwsfuWv5a43r0tFBNbfcHXoNrxVz7e… Reported-by: Freaky <freaky2000(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_cirrus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 80bbadc83721..d6e079f4ec09 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -408,6 +408,7 @@ static const struct snd_pci_quirk cs420x_fixup_tbl[] = { /*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/ /* codec SSID */ + SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122), SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81), SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122), SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101), -- 2.15.1

1 0

[alsa-devel] BUG: soft lockup (2)
by syzbot 10 Jan '18

10 Jan '18

syzkaller has found reproducer for the following crash on e1915c8195b38393005be9b74bfa6a3a367c83b3 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master compiler: gcc (GCC) 7.1.1 20170620 .config is attached Raw console output is attached. C reproducer is attached syzkaller reproducer is attached. See https://goo.gl/kgGztJ for information about syzkaller reproducers IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+f76f3c62dfadce022fd1c1deff15a61e09ac708a(a)syzkaller.appspotmail.com It will help syzbot understand when the bug is fixed. watchdog: BUG: soft lockup - CPU#0 stuck for 135s! [syzkaller670324:3527] Modules linked in: irq event stamp: 2531226 hardirqs last enabled at (2531225): [<00000000f1ec093f>] snd_pcm_stream_unlock_irq+0x78/0xe0 sound/core/pcm_native.c:166 hardirqs last disabled at (2531226): [<000000003c6ef1cd>] apic_timer_interrupt+0xa4/0xb0 arch/x86/entry/entry_64.S:920 softirqs last enabled at (41848): [<0000000081bd5f03>] __do_softirq+0x7a0/0xb85 kernel/softirq.c:311 softirqs last disabled at (41829): [<00000000d02c6d52>] invoke_softirq kernel/softirq.c:365 [inline] softirqs last disabled at (41829): [<00000000d02c6d52>] irq_exit+0x1cc/0x200 kernel/softirq.c:405 CPU: 0 PID: 3527 Comm: syzkaller670324 Not tainted 4.15.0-rc6+ #158 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:memcpy+0x45/0x50 mm/kasan/kasan.c:305 RSP: 0018:ffff8801bf6676f0 EFLAGS: 00000246 ORIG_RAX: ffffffffffffff11 RAX: ffffc9000137ba06 RBX: 0000000000000002 RCX: 0000000000000000 RDX: 0000000000000002 RSI: ffff8801bf6677da RDI: ffffc9000137ba08 RBP: ffff8801bf667708 R08: fffff5200026f741 R09: fffff5200026f741 R10: 0000000000000001 R11: fffff5200026f740 R12: ffffc9000137ba06 R13: ffff8801bf6677d8 R14: dffffc0000000000 R15: ffffc9000137ba06 FS: 0000000000000000(0000) GS:ffff8801db200000(0063) knlGS:00000000f7ec6b40 CS: 0010 DS: 002b ES: 002b CR0: 0000000080050033 CR2: 0000000020735ee0 CR3: 00000001bfba8002 CR4: 00000000001606f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: memcpy include/linux/string.h:344 [inline] cvt_s16_to_native sound/core/oss/mulaw.c:164 [inline] mulaw_decode+0x52f/0x770 sound/core/oss/mulaw.c:195 mulaw_transfer+0x222/0x270 sound/core/oss/mulaw.c:273 snd_pcm_plug_write_transfer+0x22d/0x420 sound/core/oss/pcm_plugin.c:611 snd_pcm_oss_write2+0x260/0x420 sound/core/oss/pcm_oss.c:1311 snd_pcm_oss_write1 sound/core/oss/pcm_oss.c:1372 [inline] snd_pcm_oss_write+0x5fe/0x830 sound/core/oss/pcm_oss.c:2646 __vfs_write+0xef/0x970 fs/read_write.c:480 vfs_write+0x189/0x510 fs/read_write.c:544 SYSC_write fs/read_write.c:589 [inline] SyS_write+0xef/0x220 fs/read_write.c:581 do_syscall_32_irqs_on arch/x86/entry/common.c:327 [inline] do_fast_syscall_32+0x3ee/0xf9d arch/x86/entry/common.c:389 entry_SYSENTER_compat+0x54/0x63 arch/x86/entry/entry_64_compat.S:129 RIP: 0023:0xf7f0cc79 RSP: 002b:00000000f7ec61fc EFLAGS: 00000246 ORIG_RAX: 0000000000000004 RAX: ffffffffffffffda RBX: 0000000000000005 RCX: 0000000020735ee0 RDX: 00000000fffffee4 RSI: 0000000000000000 RDI: 0000000000000000 RBP: 00000000003d0f00 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 Code: 89 de 31 d2 e8 9d f9 ff ff 48 8b 4d 08 48 89 de 4c 89 e7 ba 01 00 00 00 e8 89 f9 ff ff 48 89 da 4c 89 ee 4c 89 e7 e8 7b eb c0 03 <5b> 41 5c 41 5d 5d c3 0f 1f 40 00 89 f1 b8 00 10 00 00 55 48 d3

2 1

[alsa-devel] snd_hda_intel: coil whine noises after resume
by Francisco G. 10 Jan '18

10 Jan '18

Hello. Some users included myself have noticed coil-whine-like noises coming through the headphones after the computer resumes from sleep. This noise is clearly associated to the laptop activity, e.g. when scrolling through a webpage or compiling something, the processor can be heard doing the work. Interestingly, the coil whine that can be heard from the computer with naked ears (which is a common problem with this laptop) is also increased after resume. The problem has been observed on a Dell XPS 13 9360 with an i7-8550U CPU by myself, as well as with an i5-8250U by a user in the Arch Linux forums <https://bbs.archlinux.org/viewtopic.php?pid=1759588#p1759588>. This user has also noticed that reloading the snd_hda_intel module fixes the issue. Please let me know of any inormation that would be needed to debug this problem.

2 5

[alsa-devel] [PATCH v5][RESEND] ASoC: ak4613: call dummy write for PW_MGMT1/3 when Playback
by Kuninori Morimoto 10 Jan '18

10 Jan '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Power Down Release Command (PMVR, PMDAC, RSTN, PMDA1-PMDA6) which are located on PW_MGMT1 / PW_MGMT3 register must be write again after at least 5 LRCK cycle or later on each command. Otherwise, Playback volume will be 0dB. Basically, it should be 1. PowerDownRelease by Power Management1 <= call 1.x after 5LRCK 1.x Dummy write to Power Management1 2. PowerDownRelease by Power Management3 <= call 2.x after 5LRCK 2.x Dummy write to Power Management3 To avoid too many dummy write, this patch is merging these. 1. PowerDownRelease by Power Management1 2. PowerDownRelease by Power Management3 <= call after 5LRCK 2.x Dummy write to Power Management1/3 <= merge dummy write This patch adds dummy write when Playback Start timing. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- 2week passed. resend sound/soc/codecs/ak4613.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index ee9e822..d85c61e 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -15,6 +15,7 @@ */ #include <linux/clk.h> +#include <linux/delay.h> #include <linux/i2c.h> #include <linux/slab.h> #include <linux/of_device.h> @@ -95,6 +96,9 @@ struct ak4613_priv { struct mutex lock; const struct ak4613_interface *iface; struct snd_pcm_hw_constraint_list constraint; + struct work_struct dummy_write_work; + struct snd_soc_component *component; + unsigned int rate; unsigned int sysclk; unsigned int fmt; @@ -392,6 +396,7 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } + priv->rate = rate; /* * FIXME @@ -467,11 +472,83 @@ static int ak4613_set_bias_level(struct snd_soc_component *component, return 0; } +static void ak4613_dummy_write(struct work_struct *work) +{ + struct ak4613_priv *priv = container_of(work, + struct ak4613_priv, + dummy_write_work); + struct snd_soc_component *component = priv->component; + unsigned int mgmt1; + unsigned int mgmt3; + + /* + * PW_MGMT1 / PW_MGMT3 needs dummy write at least after 5 LR clocks + * + * Note + * + * To avoid extra delay, we want to avoid preemption here, + * but we can't. Because it uses I2C access which is using IRQ + * and sleep. Thus, delay might be more than 5 LR clocks + * see also + * ak4613_dai_trigger() + */ + udelay(5000000 / priv->rate); + + snd_soc_component_read(component, PW_MGMT1, &mgmt1); + snd_soc_component_read(component, PW_MGMT3, &mgmt3); + + snd_soc_component_write(component, PW_MGMT1, mgmt1); + snd_soc_component_write(component, PW_MGMT3, mgmt3); +} + +static int ak4613_dai_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct ak4613_priv *priv = snd_soc_codec_get_drvdata(codec); + + /* + * FIXME + * + * PW_MGMT1 / PW_MGMT3 needs dummy write at least after 5 LR clocks + * from Power Down Release. Otherwise, Playback volume will be 0dB. + * To avoid complex multiple delay/dummy_write method from + * ak4613_set_bias_level() / SND_SOC_DAPM_DAC_E("DACx", ...), + * call it once here. + * + * But, unfortunately, we can't "write" here because here is atomic + * context (It uses I2C access for writing). + * Thus, use schedule_work() to switching to normal context + * immediately. + * + * Note + * + * Calling ak4613_dummy_write() function might be delayed. + * In such case, ak4613 volume might be temporarily 0dB when + * beggining of playback. + * see also + * ak4613_dummy_write() + */ + + if ((cmd != SNDRV_PCM_TRIGGER_START) && + (cmd != SNDRV_PCM_TRIGGER_RESUME)) + return 0; + + if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) + return 0; + + priv->component = &codec->component; + schedule_work(&priv->dummy_write_work); + + return 0; +} + static const struct snd_soc_dai_ops ak4613_dai_ops = { .startup = ak4613_dai_startup, .shutdown = ak4613_dai_shutdown, .set_sysclk = ak4613_dai_set_sysclk, .set_fmt = ak4613_dai_set_fmt, + .trigger = ak4613_dai_trigger, .hw_params = ak4613_dai_hw_params, }; @@ -591,6 +668,7 @@ static int ak4613_i2c_probe(struct i2c_client *i2c, priv->iface = NULL; priv->cnt = 0; priv->sysclk = 0; + INIT_WORK(&priv->dummy_write_work, ak4613_dummy_write); mutex_init(&priv->lock); -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: codecs: dmic: Make number of channels configurable
by Matthias Kaehlcke 09 Jan '18

09 Jan '18

The DMIC DAI driver specifies a number of 1 to 8 channels for each DAI. The actual number of mics can currently not be configured in the device tree or audio glue, but is derived from the min/max channels of the CPU and codec DAI. A typical CPU DAI has two or more channels, in consequence a single mic is treated as a stereo/multi channel device, even though only one channel carries audio data. This change adds the option to specify the number of used DMIC channels in the device tree. When specified this value overwrites the default channels_max value of 8 in the snd_soc_dai_driver struct of the codec. Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- Documentation/devicetree/bindings/sound/dmic.txt | 2 ++ sound/soc/codecs/dmic.c | 24 +++++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/dmic.txt b/Documentation/devicetree/bindings/sound/dmic.txt index 54c8ef6498a8..f7bf65611453 100644 --- a/Documentation/devicetree/bindings/sound/dmic.txt +++ b/Documentation/devicetree/bindings/sound/dmic.txt @@ -7,10 +7,12 @@ Required properties: Optional properties: - dmicen-gpios: GPIO specifier for dmic to control start and stop + - num-channels: Number of microphones on this DAI Example node: dmic_codec: dmic@0 { compatible = "dmic-codec"; dmicen-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>; + num-channels = <1>; }; diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index b88a1ee66f80..c88f974ebe3e 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -107,8 +107,30 @@ static const struct snd_soc_codec_driver soc_dmic = { static int dmic_dev_probe(struct platform_device *pdev) { + int err; + u32 chans; + struct snd_soc_dai_driver *dai_drv = &dmic_dai; + + if (pdev->dev.of_node) { + err = of_property_read_u32(pdev->dev.of_node, "num-channels", &chans); + if (err && (err != -ENOENT)) + return err; + + if (!err) { + if (chans < 1 || chans > 8) + return -EINVAL; + + dai_drv = devm_kzalloc(&pdev->dev, sizeof(*dai_drv), GFP_KERNEL); + if (!dai_drv) + return -ENOMEM; + + memcpy(dai_drv, &dmic_dai, sizeof(*dai_drv)); + dai_drv->capture.channels_max = chans; + } + } + return snd_soc_register_codec(&pdev->dev, - &soc_dmic, &dmic_dai, 1); + &soc_dmic, dai_drv, 1); } static int dmic_dev_remove(struct platform_device *pdev) -- 2.16.0.rc0.223.g4a4ac83678-goog

4 3

[alsa-devel] [PATCH v1] ASoC: TSCS42xx: Fix control names
by Steven Eckhoff 09 Jan '18

09 Jan '18

The tscs42xx CODEC driver can confuse userspace with non-standard control names. Remove "Switch" from enum control type names. Add "Switch" to on/off control type names. Signed-off-by: Steven Eckhoff <steven.eckhoff.opensource(a)gmail.com> --- sound/soc/codecs/tscs42xx.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index eedd600875e5..4a5b32a717f2 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -631,7 +631,7 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { 0, mic_boost_scale), /* Input Channel Map */ - SOC_ENUM("Input Channel Map Switch", ch_map_select_enum), + SOC_ENUM("Input Channel Map", ch_map_select_enum), /* Coefficient Ram */ COEFF_RAM_CTL("Cascade1L BiQuad1", BIQUAD_SIZE, 0x00), @@ -708,13 +708,13 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { /* EQ */ SOC_SINGLE("EQ1 Switch", R_CONFIG1, FB_CONFIG1_EQ1_EN, 1, 0), SOC_SINGLE("EQ2 Switch", R_CONFIG1, FB_CONFIG1_EQ2_EN, 1, 0), - SOC_ENUM("EQ1 Band Enable Switch", eq1_band_enable_enum), - SOC_ENUM("EQ2 Band Enable Switch", eq2_band_enable_enum), + SOC_ENUM("EQ1 Band Enable", eq1_band_enable_enum), + SOC_ENUM("EQ2 Band Enable", eq2_band_enable_enum), /* CLE */ - SOC_ENUM("CLE Level Detect Switch", + SOC_ENUM("CLE Level Detect", cle_level_detection_enum), - SOC_ENUM("CLE Level Detect Win Switch", + SOC_ENUM("CLE Level Detect Win", cle_level_detection_window_enum), SOC_SINGLE("Expander Switch", R_CLECTL, FB_CLECTL_EXP_EN, 1, 0), @@ -726,7 +726,7 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { R_MUGAIN, FB_MUGAIN_CLEMUG, 0x1f, 0, mugain_scale), SOC_SINGLE_TLV("Comp Thresh Playback Volume", R_COMPTH, FB_COMPTH, 0xff, 0, compth_scale), - SOC_ENUM("Comp Ratio Switch", compressor_ratio_enum), + SOC_ENUM("Comp Ratio", compressor_ratio_enum), SND_SOC_BYTES("Comp Atk Time", R_CATKTCL, 2), /* Effects */ @@ -740,50 +740,50 @@ static const struct snd_kcontrol_new tscs42xx_snd_controls[] = { SOC_SINGLE("MBC Band1 Switch", R_DACMBCEN, FB_DACMBCEN_MBCEN1, 1, 0), SOC_SINGLE("MBC Band2 Switch", R_DACMBCEN, FB_DACMBCEN_MBCEN2, 1, 0), SOC_SINGLE("MBC Band3 Switch", R_DACMBCEN, FB_DACMBCEN_MBCEN3, 1, 0), - SOC_ENUM("MBC Band1 Level Detect Switch", + SOC_ENUM("MBC Band1 Level Detect", mbc_level_detection_enums[0]), - SOC_ENUM("MBC Band2 Level Detect Switch", + SOC_ENUM("MBC Band2 Level Detect", mbc_level_detection_enums[1]), - SOC_ENUM("MBC Band3 Level Detect Switch", + SOC_ENUM("MBC Band3 Level Detect", mbc_level_detection_enums[2]), - SOC_ENUM("MBC Band1 Level Detect Win Switch", + SOC_ENUM("MBC Band1 Level Detect Win", mbc_level_detection_window_enums[0]), - SOC_ENUM("MBC Band2 Level Detect Win Switch", + SOC_ENUM("MBC Band2 Level Detect Win", mbc_level_detection_window_enums[1]), - SOC_ENUM("MBC Band3 Level Detect Win Switch", + SOC_ENUM("MBC Band3 Level Detect Win", mbc_level_detection_window_enums[2]), - SOC_SINGLE("MBC1 Phase Invert", R_DACMBCMUG1, FB_DACMBCMUG1_PHASE, - 1, 0), + SOC_SINGLE("MBC1 Phase Invert Switch", + R_DACMBCMUG1, FB_DACMBCMUG1_PHASE, 1, 0), SOC_SINGLE_TLV("DAC MBC1 Make-Up Gain Playback Volume", R_DACMBCMUG1, FB_DACMBCMUG1_MUGAIN, 0x1f, 0, mugain_scale), SOC_SINGLE_TLV("DAC MBC1 Comp Thresh Playback Volume", R_DACMBCTHR1, FB_DACMBCTHR1_THRESH, 0xff, 0, compth_scale), - SOC_ENUM("DAC MBC1 Comp Ratio Switch", + SOC_ENUM("DAC MBC1 Comp Ratio", dac_mbc1_compressor_ratio_enum), SND_SOC_BYTES("DAC MBC1 Comp Atk Time", R_DACMBCATK1L, 2), SND_SOC_BYTES("DAC MBC1 Comp Rel Time Const", R_DACMBCREL1L, 2), - SOC_SINGLE("MBC2 Phase Invert", R_DACMBCMUG2, FB_DACMBCMUG2_PHASE, - 1, 0), + SOC_SINGLE("MBC2 Phase Invert Switch", + R_DACMBCMUG2, FB_DACMBCMUG2_PHASE, 1, 0), SOC_SINGLE_TLV("DAC MBC2 Make-Up Gain Playback Volume", R_DACMBCMUG2, FB_DACMBCMUG2_MUGAIN, 0x1f, 0, mugain_scale), SOC_SINGLE_TLV("DAC MBC2 Comp Thresh Playback Volume", R_DACMBCTHR2, FB_DACMBCTHR2_THRESH, 0xff, 0, compth_scale), - SOC_ENUM("DAC MBC2 Comp Ratio Switch", + SOC_ENUM("DAC MBC2 Comp Ratio", dac_mbc2_compressor_ratio_enum), SND_SOC_BYTES("DAC MBC2 Comp Atk Time", R_DACMBCATK2L, 2), SND_SOC_BYTES("DAC MBC2 Comp Rel Time Const", R_DACMBCREL2L, 2), - SOC_SINGLE("MBC3 Phase Invert", R_DACMBCMUG3, FB_DACMBCMUG3_PHASE, - 1, 0), + SOC_SINGLE("MBC3 Phase Invert Switch", + R_DACMBCMUG3, FB_DACMBCMUG3_PHASE, 1, 0), SOC_SINGLE_TLV("DAC MBC3 Make-Up Gain Playback Volume", R_DACMBCMUG3, FB_DACMBCMUG3_MUGAIN, 0x1f, 0, mugain_scale), SOC_SINGLE_TLV("DAC MBC3 Comp Thresh Playback Volume", R_DACMBCTHR3, FB_DACMBCTHR3_THRESH, 0xff, 0, compth_scale), - SOC_ENUM("DAC MBC3 Comp Ratio Switch", + SOC_ENUM("DAC MBC3 Comp Ratio", dac_mbc3_compressor_ratio_enum), SND_SOC_BYTES("DAC MBC3 Comp Atk Time", R_DACMBCATK3L, 2), SND_SOC_BYTES("DAC MBC3 Comp Rel Time Const", -- 2.11.0

2 1

[alsa-devel] [PATCH][next] ASoC: TSCS42xx: make functions pll_event and dac_event static
by Colin King 09 Jan '18

09 Jan '18

From: Colin Ian King <colin.king(a)canonical.com> The functions pll_event and dac_event are local to the source and do not need to be in global scope, so make them static. Cleans up sparse warnings: symbol 'pll_event' was not declared. Should it be static? symbol 'dac_event' was not declared. Should it be static? Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/tscs42xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index eedd600875e5..9e8155766ea9 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -355,8 +355,8 @@ static int dapm_micb_event(struct snd_soc_dapm_widget *w, return 0; } -int pll_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) +static int pll_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); int ret; @@ -369,8 +369,8 @@ int pll_event(struct snd_soc_dapm_widget *w, return ret; } -int dac_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) +static int dac_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 tscs42xx *tscs42xx = snd_soc_codec_get_drvdata(codec); -- 2.15.1

3 2

[alsa-devel] 4.16 merge window: please send earlier
by Takashi Iwai 09 Jan '18

09 Jan '18

Hi, currently 4.16 merge window is planned to be opened in two weeks, around Jan 21. At this time, there will be a conflict with my private schedule: I'll be traveling from Jan 20 for a couple of weeks. I'll be with a laptop and the net should work, so I likely can still keep merging but it'll be quite much reduced. So, at this time, I'd like to set the merge deadline earlier. If anyone has some material to be merged for 4.16, please submit ASAP, preferably in this week, or in the beginning of the next week. Luckily Mark already sent a pull request for the major changes, so the big changes have been already there. If any, Mark, send the further fixes earlier than usual, please. thanks, Takashi

1 0

[alsa-devel] Set multiple mixer channel values at once
by Petr Kulhavy 09 Jan '18

09 Jan '18

Hi, does the ALSA library provide a method to set multiple channel values of a multi-channel mixer element at once? There are the snd_mixer_selem_set_XXXXX_all() methods, which set all channels to the same value. I would like to write a different value to each channel, is there such a method? My motivation is the following. I have a HW with DSP/equaliser function, which uses a 5-channel mixer element (volume type element) to store biquad coefficients. To avoid invalid values in the transfer function the coefficients have to be sent to the HW over I2C all together in one transfer. Though the low level driver does that, the snd_mixer_selem_set_playback_volume() API method I'm using sets only one coef at a time. This results in partial updates of the biquad coefficients and temporary errors in the transfer function. Thanks Petr

2 3

[alsa-devel] [PATCH] ASoC: rockchip: i2s: Support mono capture
by Matthias Kaehlcke 09 Jan '18

09 Jan '18

The Rockchip I2S controller only allows to configure even numbers of capture channels. It is still possible to capture monophonic audio by using dual-channel mode and ignoring the 'data' from the second channel. Signed-off-by: Matthias Kaehlcke <mka(a)chromium.org> --- sound/soc/rockchip/rockchip_i2s.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 908211e1d6fc..cc22ab3d10dd 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -328,6 +328,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, val |= I2S_CHN_4; break; case 2: + case 1: val |= I2S_CHN_2; break; default: @@ -460,7 +461,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = { }, .capture = { .stream_name = "Capture", - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_192000, .formats = (SNDRV_PCM_FMTBIT_S8 | @@ -654,7 +655,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) } if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) { - if (val >= 2 && val <= 8) + if (val >= 1 && val <= 8) soc_dai->capture.channels_max = val; } -- 2.16.0.rc0.223.g4a4ac83678-goog

2 3

Re: [alsa-devel] Headphone issues iMac 14.1 (A1418)
by Takashi Iwai 09 Jan '18

09 Jan '18

On Tue, 09 Jan 2018 16:40:09 +0100, Freaky wrote: > > Hi, > > the speaker is always working on this Mac, whilst the headphone is > unplugged that is, haven't gotten it to not function. That said, the > unplug/plug events switch data I/O flags and unplugging the headphones > correctly enables the speakers voiding anything I had done with hda-verb. > > I'm not sure what the parameters do btw :). I understand the last parameter > is some value being written and that it's probably a bunch of binary flags, > but have little clue on what they exactly do. > > >From flipping flags and looking at the alsa-info.sh it seems that each bit > corresponds to a data I/O channel. 0x1 being IO[0], 0x2 IO[1], 0x4 IO[2], > 0x8 IO[3]. > > When IO[3]'s data=1 there's audio on the speakers (0x8) > So we wrote > 0x0 and verified alsa-info, all data IO's are disabled. Audio is gone. > Wrote 0x8, enabling bit 4, which flipped IO[3]'s data back to 1 and we have > audio on speaker. I presume that makes it safe to assume IO[3] is the Amp > for speaker. > > Plugged the headphone and looked at alsa-info. > Now IO[1]'s data is enabled and that seems to be where it goes wrong. wrote > 0x0 ensuring all IO's data are disabled (checked headphones - no sound > obviously) and then 0x4 which enabled only IO[2]'s data and there's audio > again. I presume IO[2] is the Amp for the headphones thus. > > Using only 0x4 works as well thus. I have no clue if there are any Amps > behind IO[0] and IO[1] and if so where they would be heading I'm afraid. > The driver enables IO[1]'s data upon plugging the headphone, which should > be IO[2]'s data on this system and unplugging enabled IO[3]'s data. That > might also be why I never have seen it as broken as I need to unplug the > headphone first, which switches flags correctly for the speaker output. > > Plugging / unplugging doesn't seem to have any effect on the other flags > required (direction and enabled). However, they do need to be set initially > and in an earlier test, when booted with the headphone already plugged and > then enabling them before any audio was played audio still didn't work. > Needed to enable them again. Perhaps pulse did something with the flags > then though (restoring the state at first audio playback or something). I > can test this if desired. Plugging/unplugging the headphones doesn't seem > to affect any of the IO's direction nor enabled flags, they remain the same > as they were. OK, so this looks like the gpio 2/3 case, and it corresponds to imac27_122 model. Could you try to add the model option like below? Create a module config file, e.g. /etc/modprobe.d/50-hda.conf containing: options snd-hda-intel model=,imac27_122 (Note the comma before imac27_122, it's no typo, but indicates to specify the second device -- where Haswell gives the HDMI/DP controller for the first PCI device while the second one is the analog I/O). If this works, the patch like below should work without the model option above. Takashi --- diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 80bbadc83721..17660d03a314 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -408,6 +408,7 @@ static const struct snd_pci_quirk cs420x_fixup_tbl[] = { /*SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),*/ /* codec SSID */ + SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122), SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81), SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122), SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101),

1 0

Re: [alsa-devel] Headphone issues iMac 14.1 (A1418)
by Takashi Iwai 09 Jan '18

09 Jan '18

On Tue, 09 Jan 2018 15:16:38 +0100, Freaky wrote: > > Hi Takashi, > > what exactly do you need us to test? > > Running just: > hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DATA 0x06 > doesn't produce sound on the headphones. > > After running > hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_MASK 0x0e > hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DIRECTION 0x0e > > It starts producing sound. > > After replugging sound is gone. Only have to run the first one again to > have sound again, the other 2 are no longer required then. > > Tried, after executing all 3 commands, to replug and then use > hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DATA XX > > where XX > 0x00 doesn't work > 0x01 doesn't work > 0x02 doesn't work > 0x04 works > 0x06 works > 0x08 doesn't work > > What's also somewhat odd, we run X as a user (auto logon). If I switch to > console before there was any audio playing and execute: > hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DATA 0x06 > hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_MASK 0x0e > hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DIRECTION 0x0e Both headphone and speaker outputs are controlled with different amps, so test them individually. And, does GPIO mask and direction need to be 0x0e, not 0x06? So, try at first: hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_MASK 0x06 hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DIR 0x06 hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DATA 0x06 If this makes both speaker and headphone working, go to the next step. Keep the following but change the data bits either 0x02 or 0x04: hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_MASK 0x06 hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DIR 0x06 hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DATA 0x02 and test whether the headphone and/or the speaker works. Again with 0x04, hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DATA 0x04 test whether the headphone and/or the speaker works. You might need to adjust the whole GPIO setup at each time you plug/unplug the jack. Check /proc/asound/card0/codec#0 output whether the GPIO values are kept as expected before testing. If it's confirmed that both the GPIO bit 0x02 and 0x04 (or vice versa) correspond to the headphone and the speaker amps, I can cook up the patch to add quirk easily. thanks, Takashi > and switch back, start playing audio, there's no sound on the headphone. > I'll need to run them again. This might be related to pulseaudio however. > Just running the first command again doesn't suffice in that case. After > audio has been on the headphones once, in all my tests so far, only the > first command does suffice to get it working again and the 0x04 value then > also works. > > Any other values, order of commands, etc. you'd like us to test? > > Thanks for the help so far :). > > Kind regards, > > On Thu, Jan 4, 2018 at 5:35 PM, Takashi Iwai <tiwai(a)suse.de> wrote: > > > On Thu, 04 Jan 2018 17:27:55 +0100, > > Freaky wrote: > > > > > > Hi Takashi, > > > > > > we need it to get the headphone output working. Upon unplugging / > > > replugging we need to check them again (they remain checked, but the > > output > > > stops working). The speaker output (onboard speakers) works fine and the > > > script we run doesn't appear to have any effect on the speaker output at > > > all. > > > > The alsa-info.sh output showed that GPIO[1] is also set, so I wonder > > how and who sets it. In anyway, could you check whether flipping any > > such gpio bits turn on / off the headphone and the speaker outputs? > > Try to toggle it while playing back, such as, > > hda-verb /dev/snd/hwC1D0 0x01 SET_GPIO_DATA xxx > > where xxx is the value to be written (0x00, 0x02, 0x04, 0x06, etc). > > > > > Currently use a python script generated by the HDA Analyzer script that > > we > > > run every 5 seconds from boot. Pasted the script below. We run it every 5 > > > seconds to ensure audio will work after replugging the headphones > > (although > > > it might incur a small delay then of course). I don't notice any hick-ups > > > in audio playback because of the script firing every 5 seconds. > > > > > > There's no acpid running from which we could detect the plug event. > > Using a > > > system based on Fedora 24. Have watched dbus-monitor (--sytem), but see > > no > > > events there upon (un)plugging the headphones which we could use as > > trigger. > > > > The headphone jack detection on HD-audio is usually done via HD-audio > > codec unsolicited events. You can check "Headphone Jack" ALSA control > > element (e.g. watch the output of "amixer contents"). > > > > > > Takashi > > > [2 <text/html; UTF-8 (quoted-printable)>] >

1 0