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

[alsa-devel] Status of ALSA firewire stack at Linux v4.12 development period
by Takashi Sakamoto 24 Apr '17

24 Apr '17

Hi, We are now in the last week of development period for Linux v4.12. All of my patches were already merged into 'for-next' branch on maintainer's repository. This is a digest for the subject. ## New drivers Two drivers were newly added to sound subsystem: * A driver for MOTU FireWire series (snd-firewire-motu) * http://mailman.alsa-project.org/pipermail/alsa-devel/2017-March/119055.html * A driver for RME Fireface series (snd-fireface) * http://mailman.alsa-project.org/pipermail/alsa-devel/2017-March/119360.html Although both drivers support a part of units on each series, I won't work for the other units by my self anymore. I wish users are going to work for enhancement of support for more units. ## Changes for existent drivers Additionally, below drivers were widely changed: * A driver for Digidesign Digi00x series (snd-firewire-dg00x) * http://mailman.alsa-project.org/pipermail/alsa-devel/2017-April/119397.html * A driver for TASCAM FireWire series (snd-firewire-tascam) * http://mailman.alsa-project.org/pipermail/alsa-devel/2017-April/119748.html Purpose of the changes is mainly for maintenance. Especially, digi00x driver now got a proper support for its console models. Correspondingly, some feature of firewire-lib move to firewire-tascam driver. ## Additional Tracepoints Furthermore, ALSA firewire stack newly supports additional tracepoints: * snd_firewire_lib subsystem * in_packet_without_header/out_packet_without_header * snd_firewire_motu subsystem * in_data_block_sph/out_data_block_sph * in_data_block_message/out_data_block_mesasge These tracepoints are available to debug behaviours of drivers newly added in this development period. Of cource, below tracepoints are still available for existent drivers: * snd_firewire_lib subsystem * in_packet/out_packet These tracepoints are available via tracefs or perf_event_open(2). Please refer to proper documentation. ## Known issues As known issues of IEC 61883-1/6 engine on ALSA firewire stack, the engine takes target units to generate sound with periodical short noise. This can be observed except for units based on BeBoB or Fireface series, and this can not be observed every time of packet streaming. The tracepoints declare that the cause does _not_ come from packet queueing timing and throughput of the amount of data blocks. Thus, It comes from protocol implementation itself. When consider about a fact that this depends on the timing to start packet streaming, the cause is that each unit has a strong demand about sequence of the number of data blocks in a packet. It might tight on actual isochronous cycle and the other time clock somehow. Additionally, as I have reported, some of units based on Dice don't transfer/receive exactly the same number of total data block as sampling transmission frequency. In detail, seee: http://mailman.alsa-project.org/pipermail/alsa-devel/2016-May/107715.html ## Useful stuffs For Linux kernel 4.4 or later, backported code is available in my github repository: https://github.com/takaswie/snd-firewire-improve Drivers in ALSA firewire stack support ALSA HwDep interface. There's a sample implementation for user space; libhinawa: https://github.com/takaswie/libhinawa In detail, please refer to documentation of the library. Some functionalities of supported units are controllable by tools in hinawa-utils. This is a sample application of the libhinawa with GOject Introspection support: https://github.com/takaswie/hinawa-utils Currently, they're maintained to assist my work for ALSA firewire stack. Although it can not satisfy all demands from usual users, I'm welcome to receive PRs to integrate the tools. $ git diff --shortstat v4.11-rc1.. sound/firewire/ 43 files changed, 5791 insertions(+), 502 deletions(-) Regards Takashi Sakamoto

1 0

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

