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

[alsa-devel] [PATCH] ARM: dts: am335x-wega: Add audio support
by Stefan Müller-Klieser 26 Aug '16

26 Aug '16

The wega board has a TLV320AIC3007 connected via McASP0. In the default configuration, no external crystal is mounted. We run a system clock of 25 MHz, so we use the audio codec PLL for audio clock generation. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser(a)phytec.de> --- arch/arm/boot/dts/am335x-wega.dtsi | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi index 282f6d4..7f5f8ed 100644 --- a/arch/arm/boot/dts/am335x-wega.dtsi +++ b/arch/arm/boot/dts/am335x-wega.dtsi @@ -11,6 +11,10 @@ model = "Phytec AM335x phyBOARD-WEGA"; compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx"; + sound: sound_iface { + compatible = "ti,da830-evm-audio"; + }; + regulators { compatible = "simple-bus"; @@ -24,6 +28,58 @@ }; }; +/* Audio */ +&am33xx_pinmux { + mcasp0_pins: pinmux_mcasp0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9AC, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_ahclkx.mcasp0_ahclkx */ + AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ + AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ + AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr0.mcasp0_axr0 */ + AM33XX_IOPAD(0x9A8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr1.mcasp0_axr1 */ + >; + }; +}; + +&i2c0 { + tlv320aic3007: tlv320aic3007@18 { + compatible = "ti,tlv320aic3007"; + reg = <0x18>; + AVDD-supply = <&vcc3v3>; + IOVDD-supply = <&vcc3v3>; + DRVDD-supply = <&vcc3v3>; + DVDD-supply = <&vdig1_reg>; + status = "okay"; + }; +}; + +&mcasp0 { + pinctrl-names = "default"; + pinctrl-0 = <&mcasp0_pins>; + op-mode = <0>; /* DAVINCI_MCASP_IIS_MODE */ + tdm-slots = <2>; + serial-dir = < + 2 1 0 0 /* # 0: INACTIVE, 1: TX, 2: RX */ + >; + tx-num-evt = <16>; + rt-num-evt = <16>; + status = "okay"; +}; + +&sound { + ti,model = "AM335x-Wega"; + ti,audio-codec = <&tlv320aic3007>; + ti,mcasp-controller = <&mcasp0>; + ti,audio-routing = + "Line Out", "LLOUT", + "Line Out", "RLOUT", + "LINE1L", "Line In", + "LINE1R", "Line In"; + clocks = <&mcasp0_fck>; + clock-names = "mclk"; + status = "okay"; +}; + /* CAN Busses */ &am33xx_pinmux { dcan1_pins: pinmux_dcan1 { @@ -99,6 +155,12 @@ status = "okay"; }; +/* Power */ +&vdig1_reg { + regulator-boot-on; + regulator-always-on; +}; + /* UARTs */ &am33xx_pinmux { uart0_pins: pinmux_uart0 { -- 1.9.1

3 2

[alsa-devel] Toggle GPIO if ALSA playbacks begins or ends
by Jörg Krause 26 Aug '16

26 Aug '16

Hi, I am looking for a way to toggle a GPIO if ALSA is about to play or has stopped to turn an external amplifier on/off. Can it be done using libasound or can I use a plugin or write one? Best regards Jörg Krause

1 1

[alsa-devel] [PATCH v9 0/2] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In
by Danny Milosavljevic 26 Aug '16

26 Aug '16

