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

[alsa-devel] [PATCH RESEND v2] ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks
by Vasily Khoruzhick 21 Oct '18

21 Oct '18

startup() and shutdown() hooks are called for both substreams, so stopping either substream when another is running breaks the latter. E.g. playback breaks if capture is stopped when playback is running. Move code from startup() and shutdown() to resume() and suspend() hooks respectively to fix this issue Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> Acked-by: Maxime Ripard <maxime.ripard(a)bootlin.com> --- v2: - rename from "ASoC: sun4i-i2s: don't try to start up or shut down DAI if it's active" - move code from startup/shutdown hooks into pm_runtime sound/soc/sunxi/sun4i-i2s.c | 61 +++++++++++++++---------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index a4aa931ebfae..daa6c08cffbc 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -644,40 +644,6 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static int sun4i_i2s_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - /* Enable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); - - /* Enable the first output line */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, - SUN4I_I2S_CTRL_SDO_EN(0)); - - - return clk_prepare_enable(i2s->mod_clk); -} - -static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - clk_disable_unprepare(i2s->mod_clk); - - /* Disable our output lines */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, 0); - - /* Disable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, 0); -} - static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { @@ -695,8 +661,6 @@ static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = { .hw_params = sun4i_i2s_hw_params, .set_fmt = sun4i_i2s_set_fmt, .set_sysclk = sun4i_i2s_set_sysclk, - .shutdown = sun4i_i2s_shutdown, - .startup = sun4i_i2s_startup, .trigger = sun4i_i2s_trigger, }; @@ -869,6 +833,21 @@ static int sun4i_i2s_runtime_resume(struct device *dev) goto err_disable_clk; } + /* Enable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); + + /* Enable the first output line */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, + SUN4I_I2S_CTRL_SDO_EN(0)); + + ret = clk_prepare_enable(i2s->mod_clk); + if (ret) { + dev_err(dev, "Failed to enable module clock\n"); + goto err_disable_clk; + } + return 0; err_disable_clk: @@ -880,6 +859,16 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) { struct sun4i_i2s *i2s = dev_get_drvdata(dev); + clk_disable_unprepare(i2s->mod_clk); + + /* Disable our output lines */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, 0); + + /* Disable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, 0); + regcache_cache_only(i2s->regmap, true); clk_disable_unprepare(i2s->bus_clk); -- 2.19.0

1 0

[alsa-devel] [PATCH v2] ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks
by Vasily Khoruzhick 21 Oct '18

21 Oct '18

startup() and shutdown() hooks are called for both substreams, so stopping either substream when another is running breaks the latter. E.g. playback breaks if capture is stopped when playback is running. Move code from startup() and shutdown() to resume() and suspend() hooks respectively to fix this issue Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- v2: - rename from "ASoC: sun4i-i2s: don't try to start up or shut down DAI if it's active" - move code from startup/shutdown hooks into pm_runtime sound/soc/sunxi/sun4i-i2s.c | 61 +++++++++++++++---------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index a4aa931ebfae..daa6c08cffbc 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -644,40 +644,6 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static int sun4i_i2s_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - /* Enable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); - - /* Enable the first output line */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, - SUN4I_I2S_CTRL_SDO_EN(0)); - - - return clk_prepare_enable(i2s->mod_clk); -} - -static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - clk_disable_unprepare(i2s->mod_clk); - - /* Disable our output lines */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, 0); - - /* Disable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, 0); -} - static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { @@ -695,8 +661,6 @@ static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = { .hw_params = sun4i_i2s_hw_params, .set_fmt = sun4i_i2s_set_fmt, .set_sysclk = sun4i_i2s_set_sysclk, - .shutdown = sun4i_i2s_shutdown, - .startup = sun4i_i2s_startup, .trigger = sun4i_i2s_trigger, }; @@ -869,6 +833,21 @@ static int sun4i_i2s_runtime_resume(struct device *dev) goto err_disable_clk; } + /* Enable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); + + /* Enable the first output line */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, + SUN4I_I2S_CTRL_SDO_EN(0)); + + ret = clk_prepare_enable(i2s->mod_clk); + if (ret) { + dev_err(dev, "Failed to enable module clock\n"); + goto err_disable_clk; + } + return 0; err_disable_clk: @@ -880,6 +859,16 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) { struct sun4i_i2s *i2s = dev_get_drvdata(dev); + clk_disable_unprepare(i2s->mod_clk); + + /* Disable our output lines */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, 0); + + /* Disable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, 0); + regcache_cache_only(i2s->regmap, true); clk_disable_unprepare(i2s->bus_clk); -- 2.19.0

3 9

[alsa-devel] Applied "ASoC: wm2000: Remove wm2000_read helper function" to the asoc tree
by Mark Brown 21 Oct '18

21 Oct '18

The patch ASoC: wm2000: Remove wm2000_read helper function 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 c5d09485def41cab9e75ba23abbf87080183183c Mon Sep 17 00:00:00 2001 From: Lucas Tanure <tanureal(a)opensource.cirrus.com> Date: Fri, 19 Oct 2018 17:44:22 +0100 Subject: [PATCH] ASoC: wm2000: Remove wm2000_read helper function The return type "unsigned int" was used by the wm2000_read() function despite of the aspect that it will eventually return a negative error code. The resulting function doesn't add much to the code, so replace wm2000_read with regmap_read. Signed-off-by: Lucas Tanure <tanureal(a)opensource.cirrus.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/wm2000.c | 54 ++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index c5ae07234a00..bba330e30162 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -88,19 +88,6 @@ static int wm2000_write(struct i2c_client *i2c, unsigned int reg, return regmap_write(wm2000->regmap, reg, value); } -static unsigned int wm2000_read(struct i2c_client *i2c, unsigned int r) -{ - struct wm2000_priv *wm2000 = i2c_get_clientdata(i2c); - unsigned int val; - int ret; - - ret = regmap_read(wm2000->regmap, r, &val); - if (ret < 0) - return -1; - - return val; -} - static void wm2000_reset(struct wm2000_priv *wm2000) { struct i2c_client *i2c = wm2000->i2c; @@ -115,14 +102,15 @@ static void wm2000_reset(struct wm2000_priv *wm2000) static int wm2000_poll_bit(struct i2c_client *i2c, unsigned int reg, u8 mask) { + struct wm2000_priv *wm2000 = i2c_get_clientdata(i2c); int timeout = 4000; - int val; + unsigned int val; - val = wm2000_read(i2c, reg); + regmap_read(wm2000->regmap, reg, &val); while (!(val & mask) && --timeout) { msleep(1); - val = wm2000_read(i2c, reg); + regmap_read(wm2000->regmap, reg, &val); } if (timeout == 0) @@ -135,6 +123,7 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) { struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev); unsigned long rate; + unsigned int val; int ret; if (WARN_ON(wm2000->anc_mode != ANC_OFF)) @@ -213,12 +202,17 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) WM2000_MODE_THERMAL_ENABLE); } - ret = wm2000_read(i2c, WM2000_REG_SPEECH_CLARITY); + ret = regmap_read(wm2000->regmap, WM2000_REG_SPEECH_CLARITY, &val); + if (ret != 0) { + dev_err(&i2c->dev, "Unable to read Speech Clarity: %d\n", ret); + regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies); + return ret; + } if (wm2000->speech_clarity) - ret |= WM2000_SPEECH_CLARITY; + val |= WM2000_SPEECH_CLARITY; else - ret &= ~WM2000_SPEECH_CLARITY; - wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, ret); + val &= ~WM2000_SPEECH_CLARITY; + wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, val); wm2000_write(i2c, WM2000_REG_SYS_START0, 0x33); wm2000_write(i2c, WM2000_REG_SYS_START1, 0x02); @@ -824,7 +818,7 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, const char *filename; const struct firmware *fw = NULL; int ret, i; - int reg; + unsigned int reg; u16 id; wm2000 = devm_kzalloc(&i2c->dev, sizeof(*wm2000), GFP_KERNEL); @@ -860,9 +854,17 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, } /* Verify that this is a WM2000 */ - reg = wm2000_read(i2c, WM2000_REG_ID1); + ret = regmap_read(wm2000->regmap, WM2000_REG_ID1, &reg); + if (ret != 0) { + dev_err(&i2c->dev, "Unable to read ID1: %d\n", ret); + return ret; + } id = reg << 8; - reg = wm2000_read(i2c, WM2000_REG_ID2); + ret = regmap_read(wm2000->regmap, WM2000_REG_ID2, &reg); + if (ret != 0) { + dev_err(&i2c->dev, "Unable to read ID2: %d\n", ret); + return ret; + } id |= reg & 0xff; if (id != 0x2000) { @@ -871,7 +873,11 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, goto err_supplies; } - reg = wm2000_read(i2c, WM2000_REG_REVISON); + ret = regmap_read(wm2000->regmap, WM2000_REG_REVISON, &reg); + if (ret != 0) { + dev_err(&i2c->dev, "Unable to read Revision: %d\n", ret); + return ret; + } dev_info(&i2c->dev, "revision %c\n", reg + 'A'); wm2000->mclk = devm_clk_get(&i2c->dev, "MCLK"); -- 2.19.0

