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

[alsa-devel] [PATCH] ASoC: wm0010: fix memory leak
by Sudip Mukherjee 02 Sep '15

02 Sep '15

We were aborting if the kzalloc of img_swap fails but without freeing the already allocated out. Similarly we were aborting if spi_sync fails without releasing out and img_swap. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- sound/soc/codecs/wm0010.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index f2c6ad4..8434d45 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -672,8 +672,10 @@ static int wm0010_boot(struct snd_soc_codec *codec) } img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA); - if (!img_swap) + if (!img_swap) { + kfree(out); goto abort; + } /* We need to re-order for 0010 */ byte_swap_64((u64 *)&pll_rec, img_swap, len); @@ -690,6 +692,8 @@ static int wm0010_boot(struct snd_soc_codec *codec) ret = spi_sync(spi, &m); if (ret != 0) { dev_err(codec->dev, "First PLL write failed: %d\n", ret); + kfree(img_swap); + kfree(out); goto abort; } @@ -697,6 +701,8 @@ static int wm0010_boot(struct snd_soc_codec *codec) ret = spi_sync(spi, &m); if (ret != 0) { dev_err(codec->dev, "Second PLL write failed: %d\n", ret); + kfree(img_swap); + kfree(out); goto abort; } -- 1.9.1

3 2

[alsa-devel] [PATCH] ALSA: hda - Fix missing inline for dummy snd_hdac_set_codec_wakeup()
by Takashi Iwai 02 Sep '15

02 Sep '15

This seems overlooked. Fixes: 98d8fc6c5d36 ('ALSA: hda - Move hda_i915.c from sound/pci/hda to sound/hda') Cc: <stable(a)vger.kernel.org> # v4.2+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/hda_i915.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sound/hda_i915.h b/include/sound/hda_i915.h index a5b5cae03e87..930b41e5acf4 100644 --- a/include/sound/hda_i915.h +++ b/include/sound/hda_i915.h @@ -14,7 +14,7 @@ int snd_hdac_i915_init(struct hdac_bus *bus); int snd_hdac_i915_exit(struct hdac_bus *bus); int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *); #else -static int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable) +static inline int snd_hdac_set_codec_wakeup(struct hdac_bus *bus, bool enable) { return 0; } -- 2.5.1

1 0

[alsa-devel] [PATCH v4 0/4] i915 to call hda driver on HDMI plug/unplug
by David Henningsson 02 Sep '15

02 Sep '15

It's been a while since the last patch set iteration, due to me being on vacation. But here's a new set, and I still hope that it can make it into the next merge window. Changes since v3 (with the person suggesting that change within parantheses): * Valleyview now has three pins like all the others (Libin Yang) * Renamed a few references from "hotplug" to "pin_eld" to reduce confusion with hotplug code on the i915 side (Jani Nikula) * Rewrote the dispatching from hda core to codec on the hda side (Takashi Iwai) This iteration has been tested and working on one Skylake machine. David Henningsson (4): drm/i915: Add audio pin sense / ELD callback drm/i915: Call audio pin/ELD notify function ALSA: hda - allow codecs to access the i915 pin/ELD callback ALSA: hda - Wake the codec up on pin/ELD notify events drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_audio.c | 23 ++++++++++++++++++++--- include/drm/i915_component.h | 12 ++++++++++++ include/sound/hda_i915.h | 7 +++++++ sound/hda/hdac_i915.c | 10 ++++++++++ sound/pci/hda/patch_hdmi.c | 22 +++++++++++++++++++++- 6 files changed, 71 insertions(+), 4 deletions(-) -- 1.9.1

4 18

[alsa-devel] [PATCH] ASoC: intel: broadwell: Convert to devm_snd_soc_register_card
by Axel Lin 02 Sep '15

