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

[alsa-devel] [PATCH 0/5] ASoC: cirrus: Series of fixes for ep93xx-i2s
by Alexander Sverdlin 11 May '18

11 May '18

This series is a result of long-running debugging of rarely screwed I2S stream out of EP9302 chip. Logic analyser shows that the stream is shifted by one byte (out of 32 bits per sample) which leads to noise intead of original stream. DMA is verified to work fine (no underrun). The issue is only reproducible under high load (CPU or AMBA bus -- not yet clear). This stream corruption happens at the same time I2S controller reports internal FIFO underrun (even though according to documentation, it should handle an underrun gracefully). First two patches are fixing unrelated issues in I2S driver found during debugging of the stream shift. Third one is simplification of the driver to prepare for workaround. Both controller configuration options for TX FIFO underrun handling were tested, both do not work reliable. Hence, this ugly watchdog in the last patch. The whole series is tested on a board similar to EDB9302 (identical in sound part). Alexander Sverdlin (5): ASoC: cirrus: i2s: Fix LRCLK configuration ASoC: cirrus: i2s: Fix {TX|RX}LinCtrlData setup ASoC: cirrus: i2s: Stop enabling I2S2 and I2S3 FIFOs ARM: ep93xx: i2s: Add IRQ to platform device resources ASoC: cirrus: i2s: IRQ-based stream watchdog arch/arm/mach-ep93xx/core.c | 1 + sound/soc/cirrus/Kconfig | 17 +++++++ sound/soc/cirrus/edb93xx.c | 2 +- sound/soc/cirrus/ep93xx-i2s.c | 106 +++++++++++++++++++++++++++++++++-------- sound/soc/cirrus/snappercl15.c | 2 +- 5 files changed, 106 insertions(+), 22 deletions(-) -- 2.16.2

2 10

[alsa-devel] [PATCH 0/7] ASoC: omap: Deprecate omap-pcm for sdma-pcm
by Peter Ujfalusi 09 May '18

09 May '18

Hi, omap-pcm served us well over the years, but there is no reason to keep it around as we can rely on generic dmaengine_pcm code without the need to maintain custom code. The series has been tested on: omap3 beagle-xm, omap4 PandaES, omap4 Blaze (SDP), am57xx beagle-x15, dra7 evm. McBSP, McASP, McPDM, DMIC and HDMI audio was tested and I have found no issue with them. I was not able to test on OMAP1 or OMAP2 for various reasons, but mainly because neither Nokia 770 or Nokia n810 audio probes with linux-next. It does not matter if I have omap-pcm or sdma-pcm... I would be grateful if someone can give tested-by or pointers on how to get 770/n810 audio working. Regards, Peter --- Peter Ujfalusi (7): ASoC: omap: Introduce the generic_dmaengine_pcm based sdma-pcm ASoC: davinci-mcasp: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-hdmi-audio: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-dmic: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-mcpdm: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap: Mark the omap-pcm as deprecated, but keep it in the tree sound/soc/davinci/Kconfig | 2 +- sound/soc/davinci/davinci-mcasp.c | 8 ++-- sound/soc/omap/Kconfig | 33 ++++++++------- sound/soc/omap/Makefile | 4 +- sound/soc/omap/omap-dmic.c | 4 +- sound/soc/omap/omap-hdmi-audio.c | 5 ++- sound/soc/omap/omap-mcbsp.c | 4 +- sound/soc/omap/omap-mcpdm.c | 4 +- sound/soc/omap/sdma-pcm.c | 68 +++++++++++++++++++++++++++++++ sound/soc/omap/sdma-pcm.h | 21 ++++++++++ 10 files changed, 124 insertions(+), 29 deletions(-) create mode 100644 sound/soc/omap/sdma-pcm.c create mode 100644 sound/soc/omap/sdma-pcm.h -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

4 17

[alsa-devel] Prepare to covert Codec/Platform into Component
by Kuninori Morimoto 09 May '18

09 May '18