1 0

Re: [alsa-devel] [PATCH] ASoC: wm2000: Remove wm2000_read helper function
by Charles Keepax 21 Oct '18

21 Oct '18

On Fri, Oct 19, 2018 at 05:44:22PM +0100, Lucas Tanure wrote: > The return type "unsigned int" was used by the wm2000_read() > function despite of the aspect that it will eventually return > a negative error code. > The resulting function doesn't add much to the code, so replace > wm2000_read with regmap_read. > > Signed-off-by: Lucas Tanure <tanureal(a)opensource.cirrus.com> > --- Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Thanks, Charles

1 0

Re: [alsa-devel] Tascam FW-1884 driver
by Takashi Sakamoto 20 Oct '18

20 Oct '18

Hi, (C.C.ed to alsa-devel, ffado-devel and Scott) On Sat, 20 Oct 2018, Cédric Mialaret wrote: > I stumbled up the source code of a linux driver for the Tascam FW-1884 audio interface: > > https://elixir.bootlin.com/linux/v4.19-rc8/source/sound/firewire/tascam/tas… > > a. Does it work ? It, ALSA firewire-tascam driver, works for systems in which Linux kernel is used. It's already included in Linux kernel source since kernel v4.4. > b. Does it implement all functionalities of the FW-1884 ? As of kernel v4.19, it supports below functionalities: - data transmission for PCM frames via ALSA PCM interface - data transmission for MIDI messages via ALSA rawmidi interface Recently I got Scott's help and work to support handling control messages from faders/knobs/buttons on control surface of FW-1884/FW-1082. You can see recent patches in my remote repository: - https://github.com/takaswie/snd-firewire-improve/tree/topic/tascam-userspac… - https://github.com/takaswie/libhinawa/tree/topic/tascam-userspace-take3 You can see our discussion in list: - http://mailman.alsa-project.org/pipermail/alsa-devel/2018-October/140593.ht… > c. Is this the original code from Tascam/Frontier Design? Apparently, no. It comes from my work for reverse engineering, by sniffing packet communications over IEEE 1394 bus. > d. Do you by any chance have the source code of the Windows driver ? I have no such chance, as well as the others. Regards Takashi Sakamoto

1 0

[alsa-devel] [asoc:for-4.20 333/524] sound/pci/hda/patch_ca0132.c:7650:20: error: implicit declaration of function 'pci_iomap'; did you mean 'pcim_iomap'?
by kbuild test robot 20 Oct '18

20 Oct '18