02 Sep '15

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/intel/boards/broadwell.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index 8bafaf6..3f8a1e1 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -266,18 +266,11 @@ static int broadwell_audio_probe(struct platform_device *pdev) { broadwell_rt286.dev = &pdev->dev; - return snd_soc_register_card(&broadwell_rt286); -} - -static int broadwell_audio_remove(struct platform_device *pdev) -{ - snd_soc_unregister_card(&broadwell_rt286); - return 0; + return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286); } static struct platform_driver broadwell_audio = { .probe = broadwell_audio_probe, - .remove = broadwell_audio_remove, .driver = { .name = "broadwell-audio", }, -- 2.1.0

1 0

[alsa-devel] [ANNOUNCE] Media Workshop at the Kernel Summit 2015 in Korea
by Mauro Carvalho Chehab 01 Sep '15

01 Sep '15

Hi, As we keep being very active on the development of the Linux Kernel Media subsystem, we'll be doing another workshop this year. This will be the first time we'll be doing it in Asia, so it is a great opportunity for the ones that are there to join us and participate, in order to improve the Linux Kernel support for A/V stream capture, webcam and analog/digital TV. As usual, we'll be using the media-workshop(a)linuxtv.org Mailing List for specific discussions about that, so the ones interested on participate are requested to subscribe it. This time, we'll be doing something different than what we've done on the last years, and use something that other subsystems like ALSA are doing for a while: we'll be using two google docs to track the proposals and the interested parties. If you're interested in participate and wants to be invited for the event, please put your data at this document: https://docs.google.com/spreadsheets/d/1YecCAUo0L1R_i3jPg3S-A5iqX7BYAd2c_Vf… As this is the first time we'll be using Google Docs, I kindly request you to also send an email for media-workshop(a)linuxtv.org if you have any troubles adding things there and/or a backup measure. If you have any proposal for themes, please add it here: https://docs.google.com/spreadsheets/d/1F67VcdhkDlVfRpx-GPhe61adZh81Q26q--_… It is useful if you could also send an email to the workshop ML in order to better explain the theme proposal. Hoping to see you there soon! Mauro

3 3

[alsa-devel] [PATCH] ASoC: sh: siu_dai: Convert to use resource managed APIs
by Axel Lin 01 Sep '15

01 Sep '15

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/sh/siu_dai.c | 85 ++++++++++++++------------------------------------ 1 file changed, 24 insertions(+), 61 deletions(-) diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index abb0d95..76b2ab8 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -738,7 +738,7 @@ static int siu_probe(struct platform_device *pdev) struct siu_info *info; int ret; - info = kmalloc(sizeof(*info), GFP_KERNEL); + info = devm_kmalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; siu_i2s_data = info; @@ -746,7 +746,7 @@ static int siu_probe(struct platform_device *pdev) ret = request_firmware(&fw_entry, "siu_spb.bin", &pdev->dev); if (ret) - goto ereqfw; + return ret; /* * Loaded firmware is "const" - read only, but we have to modify it in @@ -757,89 +757,52 @@ static int siu_probe(struct platform_device *pdev) release_firmware(fw_entry); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - ret = -ENODEV; - goto egetres; - } + if (!res) + return -ENODEV; - region = request_mem_region(res->start, resource_size(res), - pdev->name); + region = devm_request_mem_region(&pdev->dev, res->start, + resource_size(res), pdev->name); if (!region) { dev_err(&pdev->dev, "SIU region already claimed\n"); - ret = -EBUSY; - goto ereqmemreg; + return -EBUSY; } - ret = -ENOMEM; - info->pram = ioremap(res->start, PRAM_SIZE); + info->pram = devm_ioremap(&pdev->dev, res->start, PRAM_SIZE); if (!info->pram) - goto emappram; - info->xram = ioremap(res->start + XRAM_OFFSET, XRAM_SIZE); + return -ENOMEM; + info->xram = devm_ioremap(&pdev->dev, res->start + XRAM_OFFSET, + XRAM_SIZE); if (!info->xram) - goto emapxram; - info->yram = ioremap(res->start + YRAM_OFFSET, YRAM_SIZE); + return -ENOMEM; + info->yram = devm_ioremap(&pdev->dev, res->start + YRAM_OFFSET, + YRAM_SIZE); if (!info->yram) - goto emapyram; - info->reg = ioremap(res->start + REG_OFFSET, resource_size(res) - - REG_OFFSET); + return -ENOMEM; + info->reg = devm_ioremap(&pdev->dev, res->start + REG_OFFSET, + resource_size(res) - REG_OFFSET); if (!info->reg) - goto emapreg; + return -ENOMEM; dev_set_drvdata(&pdev->dev, info); /* register using ARRAY version so we can keep dai name */ - ret = snd_soc_register_component(&pdev->dev, &siu_i2s_component, - &siu_i2s_dai, 1); + ret = devm_snd_soc_register_component(&pdev->dev, &siu_i2s_component, + &siu_i2s_dai, 1); if (ret < 0) - goto edaiinit; + return ret; - ret = snd_soc_register_platform(&pdev->dev, &siu_platform); + ret = devm_snd_soc_register_platform(&pdev->dev, &siu_platform); if (ret < 0) - goto esocregp; + return ret; pm_runtime_enable(&pdev->dev); - return ret; - -esocregp: - snd_soc_unregister_component(&pdev->dev); -edaiinit: - iounmap(info->reg); -emapreg: - iounmap(info->yram); -emapyram: - iounmap(info->xram); -emapxram: - iounmap(info->pram); -emappram: - release_mem_region(res->start, resource_size(res)); -ereqmemreg: -egetres: -ereqfw: - kfree(info); - - return ret; + return 0; } static int siu_remove(struct platform_device *pdev) { - struct siu_info *info = dev_get_drvdata(&pdev->dev); - struct resource *res; - pm_runtime_disable(&pdev->dev); - - snd_soc_unregister_platform(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); - - iounmap(info->reg); - iounmap(info->yram); - iounmap(info->xram); - iounmap(info->pram); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (res) - release_mem_region(res->start, resource_size(res)); - kfree(info); - return 0; } -- 2.1.0

1 0

[alsa-devel] SSM2518 Device Tree support ?
by Ricard Wanderlof 01 Sep '15

01 Sep '15

We needed DT support in the SSM2518 codec driver, and I noticed that there is already a set of bindings specified in Documentation/devicetree, however, there doesn't seem to be any DT support in the driver itself. I don't know if this is the result of a missing commit ? Documentation/devicetree/bindings/sound/ssm2518.c seems to have been added in May 2013. I've added rudimentary support for at least the compatible property so that the driver can be used in a system with DT configuration (sent as a separate email). /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 4

[alsa-devel] [PATCH v4] OMAPDSS: hdmi: Reconfigure and restart audio when display is enabled
by Jyri Sarha 01 Sep '15

01 Sep '15