Hi Mark, Lars-Peter I will post all prepare patches to convert Codec/Platform into Component. It has 3 steps. 1) add new necessary functions 2) remove/don't use codec hw_write/read 3) remove/don't use codec reg_cache If these are accepted, all prepares were completed. Next, I can post "convert Codec/Platform into Component" patch bomb. These are too many convert patches, to avoid review issue, I will post few of them as sample. 4) sample of don't use rtd->codec 5) sample of convert Platform into Component 6) sample of convert Codec into Component I will post some of "remove" patches too for each steps. I will re-post all "remove" patches if all are accepted. For your review, please consider below. If these are not good, all covert patch doesn't work. 1. use devm_snd_soc_register_component() and remove snd_soc_unregister_component() My patches is using devm_ version function, and removed unregister function. This is not a big deal 2. New flags. Because "Codec" and "CPU/Platform" are using different features, we need to use some new flags. .idle_bias_off/on .ignore_pmdown_time/pmdown_time These are because "CPU/Platform" and "Codec" are using different default value. "Codec" side convert patches are using these. .endianness .non_legacy_dai_naming These are because "Codec" only needs fixup format, and not use "legacy" DAI name. "Codec" side convert patches are using these I added its flags info on each patch. 3. rtd->platform rtd->platform will be removed. Now we can find all rtd connected component by using rtdcom_lookup. rtd->platform will be replaced to snd_soc_rtdcom_lookup(rtd, DRV_NAME); Here, DRV_NAME is platform's component driver name. 4. rtd->codec rtd->codec will be removed. In soc_bind_dai_link(), It is rtd->codec = rtd->codec_dai->codec; And now, DAI has codec and component pointer. So, rtd->codec will be replaced into rtd->codec_dai->component. Best regards --- Kuninori Morimoto

2 104

[alsa-devel] [PATCH 0/5][RFC] ASoC: remove Codec/Platform code
by Kuninori Morimoto 09 May '18

09 May '18

Hi Mark Now, all Codec/Platform are replaced to Component. Codec/Platform related code are no longer needed, these patches remove these. But I added [RFC] on these patches because, 1) people want to check/test 2) Media related added new driver is using Codec/Platform style I'm posting replace patch for 2) to Media / ASoC ML, but not yet accepted. (= I think it needs Mark's Acked-by ? I don't know) I think this Codec/Platform remove patch should based on it, otherwise, compile error happen. I'm happy to re-post this remove patch if Media side replace was accepted. Subject: [alsa-devel] [PATCH v3] media: i2c: tda1997: replace codec to component Date: Fri, 6 Apr 2018 05:44:25 +0000 Best regards --- Kuninori Morimoto

3 8

[alsa-devel] [PATCH] ASoC: soc-core: remove legacy_dai_naming from snd_soc_register_dais()
by Kuninori Morimoto 09 May '18

09 May '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> We can get legacy dai name flag from component driver. Thus, there is no need to have its parameter on snd_soc_register_dais(). Let's remove unneeded parameter Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1faebc04..9c65477 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3146,8 +3146,7 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component, * parent's name. */ static int snd_soc_register_dais(struct snd_soc_component *component, - struct snd_soc_dai_driver *dai_drv, size_t count, - bool legacy_dai_naming) + struct snd_soc_dai_driver *dai_drv, size_t count) { struct device *dev = component->dev; struct snd_soc_dai *dai; @@ -3159,7 +3158,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component, for (i = 0; i < count; i++) { dai = soc_add_dai(component, dai_drv + i, - count == 1 && legacy_dai_naming); + count == 1 && !component->driver->non_legacy_dai_naming); if (dai == NULL) { ret = -ENOMEM; goto err; @@ -3440,8 +3439,7 @@ int snd_soc_add_component(struct device *dev, } } - ret = snd_soc_register_dais(component, dai_drv, num_dai, - !component_driver->non_legacy_dai_naming); + ret = snd_soc_register_dais(component, dai_drv, num_dai); if (ret < 0) { dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret); goto err_cleanup; -- 1.9.1

2 3

[alsa-devel] [PATCH v3 00/20] Allow compile-testing NO_DMA (drivers)
by Geert Uytterhoeven 07 May '18

07 May '18