This patch adds support for some mixer controls: - Line-In - FM-In - Mic 2 - Capture Source - Differential Line-In v9 changes compared to v8 are: - added Line Differential Capture Switch. - split Capture Source into Left Capture Select, Right Capture Select. - added Line Capture Volume. - rename "sun4i_codec_widgets" to "sun4i_codec_controls" for consistency with the struct field it's used in. - rename "Line-In" to "Line". - rename "Power Amplifier Playback Volume" to "Headphone Playback Volume". v8 changes compared to v7 are: - fixed the routes for line and mic capturing. v7 changes compared to v6 are: - preparation for different A20, A10 controls is now in an extra patch. - all register definitions are now at the top. - sun7i-specific things (A20-specific things) are now less grouped-together. - rename "Power Amplifier Volume" to "Power Amplifier Playback Volume". v6 changes compared to v5 are: - Mic preamplifier special cases for A20 and A10 now are now not icky: There are two different _widget arrays and the probe() function now selects the right one to pass to snd_soc_register_codec() unmodified. - sun7i-specific things (A20-specific things) are now grouped together. v5 changes compared to v4 are: - Mic preamplifier controls have more common names now. - Mic preamplifier scale has a 0 dB entry as well now, as documented in the A20 user manual. - Mic preamplifier has special cases for A20 and A10 now. - Gain controls have "Gain" in the name now. v4 changes compared to v3 are: - names of the input are not uppercase anymore. - bit index constants are now named as in the A20 user manual v1.4. - added Mic1-In, Mac2-In. - added Mic1 and Mic2 Pre-Amplifiers. v3 changes compared to v2 are: - added DAPM routes. v2 changes compared to v1 are: - moved Line-In and FM-In playback switches to their respective sun4i_codec_*_mixer_controls. v1 changes: - added linein, fmin output volumes and switches. Danny Milosavljevic (2): ASoC: sun4i-codec: Distinguish sun4i from sun7i Add mixer controls: Line-In, FM-In, Mic 2, Capture Source, Differential Line-In. sound/soc/sunxi/sun4i-codec.c | 278 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 259 insertions(+), 19 deletions(-)

2 3

Re: [alsa-devel] [PATCH 8/9] ASoC: simple-card: code sync: rename num_link to num
by Kuninori Morimoto 26 Aug '16

26 Aug '16