Reconfigure and restart audio when display is enabled, if audio playback was active before. This is needed in a situation when an audio+video stream application opens the audio stream before the video. When video stream is opened the display mode may change and that aborts audio playback, because the display is momentarily turned off. The audio configuration is stored when it is successfully applied and a boolean is set when the audio playback is started and unset when stopped. This data is used to reconfigure the audio when display is re-enabled. The audio playback is aborted if the reconfiguration fails. A new spin lock is introduced in order to protect state variables related to audio playback status. This is needed for the transition from display enabled state (when audio start/stop commands can be written to HW) to display disabled state (when audio start/stop commands update only the hdmi.audio_playing variable) to always serialize correctly with the start/stop audio commands. The already existing mutex can not be used, because the audio start and stop commands are executed in atomic context. For example: when display is turned back on we take the spinlock and we can be sure that the audio start/stop status will not change while we update the HW according to hdmi.audio_playing state and set hdmi.display_enabled to true. After releasing the lock hdmi.display_enabled is true and all audio_start and audio_stop commands write their stuff directly to HW. Signed-off-by: Jyri Sarha <jsarha(a)ti.com> --- Fixed one bad sentece in the description. drivers/video/fbdev/omap2/dss/hdmi.h | 9 ++++- drivers/video/fbdev/omap2/dss/hdmi4.c | 66 +++++++++++++++++++++++++----- drivers/video/fbdev/omap2/dss/hdmi5.c | 76 ++++++++++++++++++++++++++++------- 3 files changed, 124 insertions(+), 27 deletions(-) diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h b/drivers/video/fbdev/omap2/dss/hdmi.h index e4a32fe..53616b0 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi.h +++ b/drivers/video/fbdev/omap2/dss/hdmi.h @@ -351,13 +351,20 @@ struct omap_hdmi { struct regulator *vdda_reg; bool core_enabled; - bool display_enabled; struct omap_dss_device output; struct platform_device *audio_pdev; void (*audio_abort_cb)(struct device *dev); int wp_idlemode; + + bool audio_configured; + struct omap_dss_audio audio_config; + + /* This lock should be taken when booleans bellow are touched. */ + spinlock_t audio_playing_lock; + bool audio_playing; + bool display_enabled; }; #endif diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c index 6d3aa3f..94c8d55 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/dss/hdmi4.c @@ -321,9 +321,22 @@ static int read_edid(u8 *buf, int len) return r; } +static void hdmi_start_audio_stream(struct omap_hdmi *hd) +{ + hdmi_wp_audio_enable(&hd->wp, true); + hdmi4_audio_start(&hd->core, &hd->wp); +} + +static void hdmi_stop_audio_stream(struct omap_hdmi *hd) +{ + hdmi4_audio_stop(&hd->core, &hd->wp); + hdmi_wp_audio_enable(&hd->wp, false); +} + static int hdmi_display_enable(struct omap_dss_device *dssdev) { struct omap_dss_device *out = &hdmi.output; + unsigned long flags; int r = 0; DSSDBG("ENTER hdmi_display_enable\n"); @@ -342,7 +355,21 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) goto err0; } + if (hdmi.audio_configured) { + r = hdmi4_audio_config(&hdmi.core, &hdmi.wp, &hdmi.audio_config, + hdmi.cfg.timings.pixelclock); + if (r) { + DSSERR("Error restoring audio configuration: %d", r); + hdmi.audio_abort_cb(&hdmi.pdev->dev); + hdmi.audio_configured = false; + } + } + + spin_lock_irqsave(&hdmi.audio_playing_lock, flags); + if (hdmi.audio_configured && hdmi.audio_playing) + hdmi_start_audio_stream(&hdmi); hdmi.display_enabled = true; + spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags); mutex_unlock(&hdmi.lock); return 0; @@ -354,17 +381,19 @@ err0: static void hdmi_display_disable(struct omap_dss_device *dssdev) { + unsigned long flags; + DSSDBG("Enter hdmi_display_disable\n"); mutex_lock(&hdmi.lock); - if (hdmi.audio_pdev && hdmi.audio_abort_cb) - hdmi.audio_abort_cb(&hdmi.audio_pdev->dev); + spin_lock_irqsave(&hdmi.audio_playing_lock, flags); + hdmi_stop_audio_stream(&hdmi); + hdmi.display_enabled = false; + spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags); hdmi_power_off_full(dssdev); - hdmi.display_enabled = false; - mutex_unlock(&hdmi.lock); } @@ -568,6 +597,8 @@ static int hdmi_audio_shutdown(struct device *dev) mutex_lock(&hd->lock); hd->audio_abort_cb = NULL; + hd->audio_configured = false; + hd->audio_playing = false; mutex_unlock(&hd->lock); return 0; @@ -576,25 +607,34 @@ static int hdmi_audio_shutdown(struct device *dev) static int hdmi_audio_start(struct device *dev) { struct omap_hdmi *hd = dev_get_drvdata(dev); + unsigned long flags; WARN_ON(!hdmi_mode_has_audio(&hd->cfg)); - WARN_ON(!hd->display_enabled); - hdmi_wp_audio_enable(&hd->wp, true); - hdmi4_audio_start(&hd->core, &hd->wp); + spin_lock_irqsave(&hd->audio_playing_lock, flags); + + if (hd->display_enabled) + hdmi_start_audio_stream(hd); + hd->audio_playing = true; + spin_unlock_irqrestore(&hd->audio_playing_lock, flags); return 0; } static void hdmi_audio_stop(struct device *dev) { struct omap_hdmi *hd = dev_get_drvdata(dev); + unsigned long flags; WARN_ON(!hdmi_mode_has_audio(&hd->cfg)); - WARN_ON(!hd->display_enabled); - hdmi4_audio_stop(&hd->core, &hd->wp); - hdmi_wp_audio_enable(&hd->wp, false); + spin_lock_irqsave(&hd->audio_playing_lock, flags); + + if (hd->display_enabled) + hdmi_stop_audio_stream(hd); + hd->audio_playing = false; + + spin_unlock_irqrestore(&hd->audio_playing_lock, flags); } static int hdmi_audio_config(struct device *dev, @@ -612,7 +652,10 @@ static int hdmi_audio_config(struct device *dev, ret = hdmi4_audio_config(&hd->core, &hd->wp, dss_audio, hd->cfg.timings.pixelclock); - + if (!ret) { + hd->audio_configured = true; + hd->audio_config = *dss_audio; + } out: mutex_unlock(&hd->lock); @@ -657,6 +700,7 @@ static int hdmi4_bind(struct device *dev, struct device *master, void *data) dev_set_drvdata(&pdev->dev, &hdmi); mutex_init(&hdmi.lock); + spin_lock_init(&hdmi.audio_playing_lock); if (pdev->dev.of_node) { r = hdmi_probe_of(pdev); diff --git a/drivers/video/fbdev/omap2/dss/hdmi5.c b/drivers/video/fbdev/omap2/dss/hdmi5.c index 7f87578..b6c767b 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/dss/hdmi5.c @@ -349,9 +349,24 @@ static int read_edid(u8 *buf, int len) return r; } +static void hdmi_start_audio_stream(struct omap_hdmi *hd) +{ + REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2); + hdmi_wp_audio_enable(&hd->wp, true); + hdmi_wp_audio_core_req_enable(&hd->wp, true); +} + +static void hdmi_stop_audio_stream(struct omap_hdmi *hd) +{ + hdmi_wp_audio_core_req_enable(&hd->wp, false); + hdmi_wp_audio_enable(&hd->wp, false); + REG_FLD_MOD(hd->wp.base, HDMI_WP_SYSCONFIG, hd->wp_idlemode, 3, 2); +} + static int hdmi_display_enable(struct omap_dss_device *dssdev) { struct omap_dss_device *out = &hdmi.output; + unsigned long flags; int r = 0; DSSDBG("ENTER hdmi_display_enable\n"); @@ -370,7 +385,21 @@ static int hdmi_display_enable(struct omap_dss_device *dssdev) goto err0; } + if (hdmi.audio_configured) { + r = hdmi5_audio_config(&hdmi.core, &hdmi.wp, &hdmi.audio_config, + hdmi.cfg.timings.pixelclock); + if (r) { + DSSERR("Error restoring audio configuration: %d", r); + hdmi.audio_abort_cb(&hdmi.pdev->dev); + hdmi.audio_configured = false; + } + } + + spin_lock_irqsave(&hdmi.audio_playing_lock, flags); + if (hdmi.audio_configured && hdmi.audio_playing) + hdmi_start_audio_stream(&hdmi); hdmi.display_enabled = true; + spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags); mutex_unlock(&hdmi.lock); return 0; @@ -382,17 +411,19 @@ err0: static void hdmi_display_disable(struct omap_dss_device *dssdev) { + unsigned long flags; + DSSDBG("Enter hdmi_display_disable\n"); mutex_lock(&hdmi.lock); - if (hdmi.audio_pdev && hdmi.audio_abort_cb) - hdmi.audio_abort_cb(&hdmi.audio_pdev->dev); + spin_lock_irqsave(&hdmi.audio_playing_lock, flags); + hdmi_stop_audio_stream(&hdmi); + hdmi.display_enabled = false; + spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags); hdmi_power_off_full(dssdev); - hdmi.display_enabled = false; - mutex_unlock(&hdmi.lock); } @@ -596,6 +627,8 @@ static int hdmi_audio_shutdown(struct device *dev) mutex_lock(&hd->lock); hd->audio_abort_cb = NULL; + hd->audio_configured = false; + hd->audio_playing = false; mutex_unlock(&hd->lock); return 0; @@ -604,32 +637,35 @@ static int hdmi_audio_shutdown(struct device *dev) static int hdmi_audio_start(struct device *dev) { struct omap_hdmi *hd = dev_get_drvdata(dev); + unsigned long flags; WARN_ON(!hdmi_mode_has_audio(&hd->cfg)); - WARN_ON(!hd->display_enabled); - /* No-idle while playing audio, store the old value */ - hd->wp_idlemode = REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2); - REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2); + spin_lock_irqsave(&hd->audio_playing_lock, flags); - hdmi_wp_audio_enable(&hd->wp, true); - hdmi_wp_audio_core_req_enable(&hd->wp, true); + if (hd->display_enabled) { + hdmi_start_audio_stream(hd); + } + hd->audio_playing = true; + spin_unlock_irqrestore(&hd->audio_playing_lock, flags); return 0; } static void hdmi_audio_stop(struct device *dev) { struct omap_hdmi *hd = dev_get_drvdata(dev); + unsigned long flags; WARN_ON(!hdmi_mode_has_audio(&hd->cfg)); - WARN_ON(!hd->display_enabled); - hdmi_wp_audio_core_req_enable(&hd->wp, false); - hdmi_wp_audio_enable(&hd->wp, false); + spin_lock_irqsave(&hd->audio_playing_lock, flags); + + if (hd->display_enabled) + hdmi_stop_audio_stream(hd); + hd->audio_playing = false; - /* Playback stopped, restore original idlemode */ - REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, hd->wp_idlemode, 3, 2); + spin_unlock_irqrestore(&hd->audio_playing_lock, flags); } static int hdmi_audio_config(struct device *dev, @@ -648,6 +684,10 @@ static int hdmi_audio_config(struct device *dev, ret = hdmi5_audio_config(&hd->core, &hd->wp, dss_audio, hd->cfg.timings.pixelclock); + if (!ret) { + hd->audio_configured = true; + hd->audio_config = *dss_audio; + } out: mutex_unlock(&hd->lock); @@ -678,6 +718,11 @@ static int hdmi_audio_register(struct device *dev) if (IS_ERR(hdmi.audio_pdev)) return PTR_ERR(hdmi.audio_pdev); + hdmi_runtime_get(); + hdmi.wp_idlemode = + REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2); + hdmi_runtime_put(); + return 0; } @@ -692,6 +737,7 @@ static int hdmi5_bind(struct device *dev, struct device *master, void *data) dev_set_drvdata(&pdev->dev, &hdmi); mutex_init(&hdmi.lock); + spin_lock_init(&hdmi.audio_playing_lock); if (pdev->dev.of_node) { r = hdmi_probe_of(pdev); -- 1.9.1