Hi Rakesh, FYI, the error/warning still remains. tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-4.20 head: 318e741ee13b5a72f3051d9bb6852b1f4d02d0bb commit: 6bae5ea9498926440ffc883f3dbceb0adc65e492 [333/524] ASoC: hdac_hda: add asoc extension for legacy HDA codec drivers config: sh-allyesconfig (attached as .config) compiler: sh4-linux-gnu-gcc (Debian 7.2.0-11) 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 6bae5ea9498926440ffc883f3dbceb0adc65e492 # save the attached .config to linux build tree GCC_VERSION=7.2.0 make.cross ARCH=sh All errors (new ones prefixed by >>): sound/pci/hda/patch_ca0132.c: In function 'patch_ca0132': >> sound/pci/hda/patch_ca0132.c:7650:20: error: implicit declaration of function 'pci_iomap'; did you mean 'pcim_iomap'? [-Werror=implicit-function-declaration] spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); ^~~~~~~~~ pcim_iomap sound/pci/hda/patch_ca0132.c:7650:18: warning: assignment makes pointer from integer without a cast [-Wint-conversion] spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); ^ cc1: some warnings being treated as errors vim +7650 sound/pci/hda/patch_ca0132.c d5c016b56 Gabriele Martino 2015-05-18 7581 95c6e9cb7 Ian Minett 2011-06-15 7582 static int patch_ca0132(struct hda_codec *codec) 95c6e9cb7 Ian Minett 2011-06-15 7583 { 95c6e9cb7 Ian Minett 2011-06-15 7584 struct ca0132_spec *spec; a73d511c4 Ian Minett 2012-12-20 7585 int err; d5c016b56 Gabriele Martino 2015-05-18 7586 const struct snd_pci_quirk *quirk; 95c6e9cb7 Ian Minett 2011-06-15 7587 4e76a8833 Takashi Iwai 2014-02-25 7588 codec_dbg(codec, "patch_ca0132\n"); 95c6e9cb7 Ian Minett 2011-06-15 7589 95c6e9cb7 Ian Minett 2011-06-15 7590 spec = kzalloc(sizeof(*spec), GFP_KERNEL); 95c6e9cb7 Ian Minett 2011-06-15 7591 if (!spec) 95c6e9cb7 Ian Minett 2011-06-15 7592 return -ENOMEM; 95c6e9cb7 Ian Minett 2011-06-15 7593 codec->spec = spec; 993884f6a Chih-Chung Chang 2013-03-25 7594 spec->codec = codec; 95c6e9cb7 Ian Minett 2011-06-15 7595 225068ab2 Takashi Iwai 2015-05-29 7596 codec->patch_ops = ca0132_patch_ops; 225068ab2 Takashi Iwai 2015-05-29 7597 codec->pcm_format_first = 1; 225068ab2 Takashi Iwai 2015-05-29 7598 codec->no_sticky_stream = 1; 225068ab2 Takashi Iwai 2015-05-29 7599 d5c016b56 Gabriele Martino 2015-05-18 7600 /* Detect codec quirk */ d5c016b56 Gabriele Martino 2015-05-18 7601 quirk = snd_pci_quirk_lookup(codec->bus->pci, ca0132_quirks); d5c016b56 Gabriele Martino 2015-05-18 7602 if (quirk) d5c016b56 Gabriele Martino 2015-05-18 7603 spec->quirk = quirk->value; d5c016b56 Gabriele Martino 2015-05-18 7604 else d5c016b56 Gabriele Martino 2015-05-18 7605 spec->quirk = QUIRK_NONE; d5c016b56 Gabriele Martino 2015-05-18 7606 e24aa0a4c Takashi Iwai 2014-08-10 7607 spec->dsp_state = DSP_DOWNLOAD_INIT; a7e76271b Ian Minett 2012-12-20 7608 spec->num_mixers = 1; 017310fbe Connor McAdams 2018-05-08 7609 017310fbe Connor McAdams 2018-05-08 7610 /* Set which mixers each quirk uses. */ 017310fbe Connor McAdams 2018-05-08 7611 switch (spec->quirk) { 017310fbe Connor McAdams 2018-05-08 7612 case QUIRK_SBZ: e25e34450 Connor McAdams 2018-08-08 7613 spec->mixers[0] = desktop_mixer; 017310fbe Connor McAdams 2018-05-08 7614 snd_hda_codec_set_name(codec, "Sound Blaster Z"); 017310fbe Connor McAdams 2018-05-08 7615 break; e25e34450 Connor McAdams 2018-08-08 7616 case QUIRK_R3D: e25e34450 Connor McAdams 2018-08-08 7617 spec->mixers[0] = desktop_mixer; e25e34450 Connor McAdams 2018-08-08 7618 snd_hda_codec_set_name(codec, "Recon3D"); e25e34450 Connor McAdams 2018-08-08 7619 break; 017310fbe Connor McAdams 2018-05-08 7620 case QUIRK_R3DI: 017310fbe Connor McAdams 2018-05-08 7621 spec->mixers[0] = r3di_mixer; 017310fbe Connor McAdams 2018-05-08 7622 snd_hda_codec_set_name(codec, "Recon3Di"); 017310fbe Connor McAdams 2018-05-08 7623 break; 017310fbe Connor McAdams 2018-05-08 7624 default: a7e76271b Ian Minett 2012-12-20 7625 spec->mixers[0] = ca0132_mixer; 017310fbe Connor McAdams 2018-05-08 7626 break; 017310fbe Connor McAdams 2018-05-08 7627 } a7e76271b Ian Minett 2012-12-20 7628 08eca6b1f Connor McAdams 2018-08-08 7629 /* Setup whether or not to use alt functions/controls/pci_mmio */ 009b8f979 Connor McAdams 2018-05-08 7630 switch (spec->quirk) { 009b8f979 Connor McAdams 2018-05-08 7631 case QUIRK_SBZ: e42c7c731 Connor McAdams 2018-08-08 7632 case QUIRK_R3D: 08eca6b1f Connor McAdams 2018-08-08 7633 spec->use_alt_controls = true; 08eca6b1f Connor McAdams 2018-08-08 7634 spec->use_alt_functions = true; 08eca6b1f Connor McAdams 2018-08-08 7635 spec->use_pci_mmio = true; 08eca6b1f Connor McAdams 2018-08-08 7636 break; 009b8f979 Connor McAdams 2018-05-08 7637 case QUIRK_R3DI: 47cdf76e4 Connor McAdams 2018-05-08 7638 spec->use_alt_controls = true; 009b8f979 Connor McAdams 2018-05-08 7639 spec->use_alt_functions = true; 08eca6b1f Connor McAdams 2018-08-08 7640 spec->use_pci_mmio = false; 009b8f979 Connor McAdams 2018-05-08 7641 break; 009b8f979 Connor McAdams 2018-05-08 7642 default: 47cdf76e4 Connor McAdams 2018-05-08 7643 spec->use_alt_controls = false; 009b8f979 Connor McAdams 2018-05-08 7644 spec->use_alt_functions = false; 08eca6b1f Connor McAdams 2018-08-08 7645 spec->use_pci_mmio = false; 009b8f979 Connor McAdams 2018-05-08 7646 break; 009b8f979 Connor McAdams 2018-05-08 7647 } 009b8f979 Connor McAdams 2018-05-08 7648 08eca6b1f Connor McAdams 2018-08-08 7649 if (spec->use_pci_mmio) { 08eca6b1f Connor McAdams 2018-08-08 @7650 spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); 08eca6b1f Connor McAdams 2018-08-08 7651 if (spec->mem_base == NULL) { 08eca6b1f Connor McAdams 2018-08-08 7652 codec_warn(codec, "pci_iomap failed! Setting quirk to QUIRK_NONE."); 08eca6b1f Connor McAdams 2018-08-08 7653 spec->quirk = QUIRK_NONE; 08eca6b1f Connor McAdams 2018-08-08 7654 } 08eca6b1f Connor McAdams 2018-08-08 7655 } 08eca6b1f Connor McAdams 2018-08-08 7656 5aaca44d8 Ian Minett 2012-12-20 7657 spec->base_init_verbs = ca0132_base_init_verbs; 5aaca44d8 Ian Minett 2012-12-20 7658 spec->base_exit_verbs = ca0132_base_exit_verbs; 5aaca44d8 Ian Minett 2012-12-20 7659 993884f6a Chih-Chung Chang 2013-03-25 7660 INIT_DELAYED_WORK(&spec->unsol_hp_work, ca0132_unsol_hp_delayed); 993884f6a Chih-Chung Chang 2013-03-25 7661 95c6e9cb7 Ian Minett 2011-06-15 7662 ca0132_init_chip(codec); 95c6e9cb7 Ian Minett 2011-06-15 7663 95c6e9cb7 Ian Minett 2011-06-15 7664 ca0132_config(codec); 95c6e9cb7 Ian Minett 2011-06-15 7665 d5c016b56 Gabriele Martino 2015-05-18 7666 err = ca0132_prepare_verbs(codec); d5c016b56 Gabriele Martino 2015-05-18 7667 if (err < 0) cc91ceaf3 Takashi Iwai 2017-09-04 7668 goto error; d5c016b56 Gabriele Martino 2015-05-18 7669 a73d511c4 Ian Minett 2012-12-20 7670 err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL); a73d511c4 Ian Minett 2012-12-20 7671 if (err < 0) cc91ceaf3 Takashi Iwai 2017-09-04 7672 goto error; a73d511c4 Ian Minett 2012-12-20 7673 95c6e9cb7 Ian Minett 2011-06-15 7674 return 0; cc91ceaf3 Takashi Iwai 2017-09-04 7675 cc91ceaf3 Takashi Iwai 2017-09-04 7676 error: cc91ceaf3 Takashi Iwai 2017-09-04 7677 ca0132_free(codec); cc91ceaf3 Takashi Iwai 2017-09-04 7678 return err; 95c6e9cb7 Ian Minett 2011-06-15 7679 } 95c6e9cb7 Ian Minett 2011-06-15 7680 :::::: The code at line 7650 was first introduced by commit :::::: 08eca6b1f1468a4021bac7b3929fd3eb491e2629 ALSA: hda/ca0132 - Add bool variable to enable/disable pci region2 mmio :::::: TO: Connor McAdams <conmanx360(a)gmail.com> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:for-4.20 519/524] sound/soc//stm/stm32_sai_sub.c:379:2: error: unknown field 'recalc_rate' specified in initializer
by kbuild test robot 19 Oct '18