Hi Mark This is my fault. I will post v2 patch. > [auto build test ERROR on asoc/for-next] > [also build test ERROR on next-20160824] > [cannot apply to v4.8-rc3] > [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] > [Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on] > [Check https://git-scm.com/docs/git-format-patch for more information] > > url: https://github.com/0day-ci/linux/commits/Kuninori-Morimoto/ASoC-simple-card… > base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next > config: i386-randconfig-x011-201634 (attached as .config) > compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705 > reproduce: > # save the attached .config to linux build tree > make ARCH=i386 > > Note: the linux-review/Kuninori-Morimoto/ASoC-simple-card-tidyup-and-synchronize-patches/20160825-100058 HEAD 36fb10f61ffb92eb287328e22cad00a486495747 builds fine. > It only hurts bisectibility. > > All errors (new ones prefixed by >>): > > sound/soc/generic/simple-card.c: In function 'asoc_simple_card_probe': > >> sound/soc/generic/simple-card.c:398:40: error: 'num_links' undeclared (first use in this function) > sizeof(*priv) + sizeof(*dai_link) * num_links, > ^~~~~~~~~ > sound/soc/generic/simple-card.c:398:40: note: each undeclared identifier is reported only once for each function it appears in > > vim +/num_links +398 sound/soc/generic/simple-card.c > > 6805a759b Kuninori Morimoto 2016-08-25 392 num = of_get_child_count(np); > 2080437d3 Xiubo Li 2014-09-03 393 else > 6805a759b Kuninori Morimoto 2016-08-25 394 num = 1; > f2390880e Kuninori Morimoto 2012-04-08 395 > 0dd4fc3c2 Xiubo Li 2014-09-10 396 /* Allocate the private data and the DAI link array */ > cf7dc23cb Jean-Francois Moine 2014-03-20 397 priv = devm_kzalloc(dev, > 6a91a17bd Jean-Francois Moine 2014-03-20 @398 sizeof(*priv) + sizeof(*dai_link) * num_links, > cf7dc23cb Jean-Francois Moine 2014-03-20 399 GFP_KERNEL); > ca65b492c Jean-Francois Moine 2014-01-15 400 if (!priv) > ca919fe4b Xiubo Li 2014-01-14 401 return -ENOMEM; > > :::::: The code at line 398 was first introduced by commit > :::::: 6a91a17bd7b92b2d2aa9ece85457f52a62fd7708 ASoC: simple-card: Handle many DAI links > > :::::: TO: Jean-Francois Moine <moinejf(a)free.fr> > :::::: CC: Mark Brown <broonie(a)linaro.org> > > --- > 0-DAY kernel test infrastructure Open Source Technology Center > https://lists.01.org/pipermail/kbuild-all Intel Corporation > [2 .config.gz <application/octet-stream (base64)>] > Best regards --- Kuninori Morimoto

1 0

[alsa-devel] ALSA hooks: dlopen failed: snd_dlsym_start: symbol not found
by Jörg Krause 26 Aug '16

26 Aug '16

Hi, I am trying to build a custom hook library. The minimal hook is: #include <alsa/asoundlib.h> int _snd_pcm_hook_audio_status_install(snd_pcm_t *pcm, snd_config_t *conf) { return 0; } SND_DLSYM_BUILD_VERSION(_snd_pcm_hook_audio_status_install, SND_CONFIG_DLSYM_VERSION_HOOK); I compile this as a shared library: $(CC) -fPIC -lasound -shared -Wl,-soname,lib$(NAME).so $^ -o $@ If I try to load this library using aplay I get the following error: dlopen failed: Error relocating /usr/lib/alsa-lib/libaudiostatus.so: snd_dlsym_start: symbol not found This is the output of the preprocessor: int _snd_pcm_hook_audio_status_install(snd_pcm_t *pcm, snd_config_t *conf) { return 0; } static struct snd_dlsym_link _snd_dlsym__snd_pcm_hook_audio_status_install_dlsym_config_hook_001; void _snd_dlsym_constructor__snd_pcm_hook_audio_status_install_dlsym_conf ig_hook_001 (void) __attribute__ ((constructor)); void _snd_dlsym_constructor__snd_pcm_hook_audio_status_install_dlsym_conf ig_hook_001 (void) { _snd_dlsym__snd_pcm_hook_audio_status_install_dlsym_config_hook _001.next = snd_dlsym_start; _snd_dlsym__snd_pcm_hook_audio_status_install_dlsym_config_hook _001.dlsym_name = "_snd_pcm_hook_audio_status_install"; _snd_dlsym__snd_pcm_hook_audio_status_install_dlsym_config_hook _001.dlsym_ptr = (void *)&_snd_pcm_hook_audio_status_install; snd_dlsym_start = &_snd_dlsym__snd_pcm_hook_audio_status_install_dlsym_config_hook_001 ; }; What do I miss? Best regards Jörg Krause

1 0

[alsa-devel] Alsa-lib 'cancelability'
by Alan Horstmann 25 Aug '16

25 Aug '16

Hi, I am wondering if there is a policy on the thread 'cancelability' / 'cancellability' of the functions in Alsa-lib? We are dissecting an issue on the Portaudio list which has appeared with the 'Locking API' version 1.1.2, when using the Portaudio callback API. The callback runs in it's own thread; when a user requests 'AbortStream' a thread cancel is requested. Sometimes it seems this can take effect during snd_pcm_mmap_commit(), so the function never completes and a lock is not released. Then, during the cleanup, snd_pcm_drop() attempts to aquire the lock, which is already held, and a lock-up occurs. Is it up to the application to ensure each Alsa function completes, eg by disabling cancelability on the thread for those periods, or is it reasonable to expect the functions to ensure they complete adequately? Any comment would be appreciated. Regards Alan

2 2

[alsa-devel] [GIT PULL] ASoC fixes for v4.8
by Mark Brown 25 Aug '16

25 Aug '16

The following changes since commit fa8410b355251fd30341662a40ac6b22d3e38468: Linux 4.8-rc3 (2016-08-21 16:14:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v4.8-rc4 for you to fetch changes up to cfb89f2e7505c6823020a18bbdc5410284305234: Merge remote-tracking branches 'asoc/fix/max98371', 'asoc/fix/nau8825', 'asoc/fix/omap', 'asoc/fix/samsung', 'asoc/fix/simple' and 'asoc/fix/wm2000' into asoc-linus (2016-08-24 19:05:25 +0100) ---------------------------------------------------------------- ASoC: Fixes for v4.8 A clutch of fixes for v4.8. These are mainly driver specific, the most notable ones being those for OMAP which fix a series of issues that broke boot on some platforms there when deferred probe kicked in. There's also one core fix for an issue when unbinding a card which for some reason had managed to not manifest until recently. ---------------------------------------------------------------- Adam Thomson (1): ASoC: da7213: Default to 64 BCLKs per WCLK to support all formats Charles Keepax (3): ASoC: Fix leak of rtd in soc_bind_dai_link ASoC: wm2000: Fix return of uninitialised varible ASoC: compress: Fix leak of a widget list in soc_compr_open_fe Christoph Huber (1): ASoC: atmel_ssc_dai: Don't unconditionally reset SSC on stream startup Hiroyuki Yokoyama (1): ASoC: rsnd: Fixup SRCm_IFSVR calculate method John Hsu (2): ASoC: nau8825: fix bug in playback when suspend ASoC: nau8825: fix static check error about semaphone control Kuninori Morimoto (1): ASoC: simple-card-utils: add missing MODULE_xxx() Mark Brown (7): ASoC: core: Clean up DAPM before the card debugfs Merge remote-tracking branch 'asoc/fix/core' into asoc-linus Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/da7213' and 'asoc/fix/debugfs' into asoc-linus Merge remote-tracking branches 'asoc/fix/max98371', 'asoc/fix/nau8825', 'asoc/fix/omap', 'asoc/fix/samsung', 'asoc/fix/simple' and 'asoc/fix/wm2000' into asoc-linus Nicolin Chen (1): ASoC: dapm: Add a dummy snd_pcm_runtime to avoid NULL pointer access Peter Ujfalusi (3): ASoC: omap-mcpdm: Drop pdmclk clock handling ASoC: omap-abe-twl6040: Correct dmic-codec device registration ASoC: omap-mcpdm: Fix irq resource handling Sylwester Nawrocki (1): ASoC: samsung: Fix clock handling in S3C24XX_UDA134X card Vinod Koul (1): ASoC: Intel: Skylake: Check list empty while getting module info Wei Yongjun (2): ASoC: Intel: Skylake: Fix error return code in skl_probe() ASoC: max98371: Add terminate entry for i2c_device_id tables .../devicetree/bindings/sound/omap-mcpdm.txt | 10 --- sound/soc/atmel/atmel_ssc_dai.c | 5 +- sound/soc/codecs/da7213.c | 4 +- sound/soc/codecs/max98371.c | 1 + sound/soc/codecs/nau8825.c | 78 +++++++++------------- sound/soc/codecs/wm2000.c | 2 +- sound/soc/generic/Makefile | 6 +- sound/soc/generic/simple-card-utils.c | 6 ++ sound/soc/intel/skylake/skl-sst-utils.c | 5 ++ sound/soc/intel/skylake/skl.c | 4 +- sound/soc/omap/omap-abe-twl6040.c | 61 +++++++++-------- sound/soc/omap/omap-mcpdm.c | 22 +----- sound/soc/samsung/s3c24xx_uda134x.c | 7 +- sound/soc/sh/rcar/src.c | 6 +- sound/soc/soc-compress.c | 4 +- sound/soc/soc-core.c | 5 +- sound/soc/soc-dapm.c | 10 +++ 17 files changed, 115 insertions(+), 121 deletions(-)

2 1

[alsa-devel] [PATCH] ALSA: snd-aoa: enable sound on PowerBook G4 12"
by Aaro Koskinen 25 Aug '16

25 Aug '16

Enable sound on PowerBook G4 12". Signed-off-by: Aaro Koskinen <aaro.koskinen(a)iki.fi> --- sound/aoa/fabrics/layout.c | 8 ++++++++ sound/aoa/soundbus/i2sbus/core.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index 8f71f7e..edc8681 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c @@ -112,6 +112,7 @@ MODULE_ALIAS("sound-layout-100"); MODULE_ALIAS("aoa-device-id-14"); MODULE_ALIAS("aoa-device-id-22"); +MODULE_ALIAS("aoa-device-id-31"); MODULE_ALIAS("aoa-device-id-35"); MODULE_ALIAS("aoa-device-id-44"); @@ -362,6 +363,13 @@ static struct layout layouts[] = { .connections = tas_connections_nolineout, }, }, + /* PowerBook6,1 */ + { .device_id = 31, + .codecs[0] = { + .name = "tas", + .connections = tas_connections_nolineout, + }, + }, /* PowerBook6,5 */ { .device_id = 44, .codecs[0] = { diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 1cbf210..000b585 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -197,7 +197,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, * so restrict to those we do handle for now. */ if (id && (*id == 22 || *id == 14 || *id == 35 || - *id == 44)) { + *id == 31 || *id == 44)) { snprintf(dev->sound.modalias, 32, "aoa-device-id-%d", *id); ok = 1; -- 2.9.2

3 3

[alsa-devel] [RFC PATCH] mfd: arizona: Add gating of external MCLKn clocks
by Sylwester Nawrocki 25 Aug '16

25 Aug '16

This patch adds handling of the CODEC's external MCLK{1,2} clocks needed for board configurations where these clocks are not always on oscillators. The 32k source MCLKn clock is basically kept permanently enabled while the other MCLKn clock is being gated in the MFD's runtime suspend/resume callbacks. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- I'm not sure it's a correct approach hence only an RFC patch. --- drivers/mfd/arizona-core.c | 105 ++++++++++++++++++++++++++++++++------- include/linux/mfd/arizona/core.h | 9 ++++ 2 files changed, 96 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index e4f97b3..a733b61 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -10,6 +10,7 @@ * published by the Free Software Foundation. */ +#include <linux/clk.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/gpio.h> @@ -49,7 +50,15 @@ int arizona_clk32k_enable(struct arizona *arizona) case ARIZONA_32KZ_MCLK1: ret = pm_runtime_get_sync(arizona->dev); if (ret != 0) - goto out; + goto err_ref; + ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]); + if (ret != 0) + goto err_pm; + break; + case ARIZONA_32KZ_MCLK2: + ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK2]); + if (ret != 0) + goto err_ref; break; } @@ -58,7 +67,9 @@ int arizona_clk32k_enable(struct arizona *arizona) ARIZONA_CLK_32K_ENA); } -out: +err_pm: + pm_runtime_put_sync(arizona->dev); +err_ref: if (ret != 0) arizona->clk32k_ref--; @@ -83,6 +94,10 @@ int arizona_clk32k_disable(struct arizona *arizona) switch (arizona->pdata.clk32k_src) { case ARIZONA_32KZ_MCLK1: pm_runtime_put_sync(arizona->dev); + clk_disable_unprepare(arizona->mclk[ARIZONA_MCLK1]); + break; + case ARIZONA_32KZ_MCLK2: + clk_disable_unprepare(arizona->mclk[ARIZONA_MCLK2]); break; } } @@ -93,6 +108,34 @@ int arizona_clk32k_disable(struct arizona *arizona) } EXPORT_SYMBOL_GPL(arizona_clk32k_disable); +/* Enable all external MCLKn clocks except the 32k source clock */ +int arizona_mclk_enable(struct arizona *arizona) +{ + int ret; + + if (arizona->pdata.clk32k_src != ARIZONA_32KZ_MCLK1) { + ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]); + if (ret != 0) + return ret; + } + if (arizona->pdata.clk32k_src != ARIZONA_32KZ_MCLK2) { + ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK2]); + if (ret != 0) + return ret; + } + return 0; +} + +/* Disable all external MCLKn clocks except the 32k source clock */ +void arizona_mclk_disable(struct arizona *arizona) +{ + if (arizona->pdata.clk32k_src != ARIZONA_32KZ_MCLK1) + clk_disable_unprepare(arizona->mclk[ARIZONA_MCLK1]); + + if (arizona->pdata.clk32k_src != ARIZONA_32KZ_MCLK2) + clk_disable_unprepare(arizona->mclk[ARIZONA_MCLK2]); +} + static irqreturn_t arizona_clkgen_err(int irq, void *data) { struct arizona *arizona = data; @@ -533,6 +576,12 @@ static int arizona_runtime_resume(struct device *dev) return ret; } + ret = arizona_mclk_enable(arizona); + if (ret != 0) { + dev_err(dev, "Failed to enable mclk: %d\n", ret); + goto err_reg; + } + if (arizona->has_fully_powered_off) { arizona_disable_reset(arizona); enable_irq(arizona->irq); @@ -546,14 +595,14 @@ static int arizona_runtime_resume(struct device *dev) if (arizona->external_dcvdd) { ret = arizona_connect_dcvdd(arizona); if (ret != 0) - goto err; + goto err_clk; } ret = wm5102_patch(arizona); if (ret != 0) { dev_err(arizona->dev, "Failed to apply patch: %d\n", ret); - goto err; + goto err_clk; } ret = wm5102_apply_hardware_patch(arizona); @@ -561,19 +610,19 @@ static int arizona_runtime_resume(struct device *dev) dev_err(arizona->dev, "Failed to apply hardware patch: %d\n", ret); - goto err; + goto err_clk; } break; case WM5110: case WM8280: ret = arizona_wait_for_boot(arizona); if (ret) - goto err; + goto err_clk; if (arizona->external_dcvdd) { ret = arizona_connect_dcvdd(arizona); if (ret != 0) - goto err; + goto err_clk; } else { /* * As this is only called for the internal regulator @@ -586,7 +635,7 @@ static int arizona_runtime_resume(struct device *dev) dev_err(arizona->dev, "Failed to set resume voltage: %d\n", ret); - goto err; + goto err_clk; } } @@ -595,24 +644,24 @@ static int arizona_runtime_resume(struct device *dev) dev_err(arizona->dev, "Failed to re-apply sleep patch: %d\n", ret); - goto err; + goto err_clk; } break; case WM1831: case CS47L24: ret = arizona_wait_for_boot(arizona); if (ret != 0) - goto err; + goto err_clk; break; default: ret = arizona_wait_for_boot(arizona); if (ret != 0) - goto err; + goto err_clk; if (arizona->external_dcvdd) { ret = arizona_connect_dcvdd(arizona); if (ret != 0) - goto err; + goto err_clk; } break; } @@ -620,12 +669,14 @@ static int arizona_runtime_resume(struct device *dev) ret = regcache_sync(arizona->regmap); if (ret != 0) { dev_err(arizona->dev, "Failed to restore register cache\n"); - goto err; + goto err_clk; } return 0; -err: +err_clk: + arizona_mclk_disable(arizona); +err_reg: regcache_cache_only(arizona->regmap, true); regulator_disable(arizona->dcvdd); return ret; @@ -707,6 +758,7 @@ static int arizona_runtime_suspend(struct device *dev) regcache_cache_only(arizona->regmap, true); regcache_mark_dirty(arizona->regmap); regulator_disable(arizona->dcvdd); + arizona_mclk_disable(arizona); /* Allow us to completely power down if no jack detection */ if (!jd_active) { @@ -1000,6 +1052,7 @@ static const struct mfd_cell wm8998_devs[] = { int arizona_dev_init(struct arizona *arizona) { + const char * const mclk_name[] = { "mclk1", "mclk2" }; struct device *dev = arizona->dev; const char *type_name = NULL; unsigned int reg, val, mask; @@ -1016,6 +1069,15 @@ int arizona_dev_init(struct arizona *arizona) else arizona_of_get_core_pdata(arizona); + for (i = 0; i < ARRAY_SIZE(arizona->mclk); i++) { + arizona->mclk[i] = devm_clk_get(arizona->dev, mclk_name[i]); + if (IS_ERR(arizona->mclk[i])) { + dev_info(arizona->dev, "Failed to get mclk%d: %ld\n", + i, PTR_ERR(arizona->mclk[i])); + arizona->mclk[i] = NULL; + } + } + regcache_cache_only(arizona->regmap, true); switch (arizona->type) { @@ -1101,6 +1163,16 @@ int arizona_dev_init(struct arizona *arizona) goto err_enable; } + /* Chip default */ + if (!arizona->pdata.clk32k_src) + arizona->pdata.clk32k_src = ARIZONA_32KZ_MCLK2; + + ret = arizona_mclk_enable(arizona); + if (ret != 0) { + dev_err(dev, "Failed to enable mclk: %d\n", ret); + goto err_enable; + } + arizona_disable_reset(arizona); regcache_cache_only(arizona->regmap, false); @@ -1332,10 +1404,6 @@ int arizona_dev_init(struct arizona *arizona) arizona->pdata.gpio_defaults[i]); } - /* Chip default */ - if (!arizona->pdata.clk32k_src) - arizona->pdata.clk32k_src = ARIZONA_32KZ_MCLK2; - switch (arizona->pdata.clk32k_src) { case ARIZONA_32KZ_MCLK1: case ARIZONA_32KZ_MCLK2: @@ -1490,6 +1558,7 @@ err_pm: pm_runtime_disable(arizona->dev); err_reset: arizona_enable_reset(arizona); + arizona_mclk_disable(arizona); regulator_disable(arizona->dcvdd); err_enable: regulator_bulk_disable(arizona->num_core_supplies, diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h index 58ab4c0..b9909bb 100644 --- a/include/linux/mfd/arizona/core.h +++ b/include/linux/mfd/arizona/core.h @@ -13,6 +13,7 @@ #ifndef _WM_ARIZONA_CORE_H #define _WM_ARIZONA_CORE_H +#include <linux/clk.h> #include <linux/interrupt.h> #include <linux/notifier.h> #include <linux/regmap.h> @@ -21,6 +22,12 @@ #define ARIZONA_MAX_CORE_SUPPLIES 2 +enum { + ARIZONA_MCLK1, + ARIZONA_MCLK2, + ARIZONA_NUM_MCLK +}; + enum arizona_type { WM5102 = 1, WM5110 = 2, @@ -139,6 +146,8 @@ struct arizona { struct mutex clk_lock; int clk32k_ref; + struct clk *mclk[ARIZONA_NUM_MCLK]; + bool ctrlif_error; struct snd_soc_dapm_context *dapm; -- 1.9.1

3 8

[alsa-devel] [PATCH 0/8] ASoC: simple-scu-card: tidyup and synchronize patches
by Kuninori Morimoto 25 Aug '16

25 Aug '16

Hi Mark These are cleanup/tidyup and synchronize patches for simple-scu-card. We have now simple-card and simple-scu-card. These are almost same, difference is very small. But, because of historical reason, these have "code" difference. This patch cleanup and synchronize these. These are based on mark/topic/rcar Kuninori Morimoto (8): ASoC: simple-scu-card: remove unused definitions ASoC: simple-scu-card: is GPL v2 ASoC: simple-scu-card: tidyup codec daifmt handling method ASoC: simple-scu-card: tidyup asoc_simple_card_parse_links() method ASoC: simple-scu-card: depends on CONFIG_OF ASoC: simple-scu-card: add 2 CPU 1 Codec example ASoC: simple-scu-card: code sync: move asoc_simple_card_of_match ASoC: simple-scu-card: code sync: tidyup TDM setting position .../devicetree/bindings/sound/simple-scu-card.txt | 32 +++++++++- sound/soc/generic/Kconfig | 1 + sound/soc/generic/simple-scu-card.c | 72 +++++++++------------- 3 files changed, 60 insertions(+), 45 deletions(-) -- 1.9.1

1 8