2 1

[alsa-devel] Beaglebone Black: Transmit buffer underflows when trying to play audio using an externally attached codec board (simple-card, davinci-mcasp, cs4270)
by Shadi Abdu-Rahman 01 Sep '15

01 Sep '15

Hi all, I'm having trouble using an audio codec board with a custom device tree overlay (see below) with the Beaglebone Black (kernel 4.1.3-bone15). When exporting the overlay, the codecs seem to register fine: dmesg: [ 1375.144463] bone_capemgr bone_capemgr: part_number 'BB-BONE-XA-SK-AU', version 'N/A' [ 1375.152305] bone_capemgr bone_capemgr: slot #4: override [ 1375.157799] bone_capemgr bone_capemgr: Using override eeprom data at slot 4 [ 1375.164864] bone_capemgr bone_capemgr: slot #4: 'Override Board Name,00A0,Override Manuf,BB-BONE-XA-SK-AU' [ 1375.206351] bone_capemgr bone_capemgr: slot #4: dtbo 'BB-BONE-XA-SK-AU-00A0.dtbo' loaded; overlay id #0 [ 1375.464260] cs4270 2-0048: found device at i2c address 48 [ 1375.469699] cs4270 2-0048: hardware revision 3 [ 1375.485782] cs4270 2-0049: found device at i2c address 49 [ 1375.491222] cs4270 2-0049: hardware revision 3 [ 1375.504744] (NULL device *): Setting gpio_int_masterclk_enable = 0 [ 1375.513334] asoc-simple-card ocp:sound: cs4270-hifi <-> 48038000.mcasp mapping ok [ 1375.521095] (NULL device *): Setting gpio_int_masterclk_enable = 0 [ 1375.529893] asoc-simple-card ocp:sound: cs4270-hifi <-> 48038000.mcasp mapping ok aplay -l: **** List of PLAYBACK Hardware Devices **** card 0: XMOSAudioSlice [XMOS-Audio-Slice], device 0: davinci-mcasp.0-cs4270-hifi-a cs4270-hifi-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: XMOSAudioSlice [XMOS-Audio-Slice], device 1: davinci-mcasp.0-cs4270-hifi-b cs4270-hifi-1 [] Subdevices: 1/1 Subdevice #0: subdevice #0 lsmod: snd_soc_davinci_mcasp 14391 2 snd_soc_simple_card 8156 0 snd_soc_edma 1150 1 snd_soc_davinci_mcasp snd_soc_cs4270 6875 2 snd_soc_omap 2573 1 snd_soc_davinci_mcasp snd_soc_core 156881 5 snd_soc_davinci_mcasp,snd_soc_edma,snd_soc_omap,snd_soc_simple_card,snd_soc_cs4270 snd_compress 11668 1 snd_soc_core snd_pcm_dmaengine 5061 2 snd_soc_core,snd_soc_omap snd_pcm 77081 4 snd_soc_davinci_mcasp,snd_soc_core,snd_soc_omap,snd_pcm_dmaengine snd_timer 16860 1 snd_pcm snd 56902 4 snd_soc_core,snd_timer,snd_pcm,snd_compress soundcore 6869 1 snd pvrsrvkm 147014 0 omap_aes 13089 0 omap_sham 19190 0 tda998x 11683 1 tilcdc 27919 0 omap_rng 4354 0 rng_core 7270 1 omap_rng drm_kms_helper 106610 3 tda998x,tilcdc uio_pdrv_genirq 3317 0 leds_gpio 3102 0 uio 8330 1 uio_pdrv_genirq|| || | |but when I try to play an audio file I get a stream of transmit buffer underflows and no audio: aplay test128.wav: Playing WAVE 'test128.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, Stereo underrun!!! (at least 1.630 ms long) underrun!!! (at least 5.413 ms long) underrun!!! (at least 0.636 ms long) underrun!!! (at least 5.369 ms long) underrun!!! (at least 0.217 ms long) underrun!!! (at least 0.641 ms long) underrun!!! (at least 5.254 ms long) dmesg: [ 1493.190031] davinci-mcasp 48038000.mcasp: Transmit buffer underflow [ 1493.201647] davinci-mcasp 48038000.mcasp: Transmit buffer underflow [ 1493.218719] davinci-mcasp 48038000.mcasp: Transmit buffer underflow [ 1493.229946] davinci-mcasp 48038000.mcasp: Transmit buffer underflow [ 1493.245328] davinci-mcasp 48038000.mcasp: Transmit buffer underflow [ 1493.259411] davinci-mcasp 48038000.mcasp: Transmit buffer underflow [ 1493.270549] davinci-mcasp 48038000.mcasp: Transmit buffer underflow Using a software oscilloscope, I can see that the frame clock starts on mcasp0_fsx frame clock line but stops after a few periods. There’s no activity on the on the mcasp0_axr2 audio out line. I'm not sure if I'm missing something trivial or if this is a general with audio out on the Beaglebone Black and 4.1.x kernels. Any pointers or help would be much appreciated. Additional information: I’m using the v4.1.3-bone15 linux kernel with debian-8.1-minimal-armhf-2015-06-09 compiled as per Robert C Nelsons instructions (https://eewiki.net/display/linuxonarm/BeagleBone+Black). The board I’m using is an XMOS XA-SK-AUDIO slice and consists of two Cirrus Logic cs4270 codecs and an onboard oscillator generating the master clock. I’ve interfaced the board to a XMOS micro controller to make sure the board is in working order (and it is). When connected to the BBB, reset de-assertion and some initial i2c codec configuration (setting the codecs in software mode) are handled by the same XMOS micro controller. The overlay I’m using looks like this: /dts-v1/; /plugin/; / { compatible = "ti,beaglebone", "ti,beaglebone-black"; part-number = "BB-BONE-XA-SK-AU"; version = "00A0"; exclusive-use = /* pin header usage */ "P9.25", /* mcasp0_ahclkx <- MCLK */ "P9.31", /* mcasp0_aclkx <-> BCLK*/ "P9.29", /* mcasp0_fsx <-> LRCLK */ "P9.30", /* mcasp0_axr0 <- ADC_DATA0 */ "P9.41", /* mcasp0_axr1 <- ADC_DATA1 */ "P9.28", /* mcasp0_axr2 -> DAC_DATA0 */ "P9.27", /* mcasp0_axr3 -> DAC_DATA1 */ /* hardware ip usage */ "gpio0_15", /* ext-mclk-sel -> MCLK_FSEL */ "gpio0_20", /* CLKOUT2 disabled */ "gpio1_27", /* internal 24.576 MHz oscillator disabled */ "mcasp0"; fragment@0 { target = <&am33xx_pinmux>; __overlay__ { i2c2_pins: pinmux_i2c2_pins { pinctrl-single,pins = < /* Pullup resistors available on codec board */ 0x17c 0x2b /* i2c2_scl, (PIN_INPUT | MUX_MODE3) */ 0x178 0x2b /* i2c2_sda, (PIN_INPUT | MUX_MODE3) */ >; }; mcasp0_pins: pinmux_mcasp0_pins { pinctrl-single,pins = < 0x1ac 0x20 /* mcasp0_ahclkx, (PIN_INPUT_PULLDOWN | MUX_MODE0) */ 0x190 0x20 /* mcasp0_aclkx, (PIN_INPUT_PULLDOWN | MUX_MODE0) */ 0x194 0x20 /* mcasp0_fsx, (PIN_INPUT_PULLDOWN | MUX_MODE0) */ 0x198 0x20 /* mcasp0_axr0, (PIN_INPUT_PULLDOWN | MUX_MODE0) */ 0x1a8 0x20 /* mcasp0_axr1, (PIN_INPUT_PULLDOWN | MUX_MODE0) */ 0x19c 0x02 /* mcasp0_axr2, (PIN_OUTPUT_PULLDOWN | MUX_MODE2) */ 0x1a4 0x02 /* mcasp0_axr3, (PIN_OUTPUT_PULLDOWN | MUX_MODE2) */ /* disable internal 24.576 MHz oscillator */ 0x06c 0x07 /* gpio1_27, (PIN_OUTPUT_PULLDOWN | MUX_MODE7) */ >; }; gpio_pins: pinmux_gpio_pins { pinctrl-single,pins = < /* ext-mclk-sel */ 0x184 0x17 /* gpio0_15, (PIN_OUTPUT_PULLUP | MUX_MODE7) */ /* disable CLKOUT2 to allow usage of mcasp0_axr1 on P9_41 */ 0x1b4 0x2b /* gpio0_20, (PIN_INPUT | MUX_MODE3) */ >; }; }; }; fragment@1 { target = <&i2c2>; __overlay__ { pinctrl-names = "default"; pinctrl-0 = <&i2c2_pins>; status = "okay"; #address-cells = <1>; #size-cells = <0>; clock-frequency = <100000>; cs4270m: cs4270@48 { compatible = "cirrus,cs4270"; status = "okay"; #sound-dai-cells = <0>; reg = <0x48>; name-prefix = "a"; va-supply = <&ldo4_reg>; vd-supply = <&ldo4_reg>; vlc-supply = <&ldo4_reg>; }; cs4270s: cs4270@49 { compatible = "cirrus,cs4270"; status = "okay"; #sound-dai-cells = <0>; reg = <0x49>; name-prefix = "b"; va-supply = <&ldo4_reg>; vd-supply = <&ldo4_reg>; vlc-supply = <&ldo4_reg>; }; }; }; fragment@2 { target = <&mcasp0>; __overlay__ { pinctrl-names = "default"; pinctrl-0 = <&mcasp0_pins>; status = "okay"; #sound-dai-cells = <0>; op-mode = <0>; // MCASP_IIS_MODE tdm-slots = <2>; num-serializer = <4>; serial-dir = < // 0: INACTIVE, 1: TX, 2: RX 2 2 1 1 >; tx-num-evt = <1>; rx-num-evt = <1>; }; }; fragment@3 { target = <&ocp>; __overlay__ { sound { compatible = "simple-audio-card"; simple-audio-card,name = "XMOS-Audio-Slice"; simple-audio-card,widgets = "Line", "Line In 1", "Line", "Line Out 1", "Line", "Line In 2", "Line", "Line Out 2" ; simple-audio-card,routing = "a AINA", "Line In 1", "a AINB", "Line In 1", "Line Out 1", "a AOUTA", "Line Out 1", "a AOUTB", "b AINA", "Line In 2", "b AINB", "Line In 2", "Line Out 2", "b AOUTA", "Line Out 2", "b AOUTB" ; simple-audio-card,int-masterclk-enable = <&gpio1 27 0>; simple-audio-card,dai-link@1 { format = "i2s"; frame-master = <&cpu_node1>; bitclock-master = <&cpu_node1>; cpu_node1: cpu { sound-dai = <&mcasp0>; system-clock-frequency = <24576000>; }; codec_node1: codec { sound-dai = <&cs4270s>; system-clock-frequency = <24576000>; }; }; simple-audio-card,dai-link@0 { format = "i2s"; frame-master = <&cpu_node0>; bitclock-master = <&cpu_node0>; cpu_node0: cpu { sound-dai = <&mcasp0>; system-clock-frequency = <24576000>; }; codec_node0: codec { sound-dai = <&cs4270m>; system-clock-frequency = <24576000>; }; }; }; }; }; }; I've also made modifications to cs4270.c, simple-card.c, and soc-core.c to add a mechanism to disable the internal BBB master clock (in simple-card.c), as well as to fix issues with missing source/sink widgets (this seems to be a bug in cs4270.c): [ 137.408549] cs4270 2-0048: ASoC: no source widget found for AINA [ 137.414737] cs4270 2-0048: ASoC: Failed to add route AINA -> direct -> Capture [ 137.422016] cs4270 2-0048: ASoC: no source widget found for AINB [ 137.428137] cs4270 2-0048: ASoC: Failed to add route AINB -> direct -> Capture [ 137.435477] cs4270 2-0048: ASoC: no sink widget found for AOUTA [ 137.441445] cs4270 2-0048: ASoC: Failed to add route Playback -> direct -> AOUTA [ 137.448928] cs4270 2-0048: ASoC: no sink widget found for AOUTB [ 137.454922] cs4270 2-0048: ASoC: Failed to add route Playback -> direct -> AOUTB and name collisions, arising from using two identical codecs (by hacking together name-prefix support in simple-card): [ 51.364492] asoc-simple-card ocp:sound: control 2:0:0:Master Playback Volume:0 is already present [ 51.373469] cs4270 2-0049: ASoC: Failed to add Master Playback Volume: -16 ... [ 51.393905] ------------[ cut here ]------------ [ 51.398561] WARNING: CPU: 0 PID: 44 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x51/0x5c() [ 51.406281] sysfs: cannot create duplicate filename '/devices/platform/ocp/ocp:sound/davinci-mcasp.0-cs4270-hifi' The modifications are as follows: diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index e6d4ff9..4805747 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -140,11 +140,11 @@ struct cs4270_private { }; static const struct snd_soc_dapm_widget cs4270_dapm_widgets[] = { -SND_SOC_DAPM_INPUT("AINL"), -SND_SOC_DAPM_INPUT("AINR"), +SND_SOC_DAPM_INPUT("AINA"), +SND_SOC_DAPM_INPUT("AINB"), -SND_SOC_DAPM_OUTPUT("AOUTL"), -SND_SOC_DAPM_OUTPUT("AOUTR"), +SND_SOC_DAPM_OUTPUT("AOUTA"), +SND_SOC_DAPM_OUTPUT("AOUTB"), }; static const struct snd_soc_dapm_route cs4270_dapm_routes[] = { diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 33feee9..1383b0f 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -28,6 +28,7 @@ struct simple_card_data { struct asoc_simple_dai codec_dai; } *dai_props; unsigned int mclk_fs; + int gpio_int_masterclk_enable; int gpio_hp_det; int gpio_hp_det_invert; int gpio_mic_det; @@ -50,7 +51,7 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream) ret = clk_prepare_enable(dai_props->cpu_dai.clk); if (ret) return ret; - + ret = clk_prepare_enable(dai_props->codec_dai.clk); if (ret) clk_disable_unprepare(dai_props->cpu_dai.clk); @@ -167,6 +168,12 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) if (ret < 0) return ret; + /* TODO: Logic for enabling internal clock if specified in DT*/ + if (gpio_is_valid(priv->gpio_int_masterclk_enable)) { + dev_info(NULL, "Setting gpio_int_masterclk_enable = 0"); + gpio_set_value(priv->gpio_int_masterclk_enable, 0); + } + if (gpio_is_valid(priv->gpio_hp_det)) { snd_soc_card_jack_new(rtd->card, "Headphones", SND_JACK_HEADPHONE, @@ -195,16 +202,18 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) } static int -asoc_simple_card_sub_parse_of(struct device_node *np, - struct asoc_simple_dai *dai, - struct device_node **p_node, - const char **name, - int *args_count) +asoc_simple_card_sub_parse_of(struct simple_card_data *priv, + struct device_node *np, + struct asoc_simple_dai *dai, + struct device_node **p_node, + const char **name, + int *args_count, bool codec_device, int idx) { struct of_phandle_args args; struct clk *clk; u32 val; int ret; + const char *str = NULL; /* * Get node via "sound-dai = <&phandle port>" @@ -225,6 +234,18 @@ asoc_simple_card_sub_parse_of(struct device_node *np, if (ret < 0) return ret; + /* get name-prefix */ + if (codec_device) { + /* NULL bypasses the device name check in soc-core */ + priv->snd_card.codec_conf[idx].dev_name = NULL; + priv->snd_card.codec_conf[idx].of_node = *p_node; + of_property_read_string(*p_node, "name-prefix", &str); + if (str) + priv->snd_card.codec_conf[idx].name_prefix = str; + else + priv->snd_card.codec_conf[idx].name_prefix = NULL; + } + /* Parse TDM slot */ ret = snd_soc_of_parse_tdm_slot(np, &dai->slots, &dai->slot_width); if (ret) @@ -334,16 +355,16 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, if (ret < 0) goto dai_link_of_err; - ret = asoc_simple_card_sub_parse_of(cpu, &dai_props->cpu_dai, + ret = asoc_simple_card_sub_parse_of(priv, cpu, &dai_props->cpu_dai, &dai_link->cpu_of_node, &dai_link->cpu_dai_name, - &cpu_args); + &cpu_args, false, idx); if (ret < 0) goto dai_link_of_err; - ret = asoc_simple_card_sub_parse_of(codec, &dai_props->codec_dai, + ret = asoc_simple_card_sub_parse_of(priv, codec, &dai_props->codec_dai, &dai_link->codec_of_node, - &dai_link->codec_dai_name, NULL); + &dai_link->codec_dai_name, NULL, true, idx); if (ret < 0) goto dai_link_of_err; @@ -357,8 +378,10 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, /* DAI link name is created from CPU/CODEC dai name */ name = devm_kzalloc(dev, - strlen(dai_link->cpu_dai_name) + - strlen(dai_link->codec_dai_name) + 2, + strlen(dai_link->cpu_dai_name) + + strlen(dai_link->codec_dai_name) + + (priv->snd_card.codec_conf[idx].name_prefix ? + strlen(priv->snd_card.codec_conf[idx].name_prefix) + 3 : 2), GFP_KERNEL); if (!name) { ret = -ENOMEM; @@ -367,6 +390,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, sprintf(name, "%s-%s", dai_link->cpu_dai_name, dai_link->codec_dai_name); + if (priv->snd_card.codec_conf[idx].name_prefix) + sprintf(name, "%s-%s", name, + priv->snd_card.codec_conf[idx].name_prefix); dai_link->name = dai_link->stream_name = name; dai_link->ops = &asoc_simple_card_ops; dai_link->init = asoc_simple_card_dai_init; @@ -459,6 +485,15 @@ static int asoc_simple_card_parse_of(struct device_node *node, return ret; } + /* request GPIO to control internal 24.576MHz oscillator */ + priv->gpio_int_masterclk_enable = of_get_named_gpio_flags(node, + "simple-audio-card,int-masterclk-enable", 0, &flags); + + if (priv->gpio_int_masterclk_enable == -EPROBE_DEFER) + return -EPROBE_DEFER; + gpio_request_one(priv->gpio_int_masterclk_enable, GPIOF_OUT_INIT_LOW, + "Internal Clock Enable Pin"); + priv->gpio_hp_det = of_get_named_gpio_flags(node, "simple-audio-card,hp-det-gpio", 0, &flags); priv->gpio_hp_det_invert = !!(flags & OF_GPIO_ACTIVE_LOW); @@ -498,13 +533,18 @@ static int asoc_simple_card_probe(struct platform_device *pdev) struct snd_soc_dai_link *dai_link; struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev; - int num_links, ret; + int num_links = (np && of_get_child_by_name(np, + "simple-audio-card,dai-link")) ? + of_get_child_count(np) : 1; + struct snd_soc_codec_conf codec_conf[num_links]; + int ret; - /* Get the number of DAI links */ + /* Get the number of DAI links if (np && of_get_child_by_name(np, "simple-audio-card,dai-link")) num_links = of_get_child_count(np); else num_links = 1; + */ /* Allocate the private data and the DAI link array */ priv = devm_kzalloc(dev, @@ -519,6 +559,8 @@ static int asoc_simple_card_probe(struct platform_device *pdev) dai_link = priv->dai_link; priv->snd_card.dai_link = dai_link; priv->snd_card.num_links = num_links; + priv->snd_card.codec_conf = codec_conf; + priv->snd_card.num_configs = num_links; priv->gpio_hp_det = -ENOENT; priv->gpio_mic_det = -ENOENT; @@ -589,6 +631,11 @@ static int asoc_simple_card_remove(struct platform_device *pdev) struct snd_soc_card *card = platform_get_drvdata(pdev); struct simple_card_data *priv = snd_soc_card_get_drvdata(card); + if (gpio_is_valid(priv->gpio_int_masterclk_enable)) { + gpio_set_value(priv->gpio_int_masterclk_enable, 0); + gpio_free(priv->gpio_int_masterclk_enable); + } + if (gpio_is_valid(priv->gpio_hp_det)) snd_soc_jack_free_gpios(&simple_card_hp_jack, 1, &simple_card_hp_jack_gpio); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2373252..4808089 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1102,6 +1102,9 @@ static void soc_set_name_prefix(struct snd_soc_card *card, for (i = 0; i < card->num_configs; i++) { struct snd_soc_codec_conf *map = &card->codec_conf[i]; + + if (!map->name_prefix) + continue; if (map->of_node && component->dev->of_node != map->of_node) continue; if (map->dev_name && strcmp(component->name, map->dev_name)) Another possible bug: Adding name-prefix support to simple-card uncovers a possible bug. You'll notice in the device tree overlay that I'v listed the simple-audio-card dai-links in reverse order, with dai-link@1 before dai-link@0. I've done so because using the normal order the wrong prefix gets assigned to the wrong dai-link. I'm not really sure where this happens, and it's not a huge issue for me, but I thought I'd report it. Kind Regards Shadi Abdu-Rahman

1 0

[alsa-devel] [PATCH RFT] ASoC: pxa: Convert to devm_snd_soc_register_card
by Axel Lin 01 Sep '15

01 Sep '15

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- Only compile tested. sound/soc/pxa/brownstone.c | 9 +-------- sound/soc/pxa/corgi.c | 11 +---------- sound/soc/pxa/e740_wm9705.c | 5 +---- sound/soc/pxa/e750_wm9705.c | 5 +---- sound/soc/pxa/e800_wm9712.c | 5 +---- sound/soc/pxa/hx4700.c | 4 +--- sound/soc/pxa/imote2.c | 11 +---------- sound/soc/pxa/mioa701_wm9713.c | 11 +---------- sound/soc/pxa/palm27x.c | 9 +-------- sound/soc/pxa/poodle.c | 11 +---------- sound/soc/pxa/spitz.c | 5 +---- sound/soc/pxa/tosa.c | 5 +---- sound/soc/pxa/ttc-dkb.c | 12 +----------- 13 files changed, 13 insertions(+), 90 deletions(-) diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c index 2b26318..6147e86 100644 --- a/sound/soc/pxa/brownstone.c +++ b/sound/soc/pxa/brownstone.c @@ -116,26 +116,19 @@ static int brownstone_probe(struct platform_device *pdev) int ret; brownstone.dev = &pdev->dev; - ret = snd_soc_register_card(&brownstone); + ret = devm_snd_soc_register_card(&pdev->dev, &brownstone); if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); return ret; } -static int brownstone_remove(struct platform_device *pdev) -{ - snd_soc_unregister_card(&brownstone); - return 0; -} - static struct platform_driver mmp_driver = { .driver = { .name = "brownstone-audio", .pm = &snd_soc_pm_ops, }, .probe = brownstone_probe, - .remove = brownstone_remove, }; module_platform_driver(mmp_driver); diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 3580d10..c97dc13 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c @@ -295,28 +295,19 @@ static int corgi_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); return ret; } -static int corgi_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - return 0; -} - static struct platform_driver corgi_driver = { .driver = { .name = "corgi-audio", .pm = &snd_soc_pm_ops, }, .probe = corgi_probe, - .remove = corgi_remove, }; module_platform_driver(corgi_driver); diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index d72e124..1de8765 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c @@ -138,7 +138,7 @@ static int e740_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); @@ -149,10 +149,7 @@ static int e740_probe(struct platform_device *pdev) static int e740_remove(struct platform_device *pdev) { - struct snd_soc_card *card = platform_get_drvdata(pdev); - gpio_free_array(e740_audio_gpios, ARRAY_SIZE(e740_audio_gpios)); - snd_soc_unregister_card(card); return 0; } diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index 48f2d7c..b7eb7cd 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c @@ -120,7 +120,7 @@ static int e750_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); @@ -131,10 +131,7 @@ static int e750_probe(struct platform_device *pdev) static int e750_remove(struct platform_device *pdev) { - struct snd_soc_card *card = platform_get_drvdata(pdev); - gpio_free_array(e750_audio_gpios, ARRAY_SIZE(e750_audio_gpios)); - snd_soc_unregister_card(card); return 0; } diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index 45d4bd4..41bf714 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c @@ -119,7 +119,7 @@ static int e800_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); @@ -130,10 +130,7 @@ static int e800_probe(struct platform_device *pdev) static int e800_remove(struct platform_device *pdev) { - struct snd_soc_card *card = platform_get_drvdata(pdev); - gpio_free_array(e800_audio_gpios, ARRAY_SIZE(e800_audio_gpios)); - snd_soc_unregister_card(card); return 0; } diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index 9f8be7c..ecbf287 100644 --- a/sound/soc/pxa/hx4700.c +++ b/sound/soc/pxa/hx4700.c @@ -193,7 +193,7 @@ static int hx4700_audio_probe(struct platform_device *pdev) return ret; snd_soc_card_hx4700.dev = &pdev->dev; - ret = snd_soc_register_card(&snd_soc_card_hx4700); + ret = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_hx4700); if (ret) gpio_free_array(hx4700_audio_gpios, ARRAY_SIZE(hx4700_audio_gpios)); @@ -203,8 +203,6 @@ static int hx4700_audio_probe(struct platform_device *pdev) static int hx4700_audio_remove(struct platform_device *pdev) { - snd_soc_unregister_card(&snd_soc_card_hx4700); - gpio_set_value(GPIO92_HX4700_HP_DRIVER, 0); gpio_set_value(GPIO107_HX4700_SPK_nSD, 0); diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c index 29fabbf..9d0e407 100644 --- a/sound/soc/pxa/imote2.c +++ b/sound/soc/pxa/imote2.c @@ -72,28 +72,19 @@ static int imote2_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); return ret; } -static int imote2_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - return 0; -} - static struct platform_driver imote2_driver = { .driver = { .name = "imote2-audio", .pm = &snd_soc_pm_ops, }, .probe = imote2_probe, - .remove = imote2_remove, }; module_platform_driver(imote2_driver); diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c index a9615a57..29bc60e8 100644 --- a/sound/soc/pxa/mioa701_wm9713.c +++ b/sound/soc/pxa/mioa701_wm9713.c @@ -181,7 +181,7 @@ static int mioa701_wm9713_probe(struct platform_device *pdev) return -ENODEV; mioa701.dev = &pdev->dev; - rc = snd_soc_register_card(&mioa701); + rc = devm_snd_soc_register_card(&pdev->dev, &mioa701); if (!rc) dev_warn(&pdev->dev, "Be warned that incorrect mixers/muxes setup will" "lead to overheating and possible destruction of your device." @@ -189,17 +189,8 @@ static int mioa701_wm9713_probe(struct platform_device *pdev) return rc; } -static int mioa701_wm9713_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - return 0; -} - static struct platform_driver mioa701_wm9713_driver = { .probe = mioa701_wm9713_probe, - .remove = mioa701_wm9713_remove, .driver = { .name = "mioa701-wm9713", .pm = &snd_soc_pm_ops, diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index c20bbc0..4e74d95 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c @@ -140,22 +140,15 @@ static int palm27x_asoc_probe(struct platform_device *pdev) palm27x_asoc.dev = &pdev->dev; - ret = snd_soc_register_card(&palm27x_asoc); + ret = devm_snd_soc_register_card(&pdev->dev, &palm27x_asoc); if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); return ret; } -static int palm27x_asoc_remove(struct platform_device *pdev) -{ - snd_soc_unregister_card(&palm27x_asoc); - return 0; -} - static struct platform_driver palm27x_wm9712_driver = { .probe = palm27x_asoc_probe, - .remove = palm27x_asoc_remove, .driver = { .name = "palm27x-asoc", .pm = &snd_soc_pm_ops, diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 80b457a..84d0e2e 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -267,28 +267,19 @@ static int poodle_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); return ret; } -static int poodle_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - return 0; -} - static struct platform_driver poodle_driver = { .driver = { .name = "poodle-audio", .pm = &snd_soc_pm_ops, }, .probe = poodle_probe, - .remove = poodle_remove, }; module_platform_driver(poodle_driver); diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 461123a..b002226 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -305,7 +305,7 @@ static int spitz_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); @@ -322,9 +322,6 @@ err1: static int spitz_remove(struct platform_device *pdev) { - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); gpio_free(spitz_mic_gpio); return 0; } diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index f59f566..49518dd 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -233,7 +233,7 @@ static int tosa_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); @@ -244,10 +244,7 @@ static int tosa_probe(struct platform_device *pdev) static int tosa_remove(struct platform_device *pdev) { - struct snd_soc_card *card = platform_get_drvdata(pdev); - gpio_free(TOSA_GPIO_L_MUTE); - snd_soc_unregister_card(card); return 0; } diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c index 1753c7d..65c20f7 100644 --- a/sound/soc/pxa/ttc-dkb.c +++ b/sound/soc/pxa/ttc-dkb.c @@ -128,7 +128,7 @@ static int ttc_dkb_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); @@ -136,22 +136,12 @@ static int ttc_dkb_probe(struct platform_device *pdev) return ret; } -static int ttc_dkb_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - - return 0; -} - static struct platform_driver ttc_dkb_driver = { .driver = { .name = "ttc-dkb-audio", .pm = &snd_soc_pm_ops, }, .probe = ttc_dkb_probe, - .remove = ttc_dkb_remove, }; module_platform_driver(ttc_dkb_driver); -- 2.1.0

1 0