24 Apr '17

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". Mayuresh Kulkarni (1): ASoC: wm_adsp: add support for DSP region lock Richard Fitzgerald (15): mfd: madera: Add register definitions 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: madera-ldo1: LDO1 driver for Cirrus Logic Madera codecs regulator: madera-micsupp: Mic supply for Cirrus Logic Madera codecs irqchip: Add driver for Cirrus Logic Madera codecs pinctrl: madera: Add driver for Cirrus Logic Madera codecs gpio: madera: Support Cirrus Logic Madera class codecs ASoC: wm_adsp: Add support for ADSP2V2 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 .../devicetree/bindings/gpio/gpio-madera.txt | 24 + .../interrupt-controller/cirrus,madera.txt | 31 + Documentation/devicetree/bindings/mfd/madera.txt | 79 + .../bindings/pinctrl/cirrus,madera-pinctrl.txt | 103 + .../devicetree/bindings/regulator/madera-ldo1.txt | 29 + .../bindings/regulator/madera-micsupp.txt | 27 + Documentation/devicetree/bindings/sound/madera.txt | 63 + MAINTAINERS | 28 + drivers/gpio/Kconfig | 6 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-madera.c | 173 + drivers/irqchip/Kconfig | 5 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-madera.c | 349 + drivers/mfd/Kconfig | 41 + drivers/mfd/Makefile | 13 + drivers/mfd/cs47l35-tables.c | 1688 ++++ drivers/mfd/cs47l85-tables.c | 3169 +++++++ drivers/mfd/cs47l90-tables.c | 2830 +++++++ drivers/mfd/madera-core.c | 689 ++ drivers/mfd/madera-i2c.c | 130 + drivers/mfd/madera-spi.c | 131 + drivers/mfd/madera.h | 52 + drivers/pinctrl/Kconfig | 22 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-madera.c | 1092 +++ drivers/regulator/Kconfig | 16 + drivers/regulator/Makefile | 2 + drivers/regulator/madera-ldo1.c | 198 + drivers/regulator/madera-micsupp.c | 260 + include/dt-bindings/sound/madera.h | 18 + include/linux/irqchip/irq-madera-pdata.h | 19 + include/linux/irqchip/irq-madera.h | 96 + include/linux/mfd/madera/core.h | 175 + include/linux/mfd/madera/pdata.h | 88 + include/linux/mfd/madera/registers.h | 8832 ++++++++++++++++++++ include/linux/regulator/madera-ldo1.h | 24 + include/linux/regulator/madera-micsupp.h | 21 + include/sound/madera-pdata.h | 70 + sound/soc/codecs/Kconfig | 23 + sound/soc/codecs/Makefile | 8 + sound/soc/codecs/cs47l35.c | 1747 ++++ sound/soc/codecs/cs47l85.c | 2706 ++++++ sound/soc/codecs/cs47l90.c | 2645 ++++++ sound/soc/codecs/madera.c | 4430 ++++++++++ sound/soc/codecs/madera.h | 470 ++ sound/soc/codecs/wm_adsp.c | 324 +- sound/soc/codecs/wm_adsp.h | 24 + 48 files changed, 32930 insertions(+), 43 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-madera.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/cirrus,madera.txt 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/regulator/madera-ldo1.txt create mode 100644 Documentation/devicetree/bindings/regulator/madera-micsupp.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/pinctrl-madera.c create mode 100644 drivers/regulator/madera-ldo1.c create mode 100644 drivers/regulator/madera-micsupp.c 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/linux/regulator/madera-ldo1.h create mode 100644 include/linux/regulator/madera-micsupp.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 -- 1.9.1

7 46

[alsa-devel] [PATCH] ASoC: imx-wm8962: Remove global variables
by Fabio Estevam 24 Apr '17

24 Apr '17