19 Oct '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-4.20 head: 318e741ee13b5a72f3051d9bb6852b1f4d02d0bb commit: 8307b2afd386ccce369821daa2196068c47fe8cd [519/524] ASoC: stm32: sai: set sai as mclk clock provider config: openrisc-allyesconfig (attached as .config) compiler: or1k-linux-gcc (GCC) 6.0.0 20160327 (experimental) reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 8307b2afd386ccce369821daa2196068c47fe8cd # save the attached .config to linux build tree make.cross ARCH=openrisc All errors (new ones prefixed by >>): sound/soc//stm/stm32_sai_sub.c:260:16: error: field 'hw' has incomplete type struct clk_hw hw; ^~ In file included from include/linux/err.h:5:0, from include/linux/clk.h:15, from sound/soc//stm/stm32_sai_sub.c:19: sound/soc//stm/stm32_sai_sub.c: In function 'stm32_sai_mclk_round_rate': include/linux/kernel.h:997:32: error: dereferencing pointer to incomplete type 'struct clk_hw' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~ include/linux/compiler.h:335:18: note: in definition of macro '__compiletime_assert' int __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:358:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/kernel.h:997:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~~~~~~ include/linux/kernel.h:997:20: note: in expansion of macro '__same_type' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:265:27: note: in expansion of macro 'container_of' #define to_mclk_data(_hw) container_of(_hw, struct stm32_sai_mclk_data, hw) ^~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:313:37: note: in expansion of macro 'to_mclk_data' struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); ^~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c: At top level: sound/soc//stm/stm32_sai_sub.c:376:21: error: variable 'mclk_ops' has initializer but incomplete type static const struct clk_ops mclk_ops = { ^~~~~~~ >> sound/soc//stm/stm32_sai_sub.c:377:2: error: unknown field 'enable' specified in initializer .enable = stm32_sai_mclk_enable, ^ sound/soc//stm/stm32_sai_sub.c:377:12: warning: excess elements in struct initializer .enable = stm32_sai_mclk_enable, ^~~~~~~~~~~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:377:12: note: (near initialization for 'mclk_ops') >> sound/soc//stm/stm32_sai_sub.c:378:2: error: unknown field 'disable' specified in initializer .disable = stm32_sai_mclk_disable, ^ sound/soc//stm/stm32_sai_sub.c:378:13: warning: excess elements in struct initializer .disable = stm32_sai_mclk_disable, ^~~~~~~~~~~~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:378:13: note: (near initialization for 'mclk_ops') >> sound/soc//stm/stm32_sai_sub.c:379:2: error: unknown field 'recalc_rate' specified in initializer .recalc_rate = stm32_sai_mclk_recalc_rate, ^ sound/soc//stm/stm32_sai_sub.c:379:17: warning: excess elements in struct initializer .recalc_rate = stm32_sai_mclk_recalc_rate, ^~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:379:17: note: (near initialization for 'mclk_ops') >> sound/soc//stm/stm32_sai_sub.c:380:2: error: unknown field 'round_rate' specified in initializer .round_rate = stm32_sai_mclk_round_rate, ^ sound/soc//stm/stm32_sai_sub.c:380:16: warning: excess elements in struct initializer .round_rate = stm32_sai_mclk_round_rate, ^~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:380:16: note: (near initialization for 'mclk_ops') >> sound/soc//stm/stm32_sai_sub.c:381:2: error: unknown field 'set_rate' specified in initializer .set_rate = stm32_sai_mclk_set_rate, ^ sound/soc//stm/stm32_sai_sub.c:381:14: warning: excess elements in struct initializer .set_rate = stm32_sai_mclk_set_rate, ^~~~~~~~~~~~~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:381:14: note: (near initialization for 'mclk_ops') sound/soc//stm/stm32_sai_sub.c: In function 'stm32_sai_add_mclk_provider': >> sound/soc//stm/stm32_sai_sub.c:389:22: error: implicit declaration of function '__clk_get_name' [-Werror=implicit-function-declaration] const char *pname = __clk_get_name(sai->sai_ck); ^~~~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:389:22: warning: initialization makes pointer from integer without a cast [-Wint-conversion] >> sound/soc//stm/stm32_sai_sub.c:414:18: error: implicit declaration of function 'CLK_HW_INIT' [-Werror=implicit-function-declaration] mclk->hw.init = CLK_HW_INIT(mclk_name, pname, &mclk_ops, 0); ^~~~~~~~~~~ >> sound/soc//stm/stm32_sai_sub.c:419:8: error: implicit declaration of function 'devm_clk_hw_register' [-Werror=implicit-function-declaration] ret = devm_clk_hw_register(&sai->pdev->dev, hw); ^~~~~~~~~~~~~~~~~~~~ >> sound/soc//stm/stm32_sai_sub.c:427:9: error: implicit declaration of function 'devm_of_clk_add_hw_provider' [-Werror=implicit-function-declaration] return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ >> sound/soc//stm/stm32_sai_sub.c:427:42: error: 'of_clk_hw_simple_get' undeclared (first use in this function) return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); ^~~~~~~~~~~~~~~~~~~~ sound/soc//stm/stm32_sai_sub.c:427:42: note: each undeclared identifier is reported only once for each function it appears in sound/soc//stm/stm32_sai_sub.c: At top level: sound/soc//stm/stm32_sai_sub.c:376:29: error: storage size of 'mclk_ops' isn't known static const struct clk_ops mclk_ops = { ^~~~~~~~ sound/soc//stm/stm32_sai_sub.c: In function 'stm32_sai_add_mclk_provider': sound/soc//stm/stm32_sai_sub.c:428:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ cc1: some warnings being treated as errors vim +/recalc_rate +379 sound/soc//stm/stm32_sai_sub.c 309 310 static long stm32_sai_mclk_round_rate(struct clk_hw *hw, unsigned long rate, 311 unsigned long *prate) 312 { > 313 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 314 struct stm32_sai_sub_data *sai = mclk->sai_data; 315 int div; 316 317 div = stm32_sai_get_clk_div(sai, *prate, rate); 318 if (div < 0) 319 return div; 320 321 mclk->freq = *prate / div; 322 323 return mclk->freq; 324 } 325 326 static unsigned long stm32_sai_mclk_recalc_rate(struct clk_hw *hw, 327 unsigned long parent_rate) 328 { 329 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 330 331 return mclk->freq; 332 } 333 334 static int stm32_sai_mclk_set_rate(struct clk_hw *hw, unsigned long rate, 335 unsigned long parent_rate) 336 { 337 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 338 struct stm32_sai_sub_data *sai = mclk->sai_data; 339 unsigned int div; 340 int ret; 341 342 div = stm32_sai_get_clk_div(sai, parent_rate, rate); 343 if (div < 0) 344 return div; 345 346 ret = stm32_sai_set_clk_div(sai, div); 347 if (ret) 348 return ret; 349 350 mclk->freq = rate; 351 352 return 0; 353 } 354 355 static int stm32_sai_mclk_enable(struct clk_hw *hw) 356 { 357 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 358 struct stm32_sai_sub_data *sai = mclk->sai_data; 359 360 dev_dbg(&sai->pdev->dev, "Enable master clock\n"); 361 362 return regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, 363 SAI_XCR1_MCKEN, SAI_XCR1_MCKEN); 364 } 365 366 static void stm32_sai_mclk_disable(struct clk_hw *hw) 367 { 368 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 369 struct stm32_sai_sub_data *sai = mclk->sai_data; 370 371 dev_dbg(&sai->pdev->dev, "Disable master clock\n"); 372 373 regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, SAI_XCR1_MCKEN, 0); 374 } 375 376 static const struct clk_ops mclk_ops = { > 377 .enable = stm32_sai_mclk_enable, > 378 .disable = stm32_sai_mclk_disable, > 379 .recalc_rate = stm32_sai_mclk_recalc_rate, > 380 .round_rate = stm32_sai_mclk_round_rate, > 381 .set_rate = stm32_sai_mclk_set_rate, 382 }; 383 384 static int stm32_sai_add_mclk_provider(struct stm32_sai_sub_data *sai) 385 { 386 struct clk_hw *hw; 387 struct stm32_sai_mclk_data *mclk; 388 struct device *dev = &sai->pdev->dev; > 389 const char *pname = __clk_get_name(sai->sai_ck); 390 char *mclk_name, *p, *s = (char *)pname; 391 int ret, i = 0; 392 393 mclk = devm_kzalloc(dev, sizeof(mclk), GFP_KERNEL); 394 if (!mclk) 395 return -ENOMEM; 396 397 mclk_name = devm_kcalloc(dev, sizeof(char), 398 SAI_MCLK_NAME_LEN, GFP_KERNEL); 399 if (!mclk_name) 400 return -ENOMEM; 401 402 /* 403 * Forge mclk clock name from parent clock name and suffix. 404 * String after "_" char is stripped in parent name. 405 */ 406 p = mclk_name; 407 while (*s && *s != '_' && (i < (SAI_MCLK_NAME_LEN - 6))) { 408 *p++ = *s++; 409 i++; 410 } 411 STM_SAI_IS_SUB_A(sai) ? 412 strncat(p, "a_mclk", 6) : strncat(p, "b_mclk", 6); 413 > 414 mclk->hw.init = CLK_HW_INIT(mclk_name, pname, &mclk_ops, 0); 415 mclk->sai_data = sai; 416 hw = &mclk->hw; 417 418 dev_dbg(dev, "Register master clock %s\n", mclk_name); > 419 ret = devm_clk_hw_register(&sai->pdev->dev, hw); 420 if (ret) { 421 dev_err(dev, "mclk register returned %d\n", ret); 422 return ret; 423 } 424 sai->sai_mclk = hw->clk; 425 426 /* register mclk provider */ > 427 return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); 428 } 429 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH v2 0/9] Add support for audiocodec in Allwinner A64
by Vasily Khoruzhick 19 Oct '18

19 Oct '18

This series adds Allwinner A64 audiocodec support into sun4i-i2s, sun8i-codec drivers, introduces new sun50i-codec-analog driver and enables sound on Pine64, SoPine boards and Pinebook. I2S for audiocodec in A64 is different from other 3 I2S modules but similar to one in A10, digital part of codec is compatible with A33 and analog controls part is completely different from other SoCs - it shares only few bits in few registers, so adding support for it into existing sun8i-codec-analog would mean duplicating all the widgets, controls and some routes and making it hard to read. Therefore it makes sense to introduce new driver. v2: - Use simple-amplifier for speaker amp on Pinebook - Rename sun50i-a64-i2s to sun50i-a64-codec-i2s to preserve compatible string for other 3 I2S modules in A64 in case if there's any incompatibility with H3 Marcus Cooper (1): ASoC: sun4i-i2s: Add compatibility with A64 codec I2S Vasily Khoruzhick (8): ASoC: sun8i-codec: Don't hardcode BCLK / LRCK ratio ASoC: sun8i-codec-analog: split regmap code into separate driver ASoC: dt-binding: Add bindings for Allwinner A64 codec's analog path controls ASoC: sunxi: Add new driver for Allwinner A64 codec's analog path controls ASoC: sunxi: allow the sun8i-codec driver to be built on ARM64 arm64: dts: allwinner: a64: add nodes necessary for analog sound support arm64: dts: allwinner: a64: enable sound on Pine64 and SoPine arm64: dts: allwinner: a64: enable sound on Pinebook .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + .../bindings/sound/sun50i-codec-analog.txt | 12 + .../boot/dts/allwinner/sun50i-a64-pine64.dts | 30 ++ .../dts/allwinner/sun50i-a64-pinebook.dts | 42 ++ .../allwinner/sun50i-a64-sopine-baseboard.dts | 30 ++ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 58 +++ sound/soc/sunxi/Kconfig | 17 +- sound/soc/sunxi/Makefile | 2 + sound/soc/sunxi/sun4i-i2s.c | 21 + sound/soc/sunxi/sun50i-codec-analog.c | 444 ++++++++++++++++++ sound/soc/sunxi/sun8i-codec-analog.c | 79 +--- sound/soc/sunxi/sun8i-codec.c | 35 +- sound/soc/sunxi/sunxi-adda-pr-regmap.c | 102 ++++ sound/soc/sunxi/sunxi-adda-pr-regmap.h | 7 + 14 files changed, 798 insertions(+), 83 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt create mode 100644 sound/soc/sunxi/sun50i-codec-analog.c create mode 100644 sound/soc/sunxi/sunxi-adda-pr-regmap.c create mode 100644 sound/soc/sunxi/sunxi-adda-pr-regmap.h -- 2.19.0

2 18

[alsa-devel] [PATCH 1/1] ASoC: cs42l51: fix mclk support
by Olivier Moysan 19 Oct '18

19 Oct '18

Fixes: 5e8d63a726f8 ("ASoC: cs42l51: add mclk support") The MCLK clock is made optional for cs42l51 codec. However, ASoC DAPM clock supply widget, expects the clock to be defined unconditionally. Register MCLK DAPM conditionally in codec driver, depending on clock presence in DT. Signed-off-by: Olivier Moysan <olivier.moysan(a)st.com> --- sound/soc/codecs/cs42l51.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index eb40bff54cec..fd2bd74024c1 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -21,6 +21,7 @@ * - master mode *NOT* supported */ +#include <linux/clk.h> #include <linux/module.h> #include <linux/slab.h> #include <sound/core.h> @@ -41,6 +42,7 @@ enum master_slave_mode { struct cs42l51_private { unsigned int mclk; + struct clk *mclk_handle; unsigned int audio_mode; /* The mode (I2S or left-justified) */ enum master_slave_mode func; }; @@ -492,9 +494,13 @@ static int cs42l51_component_probe(struct snd_soc_component *component) { int ret, reg; struct snd_soc_dapm_context *dapm; + struct cs42l51_private *cs42l51; + cs42l51 = snd_soc_component_get_drvdata(component); dapm = snd_soc_component_get_dapm(component); - snd_soc_dapm_new_controls(dapm, cs42l51_dapm_mclk_widgets, 1); + + if (cs42l51->mclk_handle) + snd_soc_dapm_new_controls(dapm, cs42l51_dapm_mclk_widgets, 1); /* * DAC configuration @@ -548,6 +554,13 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) dev_set_drvdata(dev, cs42l51); + cs42l51->mclk_handle = devm_clk_get(dev, "MCLK"); + if (IS_ERR(cs42l51->mclk_handle)) { + if (PTR_ERR(cs42l51->mclk_handle) != -ENOENT) + return PTR_ERR(cs42l51->mclk_handle); + cs42l51->mclk_handle = NULL; + } + /* Verify that we have a CS42L51 */ ret = regmap_read(regmap, CS42L51_CHIP_REV_ID, &val); if (ret < 0) { -- 2.7.4

2 2

[alsa-devel] [asoc:for-4.20 519/523] sound/soc/stm/stm32_sai_sub.c:260:16: error: field 'hw' has incomplete type
by kbuild test robot 19 Oct '18

19 Oct '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-4.20 head: 7ece50c9f790270e82b77589d34e54547c895a66 commit: 8307b2afd386ccce369821daa2196068c47fe8cd [519/523] ASoC: stm32: sai: set sai as mclk clock provider config: powerpc-allyesconfig (attached as .config) compiler: powerpc64-linux-gnu-gcc (Debian 7.2.0-11) 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 8307b2afd386ccce369821daa2196068c47fe8cd # save the attached .config to linux build tree GCC_VERSION=7.2.0 make.cross ARCH=powerpc All error/warnings (new ones prefixed by >>): >> sound/soc/stm/stm32_sai_sub.c:260:16: error: field 'hw' has incomplete type struct clk_hw hw; ^~ In file included from include/linux/err.h:5:0, from include/linux/clk.h:15, from sound/soc/stm/stm32_sai_sub.c:19: sound/soc/stm/stm32_sai_sub.c: In function 'stm32_sai_mclk_round_rate': include/linux/kernel.h:997:32: error: dereferencing pointer to incomplete type 'struct clk_hw' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~ include/linux/compiler.h:335:18: note: in definition of macro '__compiletime_assert' int __cond = !(condition); \ ^~~~~~~~~ include/linux/compiler.h:358:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:45:37: note: in expansion of macro 'compiletime_assert' #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) ^~~~~~~~~~~~~~~~~~ include/linux/kernel.h:997:2: note: in expansion of macro 'BUILD_BUG_ON_MSG' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~~~~~~ include/linux/kernel.h:997:20: note: in expansion of macro '__same_type' BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \ ^~~~~~~~~~~ >> sound/soc/stm/stm32_sai_sub.c:265:27: note: in expansion of macro 'container_of' #define to_mclk_data(_hw) container_of(_hw, struct stm32_sai_mclk_data, hw) ^~~~~~~~~~~~ >> sound/soc/stm/stm32_sai_sub.c:313:37: note: in expansion of macro 'to_mclk_data' struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); ^~~~~~~~~~~~ sound/soc/stm/stm32_sai_sub.c: At top level: >> sound/soc/stm/stm32_sai_sub.c:376:21: error: variable 'mclk_ops' has initializer but incomplete type static const struct clk_ops mclk_ops = { ^~~~~~~ >> sound/soc/stm/stm32_sai_sub.c:377:3: error: 'const struct clk_ops' has no member named 'enable' .enable = stm32_sai_mclk_enable, ^~~~~~ >> sound/soc/stm/stm32_sai_sub.c:377:12: warning: excess elements in struct initializer .enable = stm32_sai_mclk_enable, ^~~~~~~~~~~~~~~~~~~~~ sound/soc/stm/stm32_sai_sub.c:377:12: note: (near initialization for 'mclk_ops') >> sound/soc/stm/stm32_sai_sub.c:378:3: error: 'const struct clk_ops' has no member named 'disable' .disable = stm32_sai_mclk_disable, ^~~~~~~ sound/soc/stm/stm32_sai_sub.c:378:13: warning: excess elements in struct initializer .disable = stm32_sai_mclk_disable, ^~~~~~~~~~~~~~~~~~~~~~ sound/soc/stm/stm32_sai_sub.c:378:13: note: (near initialization for 'mclk_ops') >> sound/soc/stm/stm32_sai_sub.c:379:3: error: 'const struct clk_ops' has no member named 'recalc_rate' .recalc_rate = stm32_sai_mclk_recalc_rate, ^~~~~~~~~~~ sound/soc/stm/stm32_sai_sub.c:379:17: warning: excess elements in struct initializer .recalc_rate = stm32_sai_mclk_recalc_rate, ^~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/stm/stm32_sai_sub.c:379:17: note: (near initialization for 'mclk_ops') >> sound/soc/stm/stm32_sai_sub.c:380:3: error: 'const struct clk_ops' has no member named 'round_rate' .round_rate = stm32_sai_mclk_round_rate, ^~~~~~~~~~ sound/soc/stm/stm32_sai_sub.c:380:16: warning: excess elements in struct initializer .round_rate = stm32_sai_mclk_round_rate, ^~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/stm/stm32_sai_sub.c:380:16: note: (near initialization for 'mclk_ops') >> sound/soc/stm/stm32_sai_sub.c:381:3: error: 'const struct clk_ops' has no member named 'set_rate' .set_rate = stm32_sai_mclk_set_rate, ^~~~~~~~ sound/soc/stm/stm32_sai_sub.c:381:14: warning: excess elements in struct initializer .set_rate = stm32_sai_mclk_set_rate, ^~~~~~~~~~~~~~~~~~~~~~~ sound/soc/stm/stm32_sai_sub.c:381:14: note: (near initialization for 'mclk_ops') sound/soc/stm/stm32_sai_sub.c: In function 'stm32_sai_add_mclk_provider': >> sound/soc/stm/stm32_sai_sub.c:389:22: error: implicit declaration of function '__clk_get_name'; did you mean 'clk_get_rate'? [-Werror=implicit-function-declaration] const char *pname = __clk_get_name(sai->sai_ck); ^~~~~~~~~~~~~~ clk_get_rate >> sound/soc/stm/stm32_sai_sub.c:389:22: warning: initialization makes pointer from integer without a cast [-Wint-conversion] >> sound/soc/stm/stm32_sai_sub.c:414:18: error: implicit declaration of function 'CLK_HW_INIT'; did you mean 'KLIST_INIT'? [-Werror=implicit-function-declaration] mclk->hw.init = CLK_HW_INIT(mclk_name, pname, &mclk_ops, 0); ^~~~~~~~~~~ KLIST_INIT >> sound/soc/stm/stm32_sai_sub.c:419:8: error: implicit declaration of function 'devm_clk_hw_register'; did you mean 'device_unregister'? [-Werror=implicit-function-declaration] ret = devm_clk_hw_register(&sai->pdev->dev, hw); ^~~~~~~~~~~~~~~~~~~~ device_unregister >> sound/soc/stm/stm32_sai_sub.c:427:9: error: implicit declaration of function 'devm_of_clk_add_hw_provider'; did you mean 'of_clk_get_from_provider'? [-Werror=implicit-function-declaration] return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ of_clk_get_from_provider >> sound/soc/stm/stm32_sai_sub.c:427:42: error: 'of_clk_hw_simple_get' undeclared (first use in this function); did you mean 'ida_simple_get'? return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); ^~~~~~~~~~~~~~~~~~~~ ida_simple_get sound/soc/stm/stm32_sai_sub.c:427:42: note: each undeclared identifier is reported only once for each function it appears in sound/soc/stm/stm32_sai_sub.c: At top level: >> sound/soc/stm/stm32_sai_sub.c:376:29: error: storage size of 'mclk_ops' isn't known static const struct clk_ops mclk_ops = { ^~~~~~~~ sound/soc/stm/stm32_sai_sub.c: In function 'stm32_sai_add_mclk_provider': >> sound/soc/stm/stm32_sai_sub.c:428:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ cc1: some warnings being treated as errors vim +/hw +260 sound/soc/stm/stm32_sai_sub.c 258 259 struct stm32_sai_mclk_data { > 260 struct clk_hw hw; 261 unsigned long freq; 262 struct stm32_sai_sub_data *sai_data; 263 }; 264 > 265 #define to_mclk_data(_hw) container_of(_hw, struct stm32_sai_mclk_data, hw) 266 #define STM32_SAI_MAX_CLKS 1 267 268 static int stm32_sai_get_clk_div(struct stm32_sai_sub_data *sai, 269 unsigned long input_rate, 270 unsigned long output_rate) 271 { 272 int version = sai->pdata->conf->version; 273 int div; 274 275 div = DIV_ROUND_CLOSEST(input_rate, output_rate); 276 if (div > SAI_XCR1_MCKDIV_MAX(version)) { 277 dev_err(&sai->pdev->dev, "Divider %d out of range\n", div); 278 return -EINVAL; 279 } 280 dev_dbg(&sai->pdev->dev, "SAI divider %d\n", div); 281 282 if (input_rate % div) 283 dev_dbg(&sai->pdev->dev, 284 "Rate not accurate. requested (%ld), actual (%ld)\n", 285 output_rate, input_rate / div); 286 287 return div; 288 } 289 290 static int stm32_sai_set_clk_div(struct stm32_sai_sub_data *sai, 291 unsigned int div) 292 { 293 int version = sai->pdata->conf->version; 294 int ret, cr1, mask; 295 296 if (div > SAI_XCR1_MCKDIV_MAX(version)) { 297 dev_err(&sai->pdev->dev, "Divider %d out of range\n", div); 298 return -EINVAL; 299 } 300 301 mask = SAI_XCR1_MCKDIV_MASK(SAI_XCR1_MCKDIV_WIDTH(version)); 302 cr1 = SAI_XCR1_MCKDIV_SET(div); 303 ret = regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, mask, cr1); 304 if (ret < 0) 305 dev_err(&sai->pdev->dev, "Failed to update CR1 register\n"); 306 307 return ret; 308 } 309 310 static long stm32_sai_mclk_round_rate(struct clk_hw *hw, unsigned long rate, 311 unsigned long *prate) 312 { > 313 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 314 struct stm32_sai_sub_data *sai = mclk->sai_data; 315 int div; 316 317 div = stm32_sai_get_clk_div(sai, *prate, rate); 318 if (div < 0) 319 return div; 320 321 mclk->freq = *prate / div; 322 323 return mclk->freq; 324 } 325 326 static unsigned long stm32_sai_mclk_recalc_rate(struct clk_hw *hw, 327 unsigned long parent_rate) 328 { 329 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 330 331 return mclk->freq; 332 } 333 334 static int stm32_sai_mclk_set_rate(struct clk_hw *hw, unsigned long rate, 335 unsigned long parent_rate) 336 { 337 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 338 struct stm32_sai_sub_data *sai = mclk->sai_data; 339 unsigned int div; 340 int ret; 341 342 div = stm32_sai_get_clk_div(sai, parent_rate, rate); 343 if (div < 0) 344 return div; 345 346 ret = stm32_sai_set_clk_div(sai, div); 347 if (ret) 348 return ret; 349 350 mclk->freq = rate; 351 352 return 0; 353 } 354 355 static int stm32_sai_mclk_enable(struct clk_hw *hw) 356 { 357 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 358 struct stm32_sai_sub_data *sai = mclk->sai_data; 359 360 dev_dbg(&sai->pdev->dev, "Enable master clock\n"); 361 362 return regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, 363 SAI_XCR1_MCKEN, SAI_XCR1_MCKEN); 364 } 365 366 static void stm32_sai_mclk_disable(struct clk_hw *hw) 367 { 368 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 369 struct stm32_sai_sub_data *sai = mclk->sai_data; 370 371 dev_dbg(&sai->pdev->dev, "Disable master clock\n"); 372 373 regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, SAI_XCR1_MCKEN, 0); 374 } 375 > 376 static const struct clk_ops mclk_ops = { > 377 .enable = stm32_sai_mclk_enable, > 378 .disable = stm32_sai_mclk_disable, > 379 .recalc_rate = stm32_sai_mclk_recalc_rate, > 380 .round_rate = stm32_sai_mclk_round_rate, > 381 .set_rate = stm32_sai_mclk_set_rate, 382 }; 383 384 static int stm32_sai_add_mclk_provider(struct stm32_sai_sub_data *sai) 385 { 386 struct clk_hw *hw; 387 struct stm32_sai_mclk_data *mclk; 388 struct device *dev = &sai->pdev->dev; > 389 const char *pname = __clk_get_name(sai->sai_ck); 390 char *mclk_name, *p, *s = (char *)pname; 391 int ret, i = 0; 392 393 mclk = devm_kzalloc(dev, sizeof(mclk), GFP_KERNEL); 394 if (!mclk) 395 return -ENOMEM; 396 397 mclk_name = devm_kcalloc(dev, sizeof(char), 398 SAI_MCLK_NAME_LEN, GFP_KERNEL); 399 if (!mclk_name) 400 return -ENOMEM; 401 402 /* 403 * Forge mclk clock name from parent clock name and suffix. 404 * String after "_" char is stripped in parent name. 405 */ 406 p = mclk_name; 407 while (*s && *s != '_' && (i < (SAI_MCLK_NAME_LEN - 6))) { 408 *p++ = *s++; 409 i++; 410 } 411 STM_SAI_IS_SUB_A(sai) ? 412 strncat(p, "a_mclk", 6) : strncat(p, "b_mclk", 6); 413 > 414 mclk->hw.init = CLK_HW_INIT(mclk_name, pname, &mclk_ops, 0); 415 mclk->sai_data = sai; 416 hw = &mclk->hw; 417 418 dev_dbg(dev, "Register master clock %s\n", mclk_name); > 419 ret = devm_clk_hw_register(&sai->pdev->dev, hw); 420 if (ret) { 421 dev_err(dev, "mclk register returned %d\n", ret); 422 return ret; 423 } 424 sai->sai_mclk = hw->clk; 425 426 /* register mclk provider */ > 427 return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw); > 428 } 429 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0