Hi all, As of v4.17-rc1, patch series "[PATCH v2 0/5] Allow compile-testing NO_DMA (core)" (https://lkml.org/lkml/2018/3/16/435) has been included upstream, and drivers using the DMA API can be compile-tested on platforms selecting NO_DMA. This follow-up patch series removes dependencies on HAS_DMA for symbols that already have platform dependencies implying HAS_DMA, which increases compile-coverage. Please apply to your tree if appropriate. Changes compared to v2: - Add Acked-by, - Rebased to v4.17-rc1, dropping applied patch for scsi/hisi_sas, - Handle new VIDEO_RENESAS_CEU symbol, - Drop obsolete note about FSL_FMAN. Changes compared to v1: - Add Reviewed-by, Acked-by, - Drop dependency of SND_SOC_LPASS_IPQ806X on HAS_DMA, - Drop dependency of VIDEOBUF{,2}_DMA_{CONTIG,SG} on HAS_DMA, - Drop new dependencies of VIDEO_IPU3_CIO2, DVB_C8SECTPFE, and MTD_NAND_MARVELL on HAS_DMA, - Split in per-subsystem patches, - Split-off the core part in a separate series. This series is against v4.17-rc1. It can also be found at https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git/log/?h… It has been compile-tested with allmodconfig and allyesconfig for m68k/sun3, and has received attention from the kbuild test robot. Thanks for applying! Geert Uytterhoeven (20): ASoC: Remove depends on HAS_DMA in case of platform dependency ata: Remove depends on HAS_DMA in case of platform dependency crypto: Remove depends on HAS_DMA in case of platform dependency fbdev: Remove depends on HAS_DMA in case of platform dependency firewire: Remove depends on HAS_DMA in case of platform dependency fpga: Remove depends on HAS_DMA in case of platform dependency i2c: Remove depends on HAS_DMA in case of platform dependency iio: adc: Remove depends on HAS_DMA in case of platform dependency iommu: Remove depends on HAS_DMA in case of platform dependency lightnvm: Remove depends on HAS_DMA in case of platform dependency mailbox: Remove depends on HAS_DMA in case of platform dependency media: Remove depends on HAS_DMA in case of platform dependency mmc: Remove depends on HAS_DMA in case of platform dependency mtd: Remove depends on HAS_DMA in case of platform dependency net: Remove depends on HAS_DMA in case of platform dependency remoteproc: Remove depends on HAS_DMA in case of platform dependency serial: Remove depends on HAS_DMA in case of platform dependency spi: Remove depends on HAS_DMA in case of platform dependency staging: vc04_services: Remove depends on HAS_DMA in case of platform dependency usb: Remove depends on HAS_DMA in case of platform dependency drivers/ata/Kconfig | 2 -- drivers/crypto/Kconfig | 14 +++------ drivers/firewire/Kconfig | 1 - drivers/fpga/Kconfig | 1 - drivers/i2c/busses/Kconfig | 3 -- drivers/iio/adc/Kconfig | 2 -- drivers/iommu/Kconfig | 5 ++- drivers/lightnvm/Kconfig | 2 +- drivers/mailbox/Kconfig | 2 -- drivers/media/common/videobuf2/Kconfig | 2 -- drivers/media/pci/dt3155/Kconfig | 1 - drivers/media/pci/intel/ipu3/Kconfig | 1 - drivers/media/pci/solo6x10/Kconfig | 1 - drivers/media/pci/sta2x11/Kconfig | 1 - drivers/media/pci/tw5864/Kconfig | 1 - drivers/media/pci/tw686x/Kconfig | 1 - drivers/media/platform/Kconfig | 42 +++++++++---------------- drivers/media/platform/am437x/Kconfig | 2 +- drivers/media/platform/atmel/Kconfig | 4 +-- drivers/media/platform/davinci/Kconfig | 6 ---- drivers/media/platform/marvell-ccic/Kconfig | 3 +- drivers/media/platform/rcar-vin/Kconfig | 2 +- drivers/media/platform/soc_camera/Kconfig | 3 +- drivers/media/platform/sti/c8sectpfe/Kconfig | 2 +- drivers/media/v4l2-core/Kconfig | 2 -- drivers/mmc/host/Kconfig | 10 ++---- drivers/mtd/nand/raw/Kconfig | 8 ++--- drivers/mtd/spi-nor/Kconfig | 2 +- drivers/net/ethernet/amd/Kconfig | 2 +- drivers/net/ethernet/apm/xgene-v2/Kconfig | 1 - drivers/net/ethernet/apm/xgene/Kconfig | 1 - drivers/net/ethernet/arc/Kconfig | 6 ++-- drivers/net/ethernet/broadcom/Kconfig | 2 -- drivers/net/ethernet/calxeda/Kconfig | 2 +- drivers/net/ethernet/hisilicon/Kconfig | 2 +- drivers/net/ethernet/marvell/Kconfig | 8 ++--- drivers/net/ethernet/mellanox/mlxsw/Kconfig | 2 +- drivers/net/ethernet/renesas/Kconfig | 2 -- drivers/net/wireless/broadcom/brcm80211/Kconfig | 1 - drivers/net/wireless/quantenna/qtnfmac/Kconfig | 2 +- drivers/remoteproc/Kconfig | 1 - drivers/spi/Kconfig | 12 ++----- drivers/staging/media/davinci_vpfe/Kconfig | 1 - drivers/staging/media/omap4iss/Kconfig | 1 - drivers/staging/vc04_services/Kconfig | 1 - drivers/tty/serial/Kconfig | 4 --- drivers/usb/gadget/udc/Kconfig | 4 +-- drivers/usb/mtu3/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 3 +- sound/soc/bcm/Kconfig | 3 +- sound/soc/kirkwood/Kconfig | 1 - sound/soc/pxa/Kconfig | 1 - sound/soc/qcom/Kconfig | 7 ++--- 53 files changed, 56 insertions(+), 142 deletions(-) -- 2.7.4 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

8 28

[alsa-devel] [PATCH] soundwire: Update email address for Vinod
by Vinod Koul 06 May '18

06 May '18

Update the email address for SoundWire maintainer Signed-off-by: Vinod Koul <vkoul(a)kernel.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 715d054531af..5caaad0d465d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12687,7 +12687,7 @@ F: include/uapi/sound/ F: sound/ SOUND - COMPRESSED AUDIO -M: Vinod Koul <vinod.koul(a)intel.com> +M: Vinod Koul <vkoul(a)kernel.org> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git S: Supported -- 2.7.4

2 1

[alsa-devel] [PATCH v3] media: i2c: tda1997: replace codec to component
by Kuninori Morimoto 05 May '18

05 May '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- Tim, Mauro This replace patch is needed for ALSA SoC, otherwise it can't probe anymore. Mark, I think it needs your acked-by ? v2 -> v3 - fixup driver name (= tda1997) drivers/media/i2c/tda1997x.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c index 3021913..33d7fcf 100644 --- a/drivers/media/i2c/tda1997x.c +++ b/drivers/media/i2c/tda1997x.c @@ -2444,7 +2444,7 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct tda1997x_state *state = snd_soc_dai_get_drvdata(dai); - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; struct snd_pcm_runtime *rtd = substream->runtime; int rate, err; @@ -2452,11 +2452,11 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, err = snd_pcm_hw_constraint_minmax(rtd, SNDRV_PCM_HW_PARAM_RATE, rate, rate); if (err < 0) { - dev_err(codec->dev, "failed to constrain samplerate to %dHz\n", + dev_err(component->dev, "failed to constrain samplerate to %dHz\n", rate); return err; } - dev_info(codec->dev, "set samplerate constraint to %dHz\n", rate); + dev_info(component->dev, "set samplerate constraint to %dHz\n", rate); return 0; } @@ -2479,20 +2479,22 @@ static int tda1997x_pcm_startup(struct snd_pcm_substream *substream, .ops = &tda1997x_dai_ops, }; -static int tda1997x_codec_probe(struct snd_soc_codec *codec) +static int tda1997x_codec_probe(struct snd_soc_component *component) { return 0; } -static int tda1997x_codec_remove(struct snd_soc_codec *codec) +static void tda1997x_codec_remove(struct snd_soc_component *component) { - return 0; } -static struct snd_soc_codec_driver tda1997x_codec_driver = { - .probe = tda1997x_codec_probe, - .remove = tda1997x_codec_remove, - .reg_word_size = sizeof(u16), +static struct snd_soc_component_driver tda1997x_codec_driver = { + .probe = tda1997x_codec_probe, + .remove = tda1997x_codec_remove, + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static int tda1997x_probe(struct i2c_client *client, @@ -2737,7 +2739,7 @@ static int tda1997x_probe(struct i2c_client *client, else formats = SNDRV_PCM_FMTBIT_S16_LE; tda1997x_audio_dai.capture.formats = formats; - ret = snd_soc_register_codec(&state->client->dev, + ret = devm_snd_soc_register_component(&state->client->dev, &tda1997x_codec_driver, &tda1997x_audio_dai, 1); if (ret) { @@ -2782,7 +2784,6 @@ static int tda1997x_remove(struct i2c_client *client) struct tda1997x_platform_data *pdata = &state->pdata; if (pdata->audout_format) { - snd_soc_unregister_codec(&client->dev); mutex_destroy(&state->audio_lock); } -- 1.9.1

2 1

[alsa-devel] [PATCH v3 0/7] ASoC: omap: Deprecate omap-pcm for sdma-pcm
by Peter Ujfalusi 05 May '18

05 May '18

Hi, Changes since v2: - Return -ENODEV from sdma_pcm_platform_register() in case !CONFIG_SND_SDMA_SOC Changes since v1: - Rebased on the n810 patches (Kconfig conflict) - Delete the omap-pcm as the last step instead of keeping the .c/.h file. If there is a need it can be resurrected with a simple revert. - I left out the Acked-by from Jarkko for the last patch since I have changed it omap-pcm served us well over the years, but there is no reason to keep it around as we can rely on generic dmaengine_pcm code without the need to maintain custom code. The series has been tested on: omap2 n810, omap3 beagle-xm, omap4 PandaES, omap4 Blaze (SDP), am57xx beagle-x15, dra7 evm. McBSP, McASP, McPDM, DMIC and HDMI audio was tested and I have found no issue with them. I was not able to test on OMAP1 for various reasons, but mainly because the Nokia 770 audio is not supported in mainline... Regards, Peter --- Peter Ujfalusi (7): ASoC: omap: Introduce the generic_dmaengine_pcm based sdma-pcm ASoC: davinci-mcasp: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-hdmi-audio: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-dmic: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-mcpdm: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm ASoC: omap: Delete the obsolete omap-pcm include/sound/omap-pcm.h | 30 ---- sound/soc/davinci/Kconfig | 2 +- sound/soc/davinci/davinci-mcasp.c | 8 +- sound/soc/omap/Kconfig | 33 ++-- sound/soc/omap/Makefile | 4 +- sound/soc/omap/omap-dmic.c | 4 +- sound/soc/omap/omap-hdmi-audio.c | 5 +- sound/soc/omap/omap-mcbsp.c | 4 +- sound/soc/omap/omap-mcpdm.c | 4 +- sound/soc/omap/omap-pcm.c | 262 ------------------------------ sound/soc/omap/sdma-pcm.c | 68 ++++++++ sound/soc/omap/sdma-pcm.h | 21 +++ 12 files changed, 124 insertions(+), 321 deletions(-) delete mode 100644 include/sound/omap-pcm.h delete mode 100644 sound/soc/omap/omap-pcm.c create mode 100644 sound/soc/omap/sdma-pcm.c create mode 100644 sound/soc/omap/sdma-pcm.h -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

3 9

[alsa-devel] [PATCH v2] ASoC: da7219: read fmw property to get mclk for non-dts systems
by Akshu Agrawal 03 May '18

03 May '18

Non-dts based systems can use ACPI DSDT to pass on the mclk to da7219. This enables da7219 mclk to be linked to system clock. Enable/Disable of the mclk is already handled in the codec so platform drivers don't have to explicitly do handling of mclk. Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- v2: Fixed kbuild error include/sound/da7219.h | 2 ++ sound/soc/codecs/da7219.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/sound/da7219.h b/include/sound/da7219.h index 1bfcb16..df7ddf4 100644 --- a/include/sound/da7219.h +++ b/include/sound/da7219.h @@ -38,6 +38,8 @@ struct da7219_pdata { const char *dai_clks_name; + const char *mclk_name; + /* Mic */ enum da7219_micbias_voltage micbias_lvl; enum da7219_mic_amp_in_sel mic_amp_in_sel; diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 980a6a8..aed68a4 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -1624,6 +1624,8 @@ static struct da7219_pdata *da7219_fw_to_pdata(struct snd_soc_component *compone dev_warn(dev, "Using default clk name: %s\n", pdata->dai_clks_name); + device_property_read_string(dev, "dlg,mclk-name", &pdata->mclk_name); + if (device_property_read_u32(dev, "dlg,micbias-lvl", &of_val32) >= 0) pdata->micbias_lvl = da7219_fw_micbias_lvl(dev, of_val32); else @@ -1905,7 +1907,10 @@ static int da7219_probe(struct snd_soc_component *component) da7219_handle_pdata(component); /* Check if MCLK provided */ - da7219->mclk = devm_clk_get(component->dev, "mclk"); + if (da7219->pdata->mclk_name) + da7219->mclk = clk_get(NULL, da7219->pdata->mclk_name); + if (!da7219->mclk) + da7219->mclk = devm_clk_get(component->dev, "mclk"); if (IS_ERR(da7219->mclk)) { if (PTR_ERR(da7219->mclk) != -ENOENT) { ret = PTR_ERR(da7219->mclk); -- 1.9.1

5 9