From: Fabio Estevam <fabio.estevam(a)nxp.com> Currently the following variables are global: - card_priv, sample_rate and sample_format ,which is not a good idea as it prevents the usage of multiple instances. Make sample_rate and sample_format part of the imx_priv structure and allocate imx_priv via the standard devm_kzalloc() mechanism inside the probe function. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/fsl/imx-wm8962.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index 52659fa..fbeada7 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -38,8 +38,9 @@ struct imx_wm8962_data { struct imx_priv { struct platform_device *pdev; + u32 sample_rate; + u32 sample_format; }; -static struct imx_priv card_priv; static const struct snd_soc_dapm_widget imx_wm8962_dapm_widgets[] = { SND_SOC_DAPM_HP("Headphone Jack", NULL), @@ -48,14 +49,14 @@ static const struct snd_soc_dapm_widget imx_wm8962_dapm_widgets[] = { SND_SOC_DAPM_MIC("DMIC", NULL), }; -static int sample_rate = 44100; -static snd_pcm_format_t sample_format = SNDRV_PCM_FORMAT_S16_LE; - static int imx_hifi_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - sample_rate = params_rate(params); - sample_format = params_format(params); + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct imx_priv *priv = snd_soc_card_get_drvdata(rtd->card); + + priv->sample_rate = params_rate(params); + priv->sample_format = params_format(params); return 0; } @@ -70,7 +71,7 @@ static int imx_wm8962_set_bias_level(struct snd_soc_card *card, { struct snd_soc_pcm_runtime *rtd; struct snd_soc_dai *codec_dai; - struct imx_priv *priv = &card_priv; + struct imx_priv *priv = snd_soc_card_get_drvdata(card); struct imx_wm8962_data *data = snd_soc_card_get_drvdata(card); struct device *dev = &priv->pdev->dev; unsigned int pll_out; @@ -84,10 +85,10 @@ static int imx_wm8962_set_bias_level(struct snd_soc_card *card, switch (level) { case SND_SOC_BIAS_PREPARE: if (dapm->bias_level == SND_SOC_BIAS_STANDBY) { - if (sample_format == SNDRV_PCM_FORMAT_S24_LE) - pll_out = sample_rate * 384; + if (priv->sample_format == SNDRV_PCM_FORMAT_S24_LE) + pll_out = priv->sample_rate * 384; else - pll_out = sample_rate * 256; + pll_out = priv->sample_rate * 256; ret = snd_soc_dai_set_pll(codec_dai, WM8962_FLL, WM8962_FLL_MCLK, data->clk_frequency, @@ -139,7 +140,7 @@ static int imx_wm8962_late_probe(struct snd_soc_card *card) { struct snd_soc_pcm_runtime *rtd; struct snd_soc_dai *codec_dai; - struct imx_priv *priv = &card_priv; + struct imx_priv *priv = snd_soc_card_get_drvdata(card); struct imx_wm8962_data *data = snd_soc_card_get_drvdata(card); struct device *dev = &priv->pdev->dev; int ret; @@ -159,14 +160,20 @@ static int imx_wm8962_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; struct device_node *ssi_np, *codec_np; struct platform_device *ssi_pdev; - struct imx_priv *priv = &card_priv; struct i2c_client *codec_dev; struct imx_wm8962_data *data; + struct imx_priv *priv; struct clk *codec_clk; int int_port, ext_port; int ret; + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + priv->pdev = pdev; + priv->sample_rate = 44100; + priv->sample_format = SNDRV_PCM_FORMAT_S16_LE; ret = of_property_read_u32(np, "mux-int-port", &int_port); if (ret) { -- 2.7.4

1 0

[alsa-devel] [PATCH 0/4] Workarounds for HD-audio dual codecs
by Takashi Iwai 23 Apr '17

23 Apr '17

Hi, recently the hardware vendors tend to put multiple codecs for the onboard audio, and it causes a problem with the current HD-audio auto-parser, as it supposes only a single codec. With the multiple codecs, some existing features are hard to implement, such as the vmaster or the stream switching because basically the multiple codecs mean to deal with multiple individual streams. In this patchset, some workarounds are implemented to make the multiple codecs more or less working. In this mode, the single master control or auto-mute/mic switching are disabled, and multiple PCM streams are created depending on the I/O. These differences have to be handled via UCM, and for providing the unique setup, the card longname is overridden in the quirk. Takashi === Takashi Iwai (4): ALSA: hda - A new flag to enforce prefix to each pin ALSA: hda - Allow to enable/disable vmaster build explicitly ALSA: hda - Support Gigabyte Gaming board with dual Realtek codecs ALSA: hda - Use a helper function for renaming kctl names Documentation/sound/hd-audio/notes.rst | 2 + sound/pci/hda/hda_auto_parser.c | 1 + sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/hda_generic.c | 9 ++++- sound/pci/hda/hda_generic.h | 1 + sound/pci/hda/patch_realtek.c | 72 ++++++++++++++++++++++++++++++---- 6 files changed, 77 insertions(+), 9 deletions(-) -- 2.11.1

1 4

[alsa-devel] [PATCH v2] ASoC: bytcr_rt5640: Allow quirk set via module option
by Takashi Iwai 21 Apr '17

21 Apr '17

The bytcr-rt5640 driver has a few quirk setups depending on the board, where the quirk value is set by DMI matching. When you have a new device to add the support, you often experience to try the different quirk by trial-and-error. Or, you may have a development model that still has no proper DMI string. In either case, you'd need to compile the driver at each time. This patch introduces a module option to override the quirk value on the fly. User can boot like snd-soc-sst-bytcr-rt5640.quirk=0x4004 to override the default value without recompilation. It's a raw value, so user needs to check the source code for the meaning of each bit. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- v1->v2: override the quirk value completely sound/soc/intel/boards/bytcr_rt5640.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 5c7219fb3aa8..23f5ffdb3731 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -19,6 +19,7 @@ #include <linux/init.h> #include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/platform_device.h> #include <linux/acpi.h> #include <linux/device.h> @@ -58,6 +59,9 @@ struct byt_rt5640_private { }; static unsigned long byt_rt5640_quirk = BYT_RT5640_MCLK_EN; +static unsigned int quirk_override; +module_param_named(quirk, quirk_override, int, 0444); +MODULE_PARM_DESC(quirk, "Board-specific quirk override"); static void log_quirks(struct device *dev) { @@ -806,6 +810,8 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) /* check quirks before creating card */ dmi_check_system(byt_rt5640_quirk_table); + if (quirk_override) + byt_rt5640_quirk = quirk_override; log_quirks(&pdev->dev); if ((byt_rt5640_quirk & BYT_RT5640_SSP2_AIF2) || -- 2.11.1

2 2

[alsa-devel] [PATCH] ALSA: hda: fix a locking bug in dead code
by Dan Carpenter 21 Apr '17

21 Apr '17

We added an impossible return to silence a static checker warning but it introduced another warning because we need to drop the lock before returning. Fixes: 960a581e22d9 ("ALSA: hda: fix some klockwork scan warnings") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 90e4ff87445e..0dc18c4a3b1b 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1808,9 +1808,12 @@ static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) /* Add sanity check to pass klockwork check. * This should never happen. */ - if (WARN_ON(spdif == NULL)) - return true; + if (WARN_ON(spdif == NULL)) { + non_pcm = true; + goto unlock; + } non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO); +unlock: mutex_unlock(&codec->spdif_mutex); return non_pcm; }

1 0

[alsa-devel] [PATCH] ASoC: bytcr_rt5640: Allow quirk set via module option
by Takashi Iwai 21 Apr '17

21 Apr '17

The bytcr-rt5640 driver has a few quirk setups depending on the board, where the quirk value is set by DMI matching. When you have a new device to add the support, you often experience to try the different quirk by trial-and-error. Or, you may have a development model that still has no proper DMI string. In either case, you'd need to compile the driver at each time. This patch introduces a module option to override the quirk value on the fly. User can boot like snd-soc-sst-bytcr-rt5640.quirk=0x4004 to override the default value without recompilation. It's a raw value, so user needs to check the source code for the meaning of each bit. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/intel/boards/bytcr_rt5640.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 5c7219fb3aa8..b848cbf575a1 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -19,6 +19,7 @@ #include <linux/init.h> #include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/platform_device.h> #include <linux/acpi.h> #include <linux/device.h> @@ -57,7 +58,9 @@ struct byt_rt5640_private { struct clk *mclk; }; -static unsigned long byt_rt5640_quirk = BYT_RT5640_MCLK_EN; +static unsigned int byt_rt5640_quirk = BYT_RT5640_MCLK_EN; +module_param_named(quirk, byt_rt5640_quirk, int, 0444); +MODULE_PARM_DESC(quirk, "Board-specific quirk override"); static void log_quirks(struct device *dev) { -- 2.11.1

2 2

[alsa-devel] [PATCH] ASoC: rsnd: fix semicolon.cocci warnings
by kbuild test robot 21 Apr '17

21 Apr '17

sound/soc/sh/rcar/adg.c:462:54-55: Unneeded semicolon Remove unneeded semicolon. Generated by: scripts/coccinelle/misc/semicolon.cocci CC: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- adg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -459,7 +459,7 @@ static void rsnd_adg_get_clkout(struct r * ADG supports BRRA/BRRB output only * this means all clkout0/1/2/3 will be same rate */ - prop = of_find_property(np, "clock-frequency", NULL);; + prop = of_find_property(np, "clock-frequency", NULL); req_size = prop->length / sizeof(u32); of_property_read_u32_array(np, "clock-frequency", req_rate, req_size);

3 2

[alsa-devel] Applied "ASoC: rsnd: Fix possible NULL pointer dereference" to the asoc tree
by Mark Brown 21 Apr '17

21 Apr '17

The patch ASoC: rsnd: Fix possible NULL pointer dereference has been applied to the asoc tree at git://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 e8dffe6c2004278c588b3bb441a3dbe998a3f2e4 Mon Sep 17 00:00:00 2001 From: Marek Vasut <marek.vasut+renesas(a)gmail.com> Date: Fri, 21 Apr 2017 00:41:20 +0000 Subject: [PATCH] ASoC: rsnd: Fix possible NULL pointer dereference 25165f79adc76b812bfb4d8f2ab120aafb28d0e6 ("ASoC: rsnd: enable clock-frequency for both 44.1kHz/48kHz") supports both 44.1kHz/48kHz clock-frequency settings for ADG which will be used for AUDIO_OLKOUTn. But some board doesn't need it, thus, it is not mandatory. But, above patch didn't care about the case of "clock-frequency" DT property was not present. This patch ignores ADG settings if AUDIO_OLKOUTn was not used. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> [Kuninori: tidyup not to break non AUDIO_OLKOUTn case] Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sh/rcar/adg.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index faa1a4f09766..66203d107a11 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -453,13 +453,18 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, [CLKI] = 0x2, }; - of_property_read_u32(np, "#clock-cells", &count); + ckr = 0; + rbga = 2; /* default 1/6 */ + rbgb = 2; /* default 1/6 */ /* * ADG supports BRRA/BRRB output only * this means all clkout0/1/2/3 will be same rate */ prop = of_find_property(np, "clock-frequency", NULL); + if (!prop) + goto rsnd_adg_get_clkout_end; + req_size = prop->length / sizeof(u32); of_property_read_u32_array(np, "clock-frequency", req_rate, req_size); @@ -472,6 +477,9 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, req_48kHz_rate = req_rate[i]; } + if (req_rate[0] % 48000 == 0) + adg->flags = AUDIO_OUT_48; + /* * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC * have 44.1kHz or 48kHz base clocks for now. @@ -481,9 +489,6 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, * rsnd_adg_ssi_clk_try_start() * rsnd_ssi_master_clk_start() */ - ckr = 0; - rbga = 2; /* default 1/6 */ - rbgb = 2; /* default 1/6 */ adg->rbga_rate_for_441khz = 0; adg->rbgb_rate_for_48khz = 0; for_each_rsnd_clk(clk, adg, i) { @@ -528,6 +533,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, * this means all clkout0/1/2/3 will be * same rate */ + of_property_read_u32(np, "#clock-cells", &count); /* * for clkout */ @@ -557,13 +563,11 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, &adg->onecell); } +rsnd_adg_get_clkout_end: adg->ckr = ckr; adg->rbga = rbga; adg->rbgb = rbgb; - if (req_rate[0] % 48000 == 0) - adg->flags = AUDIO_OUT_48; - for_each_rsnd_clkout(clk, adg, i) dev_dbg(dev, "clkout %d : %p : %ld\n", i, clk, clk_get_rate(clk)); dev_dbg(dev, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n", -- 2.11.0

1 0

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Uninitialized variable in probe_codec()
by Dan Carpenter 21 Apr '17

21 Apr '17

My static checker complains that if snd_hdac_bus_get_response() returns -EIO then "res" is uninitialized. Fix this by initializing it to -1 so that the error is handled correctly. Fixes: d8c2dab8381d ("ASoC: Intel: Add Skylake HDA audio driver") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 0c57d4eaae3a..6df3b317a476 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -512,7 +512,7 @@ static int probe_codec(struct hdac_ext_bus *ebus, int addr) struct hdac_bus *bus = ebus_to_hbus(ebus); unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) | (AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID; - unsigned int res; + unsigned int res = -1; mutex_lock(&bus->cmd_mutex); snd_hdac_bus_send_cmd(bus, cmd);

2 1